diff --git a/.github/config.json b/.github/config.json
index b0884ca915..c870a771f6 100644
--- a/.github/config.json
+++ b/.github/config.json
@@ -1 +1 @@
-{"runners":[{"versioning":{"source":"milestones","type":"SemVer"},"prereleaseName":"alpha","issue":{"labels":{"Widget design system":{"conditions":[{"label":"App Theming","type":"hasLabel","value":true},{"label":"Widget Styling","type":"hasLabel","value":true},{"label":"Checkbox Group widget","type":"hasLabel","value":true},{"label":"Checkbox Widget","type":"hasLabel","value":true},{"label":"Checkbox Component","type":"hasLabel","value":true},{"label":"WDS team","type":"hasLabel","value":true}],"requires":1},"Performance Pod":{"conditions":[{"label":"Performance","type":"hasLabel","value":true},{"label":"Performance infra","type":"hasLabel","value":true}],"requires":1},"Billing & Usage Pod":{"conditions":[{"label":"BE Instance","type":"hasLabel","value":true},{"label":"CE Instance","type":"hasLabel","value":true},{"label":"Customer Portal","type":"hasLabel","value":true},{"label":"Cloud Services","type":"hasLabel","value":true},{"label":"Billing Integrations","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":"In-app ramps","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":"1-click upgrade","type":"hasLabel","value":true},{"label":"Appsmith Business Cloud","type":"hasLabel","value":true}],"requires":1},"Mobile Pod":{"conditions":[],"requires":1},"Git Pod":{"conditions":[{"label":"Git Version Control","type":"hasLabel","value":true},{"label":"Import-Export-App","type":"hasLabel","value":true}],"requires":1},"Integrations Pod":{"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":"REST API plugin","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}],"requires":1},"Data Platform Pod":{"conditions":[{"label":"Datasource Environments","type":"hasLabel","value":true},{"label":"Datatype issue","type":"hasLabel","value":true},{"label":"Entity Refactor","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":"SmartSubstitution","type":"hasLabel","value":true},{"label":"Query Generation","type":"hasLabel","value":true},{"label":"Query performance","type":"hasLabel","value":true},{"label":"Suggested Widgets","type":"hasLabel","value":true},{"label":"Page load executions","type":"hasLabel","value":true},{"label":"DSL Update","type":"hasLabel","value":true},{"label":"AST-backend","type":"hasLabel","value":true},{"label":"Deploy App","type":"hasLabel","value":true},{"label":"File upload issues","type":"hasLabel","value":true},{"label":"Datasources","type":"hasLabel","value":true},{"label":"DocumentDB","type":"hasLabel","value":true},{"label":"Multiple Environments","type":"hasLabel","value":true},{"label":"Platformization","type":"hasLabel","value":true},{"label":"Custom environments","type":"hasLabel","value":true}],"requires":1},"Design System Pod":{"conditions":[{"label":"Design System Pod","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}],"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}],"requires":1},"Team Managers Pod":{"conditions":[{"label":"Settings","type":"hasLabel","value":true},{"label":"Home Page","type":"hasLabel","value":true},{"label":"Invite users","type":"hasLabel","value":true},{"label":"Realtime Commenting","type":"hasLabel","value":true},{"label":"SSO","type":"hasLabel","value":true},{"label":"Multi User Realtime","type":"hasLabel","value":true},{"label":"RBAC","type":"hasLabel","value":true},{"label":"ABAC","type":"hasLabel","value":true},{"label":"Audit Logs","type":"hasLabel","value":true},{"label":"Multitenancy","type":"hasLabel","value":true},{"label":"Airgap","type":"hasLabel","value":true},{"label":"Enterprise Edition","type":"hasLabel","value":true},{"label":"SCIM","type":"hasLabel","value":true}],"requires":1},"New Developers Pod":{"conditions":[{"label":"Fork App","type":"hasLabel","value":true},{"label":"Omnibar","type":"hasLabel","value":true},{"label":"Onboarding","type":"hasLabel","value":true},{"label":"Telemetry","type":"hasLabel","value":true},{"label":"Entity Explorer","type":"hasLabel","value":true},{"label":"Generate Page","type":"hasLabel","value":true},{"label":"IDE","type":"hasLabel","value":true},{"label":"Sniping Mode","type":"hasLabel","value":true},{"label":"Example Apps","type":"hasLabel","value":true},{"label":"i18n","type":"hasLabel","value":true},{"label":"Welcome Screen","type":"hasLabel","value":true},{"label":"IDE Navigation","type":"hasLabel","value":true},{"label":"Login / Signup","type":"hasLabel","value":true},{"label":"Clean URLs","type":"hasLabel","value":true},{"label":"Embedding Apps","type":"hasLabel","value":true},{"label":"Feature Flagging","type":"hasLabel","value":true},{"label":"In App Comms","type":"hasLabel","value":true},{"label":"In App Comms","type":"hasLabel","value":true},{"label":"App setting","type":"hasLabel","value":true}],"requires":1},"BE Coders Pod":{"conditions":[{"label":"SAAS Plugins","type":"hasLabel","value":true},{"label":"SAAS Manager App","type":"hasLabel","value":true},{"label":"Data Platform Pod","type":"hasLabel","value":true},{"label":"Integrations Pod","type":"hasLabel","value":true}],"requires":1},"FE Coders Pod":{"conditions":[{"label":"JS Linting & Errors","type":"hasLabel","value":true},{"label":"Debugger","type":"hasLabel","value":true},{"label":"JS Snippets","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 Promises","type":"hasLabel","value":true},{"label":"JS Usability","type":"hasLabel","value":true},{"label":"Code Refactoring","type":"hasLabel","value":true},{"label":"storeValue","type":"hasLabel","value":true},{"label":"OnPageLoad","type":"hasLabel","value":true},{"label":"Framework Functions","type":"hasLabel","value":true},{"label":"Code Editor","type":"hasLabel","value":true},{"label":"JS Objects","type":"hasLabel","value":true},{"label":"JS Evaluation","type":"hasLabel","value":true},{"label":"AST-frontend","type":"hasLabel","value":true},{"label":"Custom JS Libraries","type":"hasLabel","value":true},{"label":"Action Selector","type":"hasLabel","value":true},{"label":"JS Function execution","type":"hasLabel","value":true},{"label":"Widget setter method","type":"hasLabel","value":true},{"label":"Error Handling","type":"hasLabel","value":true},{"label":"AI","type":"hasLabel","value":true}],"requires":1},"App Viewers Pod":{"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":"reallabel","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":"App Navigation","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":"Branding","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":"Widget design system","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}],"requires":1},"UI Builders Pod":{"conditions":[{"label":"Property Pane","type":"hasLabel","value":true},{"label":"Pages","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":"Canvas Zooms","type":"hasLabel","value":true},{"label":"Frontend Libraries Upgrade","type":"hasLabel","value":true},{"label":"Auto Height","type":"hasLabel","value":true},{"label":"Responsive Canvas","type":"hasLabel","value":true},{"label":"Responsive Widget","type":"hasLabel","value":true},{"label":"Responsive Viewport","type":"hasLabel","value":true},{"label":"Conversion Algorithm","type":"hasLabel","value":true},{"label":"Spacing","type":"hasLabel","value":true},{"label":"Browser specific","type":"hasLabel","value":true},{"label":"widget vertical alignment","type":"hasLabel","value":true},{"label":"Auto Layout","type":"hasLabel","value":true}],"requires":1},"User Education Pod":{"conditions":[{"label":"Content","type":"hasLabel","value":true},{"label":"Documentation","type":"hasLabel","value":true}],"requires":1},"Templates pod":{"conditions":[{"label":"Templates","type":"hasLabel","value":true},{"label":"Community template","type":"hasLabel","value":true},{"label":"Partial-import-export","type":"hasLabel","value":true}],"requires":1},"Error Handling":{"conditions":[],"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":"88054d","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":"e2ca68","name":"QA","description":""},"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":"9c0c8e","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"},"Settings":{"color":"f7ff60","name":"Settings","description":"organization, team & user settings"},"Fork App":{"color":"5369db","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":""},"Onboarding":{"color":"d5794b","name":"Onboarding","description":"Issues related to onboarding new developers"},"Pages":{"color":"d7fd80","name":"Pages","description":"Issues related to configuring pages"},"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"},"Widget Styling":{"color":"905420","name":"Widget Styling","description":"all about widget styling"},"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"},"App Viewers Pod":{"color":"cd8ef9","name":"App Viewers Pod","description":"This label assigns issues to the app viewers pod"},"Checkbox Widget":{"color":"88054d","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":"d73a4a","name":"Bug","description":"Something isn't working"},"Widget Validation":{"color":"6990BC","name":"Widget Validation","description":"Issues related to widget property validation"},"Generate Page":{"color":"f14274","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":""},"Team Managers Pod":{"color":"bddb81","name":"Team Managers Pod","description":"Issues that team managers care about for the security and efficiency of their teams"},"Import-Export-App":{"color":"15076d","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":"10b5ce","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":"771e69","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"},"Critical":{"color":"9b1b28","name":"Critical","description":"This issue needs immediate attention. Drop everything else"},"IDE":{"color":"61b2ee","name":"IDE","description":"Issues related to the IDE"},"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":"f28253","name":"TestGap","description":"Issues identified for test plan improvement"},"keyboard shortcut":{"color":"0688B6","name":"keyboard shortcut","description":""},"Git Version Control":{"color":"858172","name":"Git Version Control","description":"Issues related to version control"},"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":"a2e2f9","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},"Debugger":{"color":"e79062","name":"Debugger","description":"Issues related to the debugger"},"Quick effort":{"color":"95ED65","name":"Quick effort","description":"Something that'll take a few hours to build"},"Text Widget":{"color":"d130d1","name":"Text Widget","description":""},"Video Widget":{"color":"23dd4b","name":"Video Widget","description":""},"Datasources":{"color":"5052f6","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"},"UI Builders Pod":{"color":"517fba","name":"UI Builders Pod","description":"Issues that UI Builders face using appsmith"},"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"},"In App Comms":{"name":"In App Comms","description":"Issues around communication with appsmith instances","color":"463cca"},"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"},"BE Coders Pod":{"color":"5d9848","name":"BE Coders Pod","description":"Issues related to users writing code to fetch and update data"},"FE Coders Pod":{"color":"a7effc","name":"FE Coders Pod","description":"Issues related to users writing javascript in appsmith"},"New Developers Pod":{"color":"6310da","name":"New Developers Pod","description":"Issues that new developers face while exploring the IDE"},"Sniping Mode":{"name":"Sniping Mode","description":"Issues related to sniping mode","color":"6310da"},"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":"12b715"},"Responsive Viewport":{"color":"d12d2e","name":"Responsive Viewport","description":"Issues seen on different viewports like mobile"},"Widgets Pane":{"name":"Widgets Pane","description":"Issues related to the discovery and organisation of widgets","color":"ad5d78"},"Invite users":{"color":"1799b0","name":"Invite users","description":"Invite users flow and any associated actions"},"View Mode":{"color":"1799b0","name":"View Mode","description":"Issues related to the view mode"},"User Education Pod":{"name":"User Education Pod","description":"Issues related to user education","color":"1799b0"},"Content":{"name":"Content","description":"For content related topics i.e blogs, templates, videos","color":"a8dff7"},"Embedding Apps":{"name":"Embedding Apps","description":"Issues related to embedding","color":"26ef4f"},"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"},"REST API plugin":{"name":"REST API plugin","description":"REST API plugin 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":"ef9c9d"},"JS Promises":{"name":"JS Promises","description":"Issues related to promises","color":"d7771f"},"OnPageLoad":{"name":"OnPageLoad","description":"OnPageLoad issues on functions and queries","color":"50559d"},"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":"3897be"},"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"},"App Theming":{"name":"App Theming","description":"Items that are related to the App level theming controls epic","color":"905420"},"SSO":{"name":"SSO","description":"Issues, requests and enhancements around Single sign-on.","color":"bf019b"},"Multi User Realtime":{"name":"Multi User Realtime","description":"Issues related to multiple users using or editing an application","color":"e7b6ce"},"Templates":{"name":"Templates","description":"Issues related to templates","color":"b7e568"},"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"},"RBAC":{"name":"RBAC","description":"Issues, requests and enhancements around RBAC.","color":"9211c3"},"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"},"Tests":{"name":"Tests","description":"test item","color":"1c6990"},"DynamoDB":{"name":"DynamoDB","description":"Issues that are related to DynamoDB should have this label","color":"60885f"},"Design System Pod":{"name":"Design System Pod","description":"Appsmith design system related issues","color":"706f03"},"ABAC":{"color":"e009a5","name":"ABAC","description":"User permissions and access controls"},"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":"60885f"},"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":"bc0cba"},"Query performance":{"name":"Query performance","description":"Issues that have to do with lack in performance of query execution","color":"e4d966"},"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":"418fa4"},"Branding":{"name":"Branding","description":"All issues under branding and whitelabelling appsmith ecosystem","color":"7aaaf1"},"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"},"Audit Logs":{"name":"Audit Logs","description":"Audit trails to ensure data security","color":"f3fd62"},"MsSQL":{"name":"MsSQL","description":"Issues related to MsSQL plugin","color":"8078b0"},"Data Platform Pod":{"name":"Data Platform Pod","description":"Issues related to the underlying data platform","color":"3f8c3a"},"Integrations Pod":{"name":"Integrations Pod","description":"Issues related to a specific integration","color":"5dbbb1"},"Datasource Environments":{"name":"Datasource Environments","description":"Issues related to datasource environments","color":"bb7a14"},"Elastic Search":{"name":"Elastic Search","description":"Issues related to the elastic search datasource","color":"8078b0"},"Core Query Execution":{"color":"418fa4","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":"6a5b42"},"Query Settings":{"name":"Query Settings","description":"Issues related to the settings of all queries","color":"c7da7a"},"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":"e4d966"},"Query Generation":{"name":"Query Generation","description":"Issues related to query generation","color":"e4d966"},"Suggested Widgets":{"name":"Suggested Widgets","description":"Issues related to suggesting widgets based on query response","color":"e4d966"},"Page load executions":{"name":"Page load executions","description":"Issues related to page load execution","color":"5696b2"},"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"},"Git Pod":{"name":"Git Pod","description":"Anything related to git sync","color":"2e5ba4"},"Mobile Pod":{"name":"Mobile Pod","description":"All issues related to mobile responsiveness","color":"6c97fd"},"Responsive Widget":{"name":"Responsive Widget","description":"All issues related to widget responsiveness","color":"d12d2e"},"Responsive Canvas":{"name":"Responsive Canvas","description":"All issues related to canvas responsiveness","color":"45a0a8"},"Conversion Algorithm":{"name":"Conversion Algorithm","description":"All issue related to converting app from fixed to flex mode & vice versa","color":"d12d2e"},"Spacing":{"name":"Spacing","description":"All issue related to spacing between widgets in auto layout","color":"d12d2e"},"Browser specific":{"name":"Browser specific","description":"All issue related to browser","color":"d12d2e"},"Error Handling":{"name":"Error Handling","description":"Issues related to error handling","color":"4e1872"},"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":"434a3a"},"AST-backend":{"name":"AST-backend","description":"Backend issues related to AST parsing","color":"c476eb"},"MariaDB":{"name":"MariaDB","description":"MariaDB datasource","color":"8428c3"},"Billing & Usage Pod":{"name":"Billing & Usage Pod","description":"Issues pertaining to licensing, billing, usage across self serve and enterprise customers","color":"256808"},"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":"8154df"},"Action Selector":{"name":"Action Selector","description":"Issues related to action selector on the property pane","color":"2f9e20"},"Widget design system":{"name":"Widget design system","description":"","color":"11cc90"},"Deploy App":{"name":"Deploy App","description":"Issues related to app deployment","color":"6f6152"},"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"},"BE Instance":{"name":"BE Instance","description":"For all issues relating to usage, licensing or billing on the BE instance","color":"d2bc40"},"CE Instance":{"name":"CE Instance","description":"For all issues relating to usage, licensing or billing on the CE instance","color":"d2bc40"},"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"},"Billing Integrations":{"name":"Billing Integrations","description":"For all issues relating to 3P integrations Appsmith is using for billing & usage","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"},"Appsmith Business Cloud":{"name":"Appsmith Business Cloud","description":"Issues related to our business cloud offering","color":"89bb6c"},"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"},"In-app ramps":{"name":"In-app ramps","description":"For all tasks/issues relating to adding in-app ramps in the community edition of the product","color":"8abae0"},"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"},"1-click upgrade":{"name":"1-click upgrade","description":"For all issues/tasks related to 1-click upgrade & downgrade project","color":"129082"},"Feature Flagging":{"name":"Feature Flagging","description":"Anything related feature flagging flagsmith","color":"728126"},"SCIM":{"name":"SCIM","description":"Label to collate our SCIM issues","color":"61a852"},"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"},"Templates pod":{"name":"Templates pod","description":"Issues related to Templates","color":"b7e568"},"Community template":{"name":"Community template","description":"Label for development of community templates and its integration to platform","color":"8a0510"},"DocumentDB":{"name":"DocumentDB","description":"Issues related to support DocumentDB in Appsmith Data layer","color":"2c8b56"},"Multiple Environments":{"name":"Multiple Environments","description":"Issues or tasks related to multiple environments","color":"4e972b"},"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":"1e439c"},"AI":{"name":"AI","description":"All tasks related to AI","color":"69c7ca"},"Custom environments":{"name":"Custom environments","description":"Issues with creating or working with custom environments","color":"2137d6"},"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":"144206"}},"success":true}
\ No newline at end of file
+{"runners":[{"versioning":{"source":"milestones","type":"SemVer"},"prereleaseName":"alpha","issue":{"labels":{"Widget design system":{"conditions":[{"label":"App Theming","type":"hasLabel","value":true},{"label":"Widget Styling","type":"hasLabel","value":true},{"label":"Checkbox Group widget","type":"hasLabel","value":true},{"label":"Checkbox Widget","type":"hasLabel","value":true},{"label":"Checkbox Component","type":"hasLabel","value":true},{"label":"WDS team","type":"hasLabel","value":true}],"requires":1},"Performance Pod":{"conditions":[{"label":"Performance","type":"hasLabel","value":true},{"label":"Performance infra","type":"hasLabel","value":true}],"requires":1},"Billing & Usage Pod":{"conditions":[{"label":"CE Instance","type":"hasLabel","value":true},{"label":"Customer Portal","type":"hasLabel","value":true},{"label":"Cloud Services","type":"hasLabel","value":true},{"label":"Billing Integrations","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":"In-app ramps","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":"1-click upgrade","type":"hasLabel","value":true},{"label":"Appsmith Business Cloud","type":"hasLabel","value":true},{"label":"BE instance","type":"hasLabel","value":true}],"requires":1},"Mobile Pod":{"conditions":[],"requires":1},"Git Pod":{"conditions":[{"label":"Git Version Control","type":"hasLabel","value":true},{"label":"Import-Export-App","type":"hasLabel","value":true}],"requires":1},"Integrations Pod":{"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":"REST API plugin","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}],"requires":1},"Data Platform Pod":{"conditions":[{"label":"Datasource Environments","type":"hasLabel","value":true},{"label":"Datatype issue","type":"hasLabel","value":true},{"label":"Entity Refactor","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":"SmartSubstitution","type":"hasLabel","value":true},{"label":"Query Generation","type":"hasLabel","value":true},{"label":"Query performance","type":"hasLabel","value":true},{"label":"Suggested Widgets","type":"hasLabel","value":true},{"label":"Page load executions","type":"hasLabel","value":true},{"label":"DSL Update","type":"hasLabel","value":true},{"label":"AST-backend","type":"hasLabel","value":true},{"label":"Deploy App","type":"hasLabel","value":true},{"label":"File upload issues","type":"hasLabel","value":true},{"label":"Datasources","type":"hasLabel","value":true},{"label":"DocumentDB","type":"hasLabel","value":true},{"label":"Multiple Environments","type":"hasLabel","value":true},{"label":"Platformization","type":"hasLabel","value":true},{"label":"Custom environments","type":"hasLabel","value":true}],"requires":1},"Design System Pod":{"conditions":[{"label":"Design System Pod","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}],"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}],"requires":1},"Team Managers Pod":{"conditions":[{"label":"Settings","type":"hasLabel","value":true},{"label":"Home Page","type":"hasLabel","value":true},{"label":"Invite users","type":"hasLabel","value":true},{"label":"Realtime Commenting","type":"hasLabel","value":true},{"label":"SSO","type":"hasLabel","value":true},{"label":"Multi User Realtime","type":"hasLabel","value":true},{"label":"RBAC","type":"hasLabel","value":true},{"label":"ABAC","type":"hasLabel","value":true},{"label":"Audit Logs","type":"hasLabel","value":true},{"label":"Multitenancy","type":"hasLabel","value":true},{"label":"Airgap","type":"hasLabel","value":true},{"label":"Enterprise Edition","type":"hasLabel","value":true},{"label":"SCIM","type":"hasLabel","value":true}],"requires":1},"New Developers Pod":{"conditions":[{"label":"Fork App","type":"hasLabel","value":true},{"label":"Omnibar","type":"hasLabel","value":true},{"label":"Onboarding","type":"hasLabel","value":true},{"label":"Telemetry","type":"hasLabel","value":true},{"label":"Entity Explorer","type":"hasLabel","value":true},{"label":"Generate Page","type":"hasLabel","value":true},{"label":"IDE","type":"hasLabel","value":true},{"label":"Sniping Mode","type":"hasLabel","value":true},{"label":"Example Apps","type":"hasLabel","value":true},{"label":"i18n","type":"hasLabel","value":true},{"label":"Welcome Screen","type":"hasLabel","value":true},{"label":"IDE Navigation","type":"hasLabel","value":true},{"label":"Login / Signup","type":"hasLabel","value":true},{"label":"Clean URLs","type":"hasLabel","value":true},{"label":"Embedding Apps","type":"hasLabel","value":true},{"label":"Feature Flagging","type":"hasLabel","value":true},{"label":"In App Comms","type":"hasLabel","value":true},{"label":"In App Comms","type":"hasLabel","value":true},{"label":"App setting","type":"hasLabel","value":true}],"requires":1},"BE Coders Pod":{"conditions":[{"label":"SAAS Plugins","type":"hasLabel","value":true},{"label":"SAAS Manager App","type":"hasLabel","value":true},{"label":"Data Platform Pod","type":"hasLabel","value":true},{"label":"Integrations Pod","type":"hasLabel","value":true}],"requires":1},"FE Coders Pod":{"conditions":[{"label":"JS Linting & Errors","type":"hasLabel","value":true},{"label":"Debugger","type":"hasLabel","value":true},{"label":"JS Snippets","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 Promises","type":"hasLabel","value":true},{"label":"JS Usability","type":"hasLabel","value":true},{"label":"Code Refactoring","type":"hasLabel","value":true},{"label":"storeValue","type":"hasLabel","value":true},{"label":"OnPageLoad","type":"hasLabel","value":true},{"label":"Framework Functions","type":"hasLabel","value":true},{"label":"Code Editor","type":"hasLabel","value":true},{"label":"JS Objects","type":"hasLabel","value":true},{"label":"JS Evaluation","type":"hasLabel","value":true},{"label":"AST-frontend","type":"hasLabel","value":true},{"label":"Custom JS Libraries","type":"hasLabel","value":true},{"label":"Action Selector","type":"hasLabel","value":true},{"label":"JS Function execution","type":"hasLabel","value":true},{"label":"Widget setter method","type":"hasLabel","value":true},{"label":"Error Handling","type":"hasLabel","value":true},{"label":"AI","type":"hasLabel","value":true}],"requires":1},"App Viewers Pod":{"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":"reallabel","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":"App Navigation","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":"Branding","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":"Widget design system","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}],"requires":1},"UI Builders Pod":{"conditions":[{"label":"Property Pane","type":"hasLabel","value":true},{"label":"Pages","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":"Canvas Zooms","type":"hasLabel","value":true},{"label":"Frontend Libraries Upgrade","type":"hasLabel","value":true},{"label":"Auto Height","type":"hasLabel","value":true},{"label":"Responsive Canvas","type":"hasLabel","value":true},{"label":"Responsive Widget","type":"hasLabel","value":true},{"label":"Responsive Viewport","type":"hasLabel","value":true},{"label":"Conversion Algorithm","type":"hasLabel","value":true},{"label":"Spacing","type":"hasLabel","value":true},{"label":"Browser specific","type":"hasLabel","value":true},{"label":"widget vertical alignment","type":"hasLabel","value":true},{"label":"Auto Layout","type":"hasLabel","value":true}],"requires":1},"User Education Pod":{"conditions":[{"label":"Content","type":"hasLabel","value":true},{"label":"Documentation","type":"hasLabel","value":true}],"requires":1},"Templates pod":{"conditions":[{"label":"Templates","type":"hasLabel","value":true},{"label":"Community template","type":"hasLabel","value":true},{"label":"Partial-import-export","type":"hasLabel","value":true}],"requires":1},"Error Handling":{"conditions":[],"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":"88054d","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":"e2ca68","name":"QA","description":""},"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":"9c0c8e","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"},"Settings":{"color":"f7ff60","name":"Settings","description":"organization, team & user settings"},"Fork App":{"color":"5369db","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":""},"Onboarding":{"color":"d5794b","name":"Onboarding","description":"Issues related to onboarding new developers"},"Pages":{"color":"d7fd80","name":"Pages","description":"Issues related to configuring pages"},"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"},"Widget Styling":{"color":"905420","name":"Widget Styling","description":"all about widget styling"},"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"},"App Viewers Pod":{"color":"cd8ef9","name":"App Viewers Pod","description":"This label assigns issues to the app viewers pod"},"Checkbox Widget":{"color":"88054d","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":"d73a4a","name":"Bug","description":"Something isn't working"},"Widget Validation":{"color":"6990BC","name":"Widget Validation","description":"Issues related to widget property validation"},"Generate Page":{"color":"f14274","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":""},"Team Managers Pod":{"color":"bddb81","name":"Team Managers Pod","description":"Issues that team managers care about for the security and efficiency of their teams"},"Import-Export-App":{"color":"15076d","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":"10b5ce","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":"771e69","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"},"Critical":{"color":"9b1b28","name":"Critical","description":"This issue needs immediate attention. Drop everything else"},"IDE":{"color":"61b2ee","name":"IDE","description":"Issues related to the IDE"},"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":"f28253","name":"TestGap","description":"Issues identified for test plan improvement"},"keyboard shortcut":{"color":"0688B6","name":"keyboard shortcut","description":""},"Git Version Control":{"color":"858172","name":"Git Version Control","description":"Issues related to version control"},"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":"a2e2f9","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},"Debugger":{"color":"e79062","name":"Debugger","description":"Issues related to the debugger"},"Quick effort":{"color":"95ED65","name":"Quick effort","description":"Something that'll take a few hours to build"},"Text Widget":{"color":"d130d1","name":"Text Widget","description":""},"Video Widget":{"color":"23dd4b","name":"Video Widget","description":""},"Datasources":{"color":"5052f6","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"},"UI Builders Pod":{"color":"517fba","name":"UI Builders Pod","description":"Issues that UI Builders face using appsmith"},"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"},"In App Comms":{"name":"In App Comms","description":"Issues around communication with appsmith instances","color":"463cca"},"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"},"BE Coders Pod":{"color":"5d9848","name":"BE Coders Pod","description":"Issues related to users writing code to fetch and update data"},"FE Coders Pod":{"color":"a7effc","name":"FE Coders Pod","description":"Issues related to users writing javascript in appsmith"},"New Developers Pod":{"color":"6310da","name":"New Developers Pod","description":"Issues that new developers face while exploring the IDE"},"Sniping Mode":{"name":"Sniping Mode","description":"Issues related to sniping mode","color":"6310da"},"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":"12b715"},"Responsive Viewport":{"color":"d12d2e","name":"Responsive Viewport","description":"Issues seen on different viewports like mobile"},"Widgets Pane":{"name":"Widgets Pane","description":"Issues related to the discovery and organisation of widgets","color":"ad5d78"},"Invite users":{"color":"1799b0","name":"Invite users","description":"Invite users flow and any associated actions"},"View Mode":{"color":"1799b0","name":"View Mode","description":"Issues related to the view mode"},"User Education Pod":{"name":"User Education Pod","description":"Issues related to user education","color":"1799b0"},"Content":{"name":"Content","description":"For content related topics i.e blogs, templates, videos","color":"a8dff7"},"Embedding Apps":{"name":"Embedding Apps","description":"Issues related to embedding","color":"26ef4f"},"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"},"REST API plugin":{"name":"REST API plugin","description":"REST API plugin 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":"ef9c9d"},"JS Promises":{"name":"JS Promises","description":"Issues related to promises","color":"d7771f"},"OnPageLoad":{"name":"OnPageLoad","description":"OnPageLoad issues on functions and queries","color":"50559d"},"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":"3897be"},"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"},"App Theming":{"name":"App Theming","description":"Items that are related to the App level theming controls epic","color":"905420"},"SSO":{"name":"SSO","description":"Issues, requests and enhancements around Single sign-on.","color":"bf019b"},"Multi User Realtime":{"name":"Multi User Realtime","description":"Issues related to multiple users using or editing an application","color":"e7b6ce"},"Templates":{"name":"Templates","description":"Issues related to templates","color":"b7e568"},"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"},"RBAC":{"name":"RBAC","description":"Issues, requests and enhancements around RBAC.","color":"9211c3"},"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"},"Tests":{"name":"Tests","description":"test item","color":"1c6990"},"DynamoDB":{"name":"DynamoDB","description":"Issues that are related to DynamoDB should have this label","color":"60885f"},"Design System Pod":{"name":"Design System Pod","description":"Appsmith design system related issues","color":"706f03"},"ABAC":{"color":"e009a5","name":"ABAC","description":"User permissions and access controls"},"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":"60885f"},"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":"bc0cba"},"Query performance":{"name":"Query performance","description":"Issues that have to do with lack in performance of query execution","color":"e4d966"},"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":"418fa4"},"Branding":{"name":"Branding","description":"All issues under branding and whitelabelling appsmith ecosystem","color":"7aaaf1"},"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"},"Audit Logs":{"name":"Audit Logs","description":"Audit trails to ensure data security","color":"f3fd62"},"MsSQL":{"name":"MsSQL","description":"Issues related to MsSQL plugin","color":"8078b0"},"Data Platform Pod":{"name":"Data Platform Pod","description":"Issues related to the underlying data platform","color":"3f8c3a"},"Integrations Pod":{"name":"Integrations Pod","description":"Issues related to a specific integration","color":"5dbbb1"},"Datasource Environments":{"name":"Datasource Environments","description":"Issues related to datasource environments","color":"bb7a14"},"Elastic Search":{"name":"Elastic Search","description":"Issues related to the elastic search datasource","color":"8078b0"},"Core Query Execution":{"color":"418fa4","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":"6a5b42"},"Query Settings":{"name":"Query Settings","description":"Issues related to the settings of all queries","color":"c7da7a"},"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":"e4d966"},"Query Generation":{"name":"Query Generation","description":"Issues related to query generation","color":"e4d966"},"Suggested Widgets":{"name":"Suggested Widgets","description":"Issues related to suggesting widgets based on query response","color":"e4d966"},"Page load executions":{"name":"Page load executions","description":"Issues related to page load execution","color":"5696b2"},"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"},"Git Pod":{"name":"Git Pod","description":"Anything related to git sync","color":"2e5ba4"},"Mobile Pod":{"name":"Mobile Pod","description":"All issues related to mobile responsiveness","color":"6c97fd"},"Responsive Widget":{"name":"Responsive Widget","description":"All issues related to widget responsiveness","color":"d12d2e"},"Responsive Canvas":{"name":"Responsive Canvas","description":"All issues related to canvas responsiveness","color":"45a0a8"},"Conversion Algorithm":{"name":"Conversion Algorithm","description":"All issue related to converting app from fixed to flex mode & vice versa","color":"d12d2e"},"Spacing":{"name":"Spacing","description":"All issue related to spacing between widgets in auto layout","color":"d12d2e"},"Browser specific":{"name":"Browser specific","description":"All issue related to browser","color":"d12d2e"},"Error Handling":{"name":"Error Handling","description":"Issues related to error handling","color":"4e1872"},"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":"434a3a"},"AST-backend":{"name":"AST-backend","description":"Backend issues related to AST parsing","color":"c476eb"},"MariaDB":{"name":"MariaDB","description":"MariaDB datasource","color":"8428c3"},"Billing & Usage Pod":{"name":"Billing & Usage Pod","description":"Issues pertaining to licensing, billing, usage across self serve and enterprise customers","color":"256808"},"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":"8154df"},"Action Selector":{"name":"Action Selector","description":"Issues related to action selector on the property pane","color":"2f9e20"},"Widget design system":{"name":"Widget design system","description":"","color":"11cc90"},"Deploy App":{"name":"Deploy App","description":"Issues related to app deployment","color":"6f6152"},"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"},"CE Instance":{"name":"CE Instance","description":"For all issues relating to usage, licensing or billing on the CE instance","color":"d2bc40"},"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"},"Billing Integrations":{"name":"Billing Integrations","description":"For all issues relating to 3P integrations Appsmith is using for billing & usage","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"},"Appsmith Business Cloud":{"name":"Appsmith Business Cloud","description":"Issues related to our business cloud offering","color":"89bb6c"},"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"},"In-app ramps":{"name":"In-app ramps","description":"For all tasks/issues relating to adding in-app ramps in the community edition of the product","color":"8abae0"},"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"},"1-click upgrade":{"name":"1-click upgrade","description":"For all issues/tasks related to 1-click upgrade & downgrade project","color":"129082"},"Feature Flagging":{"name":"Feature Flagging","description":"Anything related feature flagging flagsmith","color":"728126"},"SCIM":{"name":"SCIM","description":"Label to collate our SCIM issues","color":"61a852"},"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"},"Templates pod":{"name":"Templates pod","description":"Issues related to Templates","color":"b7e568"},"Community template":{"name":"Community template","description":"Label for development of community templates and its integration to platform","color":"8a0510"},"DocumentDB":{"name":"DocumentDB","description":"Issues related to support DocumentDB in Appsmith Data layer","color":"2c8b56"},"Multiple Environments":{"name":"Multiple Environments","description":"Issues or tasks related to multiple environments","color":"4e972b"},"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":"1e439c"},"AI":{"name":"AI","description":"All tasks related to AI","color":"69c7ca"},"Custom environments":{"name":"Custom environments","description":"Issues with creating or working with custom environments","color":"2137d6"},"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":"144206"},"BE instance":{"name":"BE instance","description":"For all issues related to license, billing on BE instance","color":"ae8f98"}},"success":true}
\ No newline at end of file
diff --git a/.github/workflows/ci-test-custom-script.yml b/.github/workflows/ci-test-custom-script.yml
index 38c70b80e4..65478c3ac2 100644
--- a/.github/workflows/ci-test-custom-script.yml
+++ b/.github/workflows/ci-test-custom-script.yml
@@ -168,6 +168,7 @@ jobs:
             -e APPSMITH_DISABLE_TELEMETRY=true \
             -e APPSMITH_INTERCOM_APP_ID=DUMMY_VALUE \
             -e APPSMITH_CLOUD_SERVICES_BASE_URL=http://host.docker.internal:5001 \
+            -e APPSMITH_CLOUD_SERVICES_SIGNATURE_BASE_URL=http://host.docker.internal:8090 \
             --add-host=host.docker.internal:host-gateway --add-host=api.segment.io:host-gateway --add-host=t.appsmith.com:host-gateway \
             cicontainer
 
@@ -291,7 +292,7 @@ jobs:
           if [[ ${{ inputs.pr }} -ne 0 ]]; then
             echo "COMMIT_INFO_MESSAGE=${{ env.COMMIT_INFO_MESSAGE }}" >> $GITHUB_ENV
           else
-            if [[ '$eventCommit' == 'null' ]]; then 
+            if [[ '$eventCommit' == 'null' ]]; then
               echo "COMMIT_INFO_MESSAGE=$(echo ${{ github.event_name }} | perl -pe 's/(^|_)./uc($&)/ge;s/_//g')" >> $GITHUB_ENV
               echo "COMMIT_INFO_MESSAGE=${{ env.COMMIT_INFO_MESSAGE}} by ${{ env.COMMIT_INFO_AUTHOR }}" >> $GITHUB_ENV
             else
@@ -300,7 +301,7 @@ jobs:
           fi
 
       - name: Run the cypress test
-        uses: cypress-io/github-action@v5
+        uses: cypress-io/github-action@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CYPRESS_USERNAME: ${{ secrets.CYPRESS_USERNAME }}
@@ -373,7 +374,7 @@ jobs:
         if: failure()
         run: |
           find ${{ github.workspace }}/app/client/cypress/cypress-logs -name '*.json' -type f | tail -n +11 | xargs -I {} rm -- {}
-      
+
       - name: Upload failed test cypress logs artifact
         if: failure()
         uses: actions/upload-artifact@v3
diff --git a/.github/workflows/ci-test-hosted.yml b/.github/workflows/ci-test-hosted.yml
index 10e48a2fe4..0798744669 100644
--- a/.github/workflows/ci-test-hosted.yml
+++ b/.github/workflows/ci-test-hosted.yml
@@ -230,7 +230,7 @@ jobs:
           fi
 
       - name: Run the cypress test
-        uses: cypress-io/github-action@v5
+        uses: cypress-io/github-action@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CYPRESS_USERNAME: ${{ secrets.CYPRESS_USERNAME }}
@@ -311,6 +311,13 @@ jobs:
           name: results-${{github.run_attempt}}
           path: ~/results
 
+      - name: Upload cypress snapshots
+        if: failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: snapshots
+          path: ${{ github.workspace }}/app/client/cypress/snapshots
+
       # Set status = failedtest
       - name: Set fail if there are test failures
         id: test_status
diff --git a/.github/workflows/ci-test-limited.yml b/.github/workflows/ci-test-limited.yml
index fa13c35e94..6d36387c8a 100644
--- a/.github/workflows/ci-test-limited.yml
+++ b/.github/workflows/ci-test-limited.yml
@@ -336,7 +336,7 @@ jobs:
           fi
 
       - name: Run the cypress test
-        uses: cypress-io/github-action@v5
+        uses: cypress-io/github-action@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CYPRESS_USERNAME: ${{ secrets.CYPRESS_USERNAME }}
diff --git a/.github/workflows/client-build.yml b/.github/workflows/client-build.yml
index 9c444f4191..d3b3b4554a 100644
--- a/.github/workflows/client-build.yml
+++ b/.github/workflows/client-build.yml
@@ -21,6 +21,11 @@ on:
         description: "This is the branch to be used for the build."
         required: false
         type: string
+      ads-compliant-check:
+        description: "This is a boolean value in case the workflow is being called in build deploy-preview"
+        required: false
+        type: string
+        default: "true"
 
 
 # Change the working directory for all the jobs in this workflow
@@ -93,7 +98,7 @@ jobs:
           done
           echo "non_ts_files=${non_ts_files[@]}" >> $GITHUB_OUTPUT
           echo "non_ts_files_count=${#non_ts_files[@]}" >> $GITHUB_OUTPUT
-          
+      
       # Comment in PR if test files are not written in ts and fail the workflow    
       - name: Comment in PR if test files are not written in ts
         if: steps.check_files.outputs.non_ts_files_count != 0 && inputs.check-test-files == 'true' && inputs.pr != 0
@@ -106,6 +111,46 @@ jobs:
             <ol>${{ steps.check_files.outputs.non_ts_files }}</ol>
       - if: steps.check_files.outputs.non_ts_files_count != 0 && inputs.check-test-files == 'true' && inputs.pr != 0
         run: exit 1
+           
+      - name: Get all the added or changed files in client/src folder
+        if: inputs.ads-compliant-check == 'true' && inputs.pr != 0 && github.pull_request.base.ref == 'release'
+        id: client_files
+        uses: umani/changed-files@v4.0.0
+        with:
+          repo-token: ${{ secrets.APPSMITH_CI_TEST_PAT }}
+          pattern: 'app/client/src/.*'
+          pr-number: ${{ inputs.pr }}
+
+      # Check all the newly added files are in ts  
+      - name: ADS compliant check
+        if: inputs.ads-compliant-check == 'true' && inputs.pr != 0 && github.pull_request.base.ref == 'release'
+        id: ads_check
+        run: |
+          comment_files=""
+          files=(${{steps.client_files.outputs.files_created}}${{steps.client_files.outputs.files_updated}})
+          for file in "${files[@]}"; do
+              while IFS= read -r line; do
+                if echo "$line" | grep -q -E '(color|Color).*#|border.*#|(color|Color).*"'; then
+                  comment_files+=("$file")
+                  break
+                fi
+              done < ${file#app/client/}
+          done
+          unique_files=$(echo "${comment_files[@]}" | sort -u | sed '/^[[:space:]]*$/d' | sed 's/ / <li>/g')
+          echo "ads_non_compliant_files=$unique_files" >> $GITHUB_OUTPUT
+          echo "ads_non_compliant_count=${#unique_files[@]}" >> $GITHUB_OUTPUT
+
+      # Comment in PR if test files are not written in ts and fail the workflow    
+      - name: Comment in PR if test files are not written in ts
+        if: steps.ads_check.outputs.ads_non_compliant_count != 0 && inputs.ads-compliant-check == 'true' && inputs.pr != 0 && github.pull_request.base.ref == 'release'
+        uses: peter-evans/create-or-update-comment@v1
+        with:
+          issue-number: ${{ inputs.pr }}
+          body: |
+            <b> 🔴 Below files are not compliant with ADS. Please fix and re-trigger ok-to-test </b>
+            <ol>${{steps.ads_check.outputs.ads_non_compliant_files}}</ol>
+      - if: steps.ads_check.outputs.ads_non_compliant_count != 0 && inputs.ads-compliant-check == 'true' && inputs.pr != 0 && github.pull_request.base.ref == 'release'
+        run: exit 1
 
       # Create a run record exactly at the time of merge to release to
       # ensure we compare run details with code at this point
diff --git a/.github/workflows/perf-test-v2.yml b/.github/workflows/perf-test-v2.yml
index dc5155b511..dea2deac57 100644
--- a/.github/workflows/perf-test-v2.yml
+++ b/.github/workflows/perf-test-v2.yml
@@ -29,6 +29,11 @@ jobs:
       run:
         working-directory: app/client
         shell: bash
+    
+    strategy:
+      fail-fast: false
+      matrix:
+        job: [0, 1]
 
     # Service containers to run with this job. Required for running tests
     services:
@@ -222,6 +227,7 @@ jobs:
           POSTGRES_PASSWORD: postgres
           NODE_TLS_REJECT_UNAUTHORIZED: "0"
           MACHINE: ubuntu-latest-4-cores
+          JOB: ${{ matrix.job }}
 
         run: ./start-test.sh
 
diff --git a/Dockerfile b/Dockerfile
index cf0f664378..9b4a29f641 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,17 +23,14 @@ RUN apt-get update \
   && apt-get remove --yes git python3-pip python3-venv \
   && apt-get autoremove --yes
 
-# Install MongoDB v5.0.14, Redis, NodeJS - Service Layer, PostgreSQL v13
+# Install MongoDB v5.0.14, Redis, PostgreSQL v13
 RUN curl --silent --show-error --location https://www.mongodb.org/static/pgp/server-5.0.asc | apt-key add - \
   && echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/5.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-5.0.list \
-  && curl --silent --show-error --location https://deb.nodesource.com/setup_18.x | bash - \
-  && echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list \
+  && echo "deb http://apt.postgresql.org/pub/repos/apt $(grep CODENAME /etc/lsb-release | cut -d= -f2)-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list \
   && curl --silent --show-error --location https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
   && apt update \
-  && apt-get install --no-install-recommends --yes mongodb-org nodejs redis postgresql-13 \
-  && apt-get clean \
-  # This is to get semver 7.5.2, for a CVE fix, might be able to remove it with later versions on NodeJS.
-  && npm install -g npm@9.7.2
+  && apt-get install --no-install-recommends --yes mongodb-org redis postgresql-13 \
+  && apt-get clean
 
 # Install Java
 RUN set -o xtrace \
@@ -43,6 +40,12 @@ RUN set -o xtrace \
   && curl --location --output /tmp/java.tar.gz "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-$version/OpenJDK17U-jdk_$(uname -m | sed s/x86_64/x64/)_linux_hotspot_$(echo $version | tr + _).tar.gz" \
   && tar -xzf /tmp/java.tar.gz -C /opt/java --strip-components 1
 
+# Install NodeJS
+RUN set -o xtrace \
+  && mkdir -p /opt/node \
+  && file="$(curl -sS 'https://nodejs.org/dist/latest-v18.x/' | awk -F\" '$2 ~ /linux-'"$(uname -m | sed 's/x86_64/x64/; s/aarch64/arm64/')"'.tar.gz/ {print $2}')" \
+  && curl "https://nodejs.org/dist/latest-v18.x/$file" | tar -xz -C /opt/node --strip-components 1
+
 # Clean up cache file - Service layer
 RUN rm -rf \
   /root/.cache \
@@ -85,6 +88,8 @@ COPY ./app/client/build editor/
 # Add RTS - Application Layer
 COPY ./app/client/packages/rts/dist rts/
 
+ENV PATH /opt/appsmith/utils/node_modules/.bin:/opt/java/bin:/opt/node/bin:$PATH
+
 RUN cd ./utils && npm install --only=prod && npm install --only=prod -g . && cd - \
   && chmod 0644 /etc/cron.d/* \
   && chmod +x entrypoint.sh renew-certificate.sh healthcheck.sh templates/nginx-app.conf.sh /watchtower-hooks/*.sh \
@@ -92,8 +97,6 @@ RUN cd ./utils && npm install --only=prod && npm install --only=prod -g . && cd
   && find / \( -path /proc -prune \) -o \( \( -perm -2000 -o -perm -4000 \) -print -exec chmod -s '{}' + \) || true \
   && node prepare-image.mjs
 
-ENV PATH /opt/appsmith/utils/node_modules/.bin:/opt/java/bin:$PATH
-
 LABEL com.centurylinklabs.watchtower.lifecycle.pre-check=/watchtower-hooks/pre-check.sh
 LABEL com.centurylinklabs.watchtower.lifecycle.pre-update=/watchtower-hooks/pre-update.sh
 
diff --git a/README.md b/README.md
index a34afce3ab..62c5a4723c 100644
--- a/README.md
+++ b/README.md
@@ -80,8 +80,8 @@ Let's build great software together.
 [![AnaghHegde](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/12005551?v=4&w=50&h=50&mask=circle)](https://github.com/AnaghHegde)
 [![arunvjn](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/32433245?v=4&w=50&h=50&mask=circle)](https://github.com/arunvjn)
 [![NandanAnantharamu](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/67676905?v=4&w=50&h=50&mask=circle)](https://github.com/NandanAnantharamu)
-[![nayan-rafiq](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/83352306?v=4&w=50&h=50&mask=circle)](https://github.com/nayan-rafiq)
 [![abhvsn](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/41686026?v=4&w=50&h=50&mask=circle)](https://github.com/abhvsn)
+[![nayan-rafiq](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/83352306?v=4&w=50&h=50&mask=circle)](https://github.com/nayan-rafiq)
 [![ankitakinger](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/28362912?v=4&w=50&h=50&mask=circle)](https://github.com/ankitakinger)
 [![jsartisan](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/6636360?v=4&w=50&h=50&mask=circle)](https://github.com/jsartisan)
 [![Rishabh-Rathod](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/23132741?v=4&w=50&h=50&mask=circle)](https://github.com/Rishabh-Rathod)
@@ -94,20 +94,19 @@ Let's build great software together.
 [![ayushpahwa](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/8526215?v=4&w=50&h=50&mask=circle)](https://github.com/ayushpahwa)
 [![yatinappsmith](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/84702014?v=4&w=50&h=50&mask=circle)](https://github.com/yatinappsmith)
 [![Parthvi12](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/80334441?v=4&w=50&h=50&mask=circle)](https://github.com/Parthvi12)
-[![somangshu](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/11089579?v=4&w=50&h=50&mask=circle)](https://github.com/somangshu)
 [![ApekshaBhosale](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/7846888?v=4&w=50&h=50&mask=circle)](https://github.com/ApekshaBhosale)
+[![somangshu](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/11089579?v=4&w=50&h=50&mask=circle)](https://github.com/somangshu)
+[![pratapaprasanna](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/15846947?v=4&w=50&h=50&mask=circle)](https://github.com/pratapaprasanna)
 [![pranavkanade](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/13262095?v=4&w=50&h=50&mask=circle)](https://github.com/pranavkanade)
 [![sneha122](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/30018882?v=4&w=50&h=50&mask=circle)](https://github.com/sneha122)
-[![pratapaprasanna](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/15846947?v=4&w=50&h=50&mask=circle)](https://github.com/pratapaprasanna)
 [![albinAppsmith](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/87797149?v=4&w=50&h=50&mask=circle)](https://github.com/albinAppsmith)
-[![sum35h](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/20785806?v=4&w=50&h=50&mask=circle)](https://github.com/sum35h)
 [![marks0351](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/35134347?v=4&w=50&h=50&mask=circle)](https://github.com/marks0351)
 [![ashit-rath](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/88306433?v=4&w=50&h=50&mask=circle)](https://github.com/ashit-rath)
 [![nsarupr](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/20905988?v=4&w=50&h=50&mask=circle)](https://github.com/nsarupr)
 [![rajatagrawal](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/1189106?v=4&w=50&h=50&mask=circle)](https://github.com/rajatagrawal)
+[![sondermanish](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/107841575?v=4&w=50&h=50&mask=circle)](https://github.com/sondermanish)
 [![NilanshBansal](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/25542733?v=4&w=50&h=50&mask=circle)](https://github.com/NilanshBansal)
 [![dhruvikn](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/22471214?v=4&w=50&h=50&mask=circle)](https://github.com/dhruvikn)
-[![sondermanish](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/107841575?v=4&w=50&h=50&mask=circle)](https://github.com/sondermanish)
 [![KelvinOm](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/11555074?v=4&w=50&h=50&mask=circle)](https://github.com/KelvinOm)
 [![areyabhishek](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/30255708?v=4&w=50&h=50&mask=circle)](https://github.com/areyabhishek)
 [![Druthi](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/20187542?v=4&w=50&h=50&mask=circle)](https://github.com/Druthi)
@@ -121,11 +120,11 @@ Let's build great software together.
 [![sharanya-appsmith](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/135708039?v=4&w=50&h=50&mask=circle)](https://github.com/sharanya-appsmith)
 [![brayn003](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/8724051?v=4&w=50&h=50&mask=circle)](https://github.com/brayn003)
 [![shubham7saxena7](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/136057998?v=4&w=50&h=50&mask=circle)](https://github.com/shubham7saxena7)
-[![ramsaptami](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/79509062?v=4&w=50&h=50&mask=circle)](https://github.com/ramsaptami)
 [![dvj1988](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/18716465?v=4&w=50&h=50&mask=circle)](https://github.com/dvj1988)
+[![ramsaptami](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/79509062?v=4&w=50&h=50&mask=circle)](https://github.com/ramsaptami)
 [![vivonk](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/25587962?v=4&w=50&h=50&mask=circle)](https://github.com/vivonk)
-[![gitstart-appsmith](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/114667275?v=4&w=50&h=50&mask=circle)](https://github.com/gitstart-appsmith)
 [![rohan-arthur](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/94514895?v=4&w=50&h=50&mask=circle)](https://github.com/rohan-arthur)
+[![gitstart-appsmith](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/114667275?v=4&w=50&h=50&mask=circle)](https://github.com/gitstart-appsmith)
 [![danciaclara](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/32227135?v=4&w=50&h=50&mask=circle)](https://github.com/danciaclara)
 [![kocharrahul7](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/20532920?v=4&w=50&h=50&mask=circle)](https://github.com/kocharrahul7)
 [![riteshkew](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/20280935?v=4&w=50&h=50&mask=circle)](https://github.com/riteshkew)
@@ -186,6 +185,7 @@ Let's build great software together.
 [![Vijetha-Kaja](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/119562824?v=4&w=50&h=50&mask=circle)](https://github.com/Vijetha-Kaja)
 [![haojin111](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/63215848?v=4&w=50&h=50&mask=circle)](https://github.com/haojin111)
 [![berzerkeer](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/74818788?v=4&w=50&h=50&mask=circle)](https://github.com/berzerkeer)
+[![sum35h](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/20785806?v=4&w=50&h=50&mask=circle)](https://github.com/sum35h)
 [![ChandanBalajiBP](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/104058110?v=4&w=50&h=50&mask=circle)](https://github.com/ChandanBalajiBP)
 [![devrk96](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/68607686?v=4&w=50&h=50&mask=circle)](https://github.com/devrk96)
 [![keyurparalkar](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/14138515?v=4&w=50&h=50&mask=circle)](https://github.com/keyurparalkar)
diff --git a/app/client/.eslintrc.base.json b/app/client/.eslintrc.base.json
index c59e7e0ac4..b075c619bc 100644
--- a/app/client/.eslintrc.base.json
+++ b/app/client/.eslintrc.base.json
@@ -35,6 +35,7 @@
     "project": "./tsconfig.json"
   },
   "rules": {
+    "@typescript-eslint/consistent-type-definitions": "error",
     "@typescript-eslint/prefer-nullish-coalescing": "error",
     "@typescript-eslint/promise-function-async": "error",
     "@typescript-eslint/strict-boolean-expressions": "error",
diff --git a/app/client/.husky/check-staged-files.sh b/app/client/.husky/check-staged-files.sh
index 8bf3f3e2da..07076b46fc 100644
--- a/app/client/.husky/check-staged-files.sh
+++ b/app/client/.husky/check-staged-files.sh
@@ -7,7 +7,7 @@ is_merge_commit=$(git rev-parse -q --verify MERGE_HEAD)
 
 if [ "$is_merge_commit" ]; then
   echo "Skipping server and client checks for merge commit"
-else 
+else
   if [ "$is_server_change" -ge 1 ]; then
     echo "Running Spotless check ..."
     pushd app/server > /dev/null
@@ -23,7 +23,7 @@ else
 
   if [ "$is_client_change" -ge 1  ]; then
     echo "Running client check ..."
-    npx lint-staged --cwd app/client && git-secrets --scan --untracked && git-secrets --scan -r
+    npx lint-staged --cwd app/client
   else
     echo "Skipping client side check..."
   fi
diff --git a/app/client/.lintstagedrc b/app/client/.lintstagedrc
deleted file mode 100644
index 1f4e72ac35..0000000000
--- a/app/client/.lintstagedrc
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"src/**/*.{js,ts,tsx}": ["npx eslint --fix"],
-	"src/**/*.{js,ts,tsx,css,md,json}": ["npx prettier --write"],
-	"cypress/**/*.{js,ts}": ["cd ./cypress && npx eslint -c .eslintrc.json --fix"],
-	"cypress/**/*.{js,ts,json}": ["npx prettier --write"],
-	"packages/**/*.{js,ts,tsx}": ["npx eslint --fix"],
-	"packages/**/*.{js,ts,tsx,css,mdx,json}": ["npx prettier --write"]
-}
diff --git a/app/client/.lintstagedrc.json b/app/client/.lintstagedrc.json
new file mode 100644
index 0000000000..53c60f061f
--- /dev/null
+++ b/app/client/.lintstagedrc.json
@@ -0,0 +1,11 @@
+{
+  "src/**/*.{js,ts,tsx}": ["eslint --fix --cache"],
+  "src/**/*.{css,md,json}": ["prettier --write --cache"],
+  "cypress/**/*.{js,ts}": [
+    "cd ./cypress && eslint -c .eslintrc.json --fix --cache"
+  ],
+  "cypress/**/*.json": ["prettier --write --cache"],
+  "packages/**/*.{js,ts,tsx}": ["eslint --fix --cache"],
+  "packages/**/*.{css,mdx,json}": ["prettier --write --cache"],
+  "*": ["git-secrets --scan --cached"]
+}
diff --git a/app/client/craco.common.config.js b/app/client/craco.common.config.js
index a2c3185f65..7d007ff2b3 100644
--- a/app/client/craco.common.config.js
+++ b/app/client/craco.common.config.js
@@ -49,8 +49,6 @@ module.exports = {
                       "postcss-nesting",
                       "postcss-import",
                       "postcss-at-rules-variables",
-                      "postcss-conditionals",
-                      "postcss-for",
                       "postcss-each",
                       "postcss-url",
                       "postcss-modules-values",
diff --git a/app/client/cypress/e2e/GSheet/AllAccess_Spec.ts b/app/client/cypress/e2e/GSheet/AllAccess_Spec.ts
index c8f98e60b0..2b9d832712 100644
--- a/app/client/cypress/e2e/GSheet/AllAccess_Spec.ts
+++ b/app/client/cypress/e2e/GSheet/AllAccess_Spec.ts
@@ -6,6 +6,9 @@ import {
   dataSources,
   agHelper,
   entityExplorer,
+  table,
+  assertHelper,
+  appSettings,
 } from "../../support/Objects/ObjectsCore";
 
 const workspaceName = "gsheet apps";
@@ -22,8 +25,7 @@ describe("GSheet-Functional Tests With All Access", function () {
 
     //Adding query to insert a new spreadsheet
     homePage.NavigateToHome();
-    homePage.CreateAppInWorkspace(workspaceName);
-    homePage.RenameApplication(appName);
+    homePage.CreateAppInWorkspace(workspaceName, appName);
     gsheetHelper.AddNewSpreadsheetQuery(
       dataSourceName,
       spreadSheetName,
@@ -285,8 +287,44 @@ describe("GSheet-Functional Tests With All Access", function () {
     });
   });
 
+  it("8. Import an app with all access sheet", function () {
+    homePage.NavigateToHome();
+    homePage.ImportApp("ImportAppAllAccess.json", workspaceName);
+    assertHelper.WaitForNetworkCall("importNewApplication").then(() => {
+      agHelper.Sleep();
+      //Validate table is not empty!
+      table.WaitUntilTableLoad(0, 0, "v2");
+    });
+    // Assert table data
+    table.ReadTableRowColumnData(0, 0, "v2").then((cellData) => {
+      expect(cellData).to.eq("eac7efa5dbd3d667f26eb3d3ab504464");
+    });
+    homePage.NavigateToHome();
+    homePage.DeleteApplication("ImportAppAllAccess");
+  });
+
+  it("9. App level import of app with all access gsheet", function () {
+    homePage.CreateAppInWorkspace(workspaceName, "AppLevelImport");
+    appSettings.OpenAppSettings();
+    appSettings.GoToImport();
+    agHelper.ClickButton("Import");
+    homePage.ImportApp("ImportAppAllAccess.json", "", true);
+    cy.wait("@importNewApplication").then(() => {
+      agHelper.Sleep();
+      agHelper.RefreshPage();
+      table.WaitUntilTableLoad(0, 0, "v2");
+    });
+    // Assert table data
+    table.ReadTableRowColumnData(0, 0, "v2").then((cellData) => {
+      expect(cellData).to.eq("eac7efa5dbd3d667f26eb3d3ab504464");
+    });
+    homePage.NavigateToHome();
+    homePage.DeleteApplication("AppLevelImport");
+  });
+
   after("Delete spreadsheet and app", function () {
     // Delete spreadsheet and app
+    homePage.SearchAndOpenApp(appName);
     gsheetHelper.DeleteSpreadsheetQuery(dataSourceName, spreadSheetName);
     cy.get("@postExecute").then((interception: any) => {
       expect(interception.response.body.data.body.message).to.deep.equal(
diff --git a/app/client/cypress/e2e/GSheet/Misc_Spec.ts b/app/client/cypress/e2e/GSheet/Misc_Spec.ts
index d21821a4a4..647f84562f 100644
--- a/app/client/cypress/e2e/GSheet/Misc_Spec.ts
+++ b/app/client/cypress/e2e/GSheet/Misc_Spec.ts
@@ -11,6 +11,7 @@ import {
   deployMode,
   locators,
   draggableWidgets,
+  appSettings,
 } from "../../support/Objects/ObjectsCore";
 
 const workspaceName = "gsheet apps";
@@ -45,6 +46,7 @@ describe("GSheet Miscellaneous Tests", function () {
       JSON.stringify(GSHEET_DATA),
     );
     cy.get("@postExecute").then((interception: any) => {
+      agHelper.Sleep();
       expect(
         interception.response.body.data.body.properties.title,
       ).to.deep.equal(spreadSheetName);
@@ -212,8 +214,62 @@ describe("GSheet Miscellaneous Tests", function () {
     table.WaitUntilTableLoad();
   });
 
+  it("6. Bug: 16391 - Verify placeholder texts for insert one/many queries", function () {
+    // Verify place holder text for Insert one query
+    let placeholderText =
+      '{\n  "name": {{nameInput.text}},\n  "dob": {{dobPicker.formattedDate}},\n  "gender": {{genderSelect.selectedOptionValue}} \n}';
+    gsheetHelper.EnterBasicQueryValues(
+      "Insert One",
+      dataSourceName,
+      spreadSheetName,
+      false,
+    );
+    agHelper.AssertText(
+      dataSources._gSheetQueryPlaceholder,
+      "text",
+      placeholderText,
+    );
+
+    // Verify place holder text for Insert many query
+    placeholderText =
+      '[{\n  "name": {{nameInput.text}},\n  "dob": {{dobPicker.formattedDate}},\n  "gender": {{genderSelect.selectedOptionValue}} \n}]';
+
+    gsheetHelper.EnterBasicQueryValues(
+      "Insert Many",
+      dataSourceName,
+      spreadSheetName,
+      false,
+    );
+    agHelper.AssertText(
+      dataSources._gSheetQueryPlaceholder,
+      "text",
+      placeholderText,
+    );
+  });
+
+  // This test is commented since we can't use Cypress to go to the Google authorization screen. We will uncomment it whenever we figure out how to do it.
+  // it("7. Bug#26024 App level import of gsheet app", function () {
+  //   homePage.NavigateToHome();
+  //   homePage.CreateNewWorkspace("AppLevelImport");
+  //   homePage.CreateAppInWorkspace("AppLevelImport", "AppLevelImportCheck");
+  //   appSettings.OpenAppSettings();
+  //   appSettings.GoToImport();
+  //   agHelper.ClickButton("Import");
+  //   homePage.ImportApp("ImportAppAllAccess.json", "", true);
+  //   cy.wait("@importNewApplication").then(() => {
+  //     agHelper.Sleep();
+  //     agHelper.ClickButton("Save and authorize");
+  //   });
+  //   cy.url().should("contain", "accounts.google.com");
+  //   homePage.NavigateToHome();
+  //   homePage.DeleteApplication("AppLevelImportCheck");
+  //   homePage.DeleteWorkspace("AppLevelImport");
+  // });
+
   after("Delete spreadsheet and app", function () {
     // Delete spreadsheet and app
+    homePage.NavigateToHome();
+    homePage.SearchAndOpenApp(appName);
     gsheetHelper.DeleteSpreadsheetQuery(dataSourceName, spreadSheetName);
     cy.get("@postExecute").then((interception: any) => {
       expect(interception.response.body.data.body.message).to.deep.equal(
diff --git a/app/client/cypress/e2e/GSheet/ReadNWrite_Access_Spec.ts b/app/client/cypress/e2e/GSheet/ReadNWrite_Access_Spec.ts
index 11e4c9073c..8d423f1641 100644
--- a/app/client/cypress/e2e/GSheet/ReadNWrite_Access_Spec.ts
+++ b/app/client/cypress/e2e/GSheet/ReadNWrite_Access_Spec.ts
@@ -6,6 +6,9 @@ import {
   dataSources,
   agHelper,
   entityExplorer,
+  assertHelper,
+  table,
+  appSettings,
 } from "../../support/Objects/ObjectsCore";
 
 describe("GSheet-Functional Tests With Read/Write Access", function () {
@@ -26,8 +29,7 @@ describe("GSheet-Functional Tests With Read/Write Access", function () {
 
     //Adding query to insert a new spreadsheet
     homePage.NavigateToHome();
-    homePage.CreateAppInWorkspace(workspaceName);
-    homePage.RenameApplication(appName);
+    homePage.CreateAppInWorkspace(workspaceName, appName);
     gsheetHelper.AddNewSpreadsheetQuery(
       dataSourceName.readNWrite,
       spreadSheetName,
@@ -296,8 +298,44 @@ describe("GSheet-Functional Tests With Read/Write Access", function () {
     });
   });
 
+  it("9. Import an app with read write access sheet", function () {
+    homePage.NavigateToHome();
+    homePage.ImportApp("ImportAppReadWriteAccess.json", workspaceName);
+    assertHelper.WaitForNetworkCall("importNewApplication").then(() => {
+      agHelper.Sleep();
+      //Validate table is not empty!
+      table.WaitUntilTableLoad(0, 0, "v2");
+    });
+    // Assert table data
+    table.ReadTableRowColumnData(0, 0, "v2").then((cellData) => {
+      expect(cellData).to.eq("eac7efa5dbd3d667f26eb3d3ab504464");
+    });
+    homePage.NavigateToHome();
+    homePage.DeleteApplication("ImportAppReadWriteAccess");
+  });
+
+  it("10. App level import of app with read and write access gsheet", function () {
+    homePage.CreateAppInWorkspace(workspaceName, "AppLevelImportReadNWrite");
+    appSettings.OpenAppSettings();
+    appSettings.GoToImport();
+    agHelper.ClickButton("Import");
+    homePage.ImportApp("ImportAppReadWriteAccess.json", "", true);
+    cy.wait("@importNewApplication").then(() => {
+      agHelper.Sleep();
+      agHelper.RefreshPage();
+      table.WaitUntilTableLoad(0, 0, "v2");
+    });
+    // Assert table data
+    table.ReadTableRowColumnData(0, 0, "v2").then((cellData) => {
+      expect(cellData).to.eq("eac7efa5dbd3d667f26eb3d3ab504464");
+    });
+    homePage.NavigateToHome();
+    homePage.DeleteApplication("AppLevelImportReadNWrite");
+  });
+
   after("Delete spreadsheet and app", function () {
     // Delete spreadsheet and app
+    homePage.SearchAndOpenApp(appName);
     gsheetHelper.DeleteSpreadsheetQuery(
       dataSourceName.allAccess,
       spreadSheetName,
diff --git a/app/client/cypress/e2e/GSheet/ReadOnly_Access_Spec.ts b/app/client/cypress/e2e/GSheet/ReadOnly_Access_Spec.ts
index 1561282ae9..7165c5ba1f 100644
--- a/app/client/cypress/e2e/GSheet/ReadOnly_Access_Spec.ts
+++ b/app/client/cypress/e2e/GSheet/ReadOnly_Access_Spec.ts
@@ -6,6 +6,9 @@ import {
   dataSources,
   agHelper,
   entityExplorer,
+  assertHelper,
+  table,
+  appSettings,
 } from "../../support/Objects/ObjectsCore";
 
 describe("GSheet-Functional Tests With Read Access", function () {
@@ -26,8 +29,7 @@ describe("GSheet-Functional Tests With Read Access", function () {
 
     //Adding query to insert a new spreadsheet
     homePage.NavigateToHome();
-    homePage.CreateAppInWorkspace(workspaceName);
-    homePage.RenameApplication(appName);
+    homePage.CreateAppInWorkspace(workspaceName, appName);
     gsheetHelper.AddNewSpreadsheetQuery(
       dataSourceName.allAccess,
       spreadSheetName,
@@ -278,8 +280,47 @@ describe("GSheet-Functional Tests With Read Access", function () {
     });
   });
 
+  it("8. Import an app with read only access sheet", function () {
+    homePage.NavigateToHome();
+    homePage.ImportApp("ImportAppReadAccess.json", workspaceName);
+    assertHelper.WaitForNetworkCall("importNewApplication").then(() => {
+      agHelper.Sleep();
+      //Validate table is not empty!
+      table.WaitUntilTableLoad(0, 0, "v2");
+    });
+    // Assert table data
+    table.ReadTableRowColumnData(0, 0, "v2").then((cellData) => {
+      expect(cellData).to.eq("eac7efa5dbd3d667f26eb3d3ab504464");
+    });
+    homePage.NavigateToHome();
+    homePage.DeleteApplication("ImportAppReadAccess");
+  });
+
+  it("9. App level import of app with read only access gsheet", function () {
+    homePage.CreateAppInWorkspace(
+      workspaceName,
+      "AppLevelImportReadOnlyAccess",
+    );
+    appSettings.OpenAppSettings();
+    appSettings.GoToImport();
+    agHelper.ClickButton("Import");
+    homePage.ImportApp("ImportAppReadAccess.json", "", true);
+    cy.wait("@importNewApplication").then(() => {
+      agHelper.Sleep();
+      agHelper.RefreshPage();
+      table.WaitUntilTableLoad(0, 0, "v2");
+    });
+    // Assert table data
+    table.ReadTableRowColumnData(0, 0, "v2").then((cellData) => {
+      expect(cellData).to.eq("eac7efa5dbd3d667f26eb3d3ab504464");
+    });
+    homePage.NavigateToHome();
+    homePage.DeleteApplication("AppLevelImportReadOnlyAccess");
+  });
+
   after("Delete spreadsheet and app", function () {
     // Delete spreadsheet and app
+    homePage.SearchAndOpenApp(appName);
     gsheetHelper.DeleteSpreadsheetQuery(
       dataSourceName.allAccess,
       spreadSheetName,
diff --git a/app/client/cypress/e2e/GSheet/SelectedSheet_Access_Spec.ts b/app/client/cypress/e2e/GSheet/SelectedSheet_Access_Spec.ts
index 4415ae80f0..a2257078c1 100644
--- a/app/client/cypress/e2e/GSheet/SelectedSheet_Access_Spec.ts
+++ b/app/client/cypress/e2e/GSheet/SelectedSheet_Access_Spec.ts
@@ -6,6 +6,9 @@ import {
   dataSources,
   agHelper,
   entityExplorer,
+  assertHelper,
+  table,
+  appSettings,
 } from "../../support/Objects/ObjectsCore";
 
 const workspaceName = "gsheet apps";
@@ -20,8 +23,7 @@ describe("GSheet-Functional Tests With Selected Access", function () {
 
     //Adding app
     homePage.NavigateToHome();
-    homePage.CreateAppInWorkspace(workspaceName);
-    homePage.RenameApplication(appName);
+    homePage.CreateAppInWorkspace(workspaceName, appName);
   });
 
   it("1. Add and verify fetch details query", () => {
@@ -290,9 +292,46 @@ describe("GSheet-Functional Tests With Selected Access", function () {
     });
   });
 
+  it("8. Import an app with selected access sheet", function () {
+    homePage.NavigateToHome();
+    homePage.ImportApp("ImportAppSelectedAccess.json", workspaceName);
+    assertHelper.WaitForNetworkCall("importNewApplication").then(() => {
+      agHelper.Sleep();
+      //Validate table is not empty!
+      table.WaitUntilTableLoad(0, 0, "v2");
+    });
+    // Assert table data
+    table.ReadTableRowColumnData(0, 0, "v2").then((cellData) => {
+      expect(cellData).to.eq("eac7efa5dbd3d667f26eb3d3ab504464");
+    });
+    homePage.NavigateToHome();
+    homePage.DeleteApplication("ImportAppSelectedAccess");
+  });
+
+  it("9. App level import of app with Selected sheet access gsheet", function () {
+    homePage.CreateAppInWorkspace(
+      workspaceName,
+      "AppLevelImportSelectedAccess",
+    );
+    appSettings.OpenAppSettings();
+    appSettings.GoToImport();
+    agHelper.ClickButton("Import");
+    homePage.ImportApp("ImportAppSelectedAccess.json", "", true);
+    cy.wait("@importNewApplication").then(() => {
+      agHelper.Sleep();
+      agHelper.RefreshPage();
+      table.WaitUntilTableLoad(0, 0, "v2");
+    });
+    // Assert table data
+    table.ReadTableRowColumnData(0, 0, "v2").then((cellData) => {
+      expect(cellData).to.eq("eac7efa5dbd3d667f26eb3d3ab504464");
+    });
+    homePage.NavigateToHome();
+    homePage.DeleteApplication("AppLevelImportSelectedAccess");
+  });
+
   after("Delete app", function () {
     // Delete app
-    homePage.NavigateToHome();
     homePage.DeleteApplication(appName);
   });
 });
diff --git a/app/client/cypress/e2e/GSheet/WidgetBinding_AllAccess_Spec.ts b/app/client/cypress/e2e/GSheet/WidgetBinding_AllAccess_Spec.ts
index ab06580b9f..efc7b798f3 100644
--- a/app/client/cypress/e2e/GSheet/WidgetBinding_AllAccess_Spec.ts
+++ b/app/client/cypress/e2e/GSheet/WidgetBinding_AllAccess_Spec.ts
@@ -51,6 +51,7 @@ describe("GSheet-widget binding", function () {
 
     // Adding suggested widgets and verify
     dataSources.AddSuggestedWidget(Widgets.Table);
+    agHelper.RefreshPage();
     table.ReadTableRowColumnData(0, 0, "v2").then((cellData) => {
       expect(cellData).to.eq("eac7efa5dbd3d667f26eb3d3ab504464");
     });
diff --git a/app/client/cypress/e2e/GSheet/WidgetBinding_SelectedAccess_Spec.ts b/app/client/cypress/e2e/GSheet/WidgetBinding_SelectedAccess_Spec.ts
index 1d72dbfee3..2ae27712c2 100644
--- a/app/client/cypress/e2e/GSheet/WidgetBinding_SelectedAccess_Spec.ts
+++ b/app/client/cypress/e2e/GSheet/WidgetBinding_SelectedAccess_Spec.ts
@@ -51,6 +51,7 @@ describe("GSheet-widget binding for selected sheet access", function () {
 
     // Adding suggested widgets and verify
     dataSources.AddSuggestedWidget(Widgets.Table);
+    agHelper.RefreshPage();
     table.ReadTableRowColumnData(0, 0, "v2").then((cellData) => {
       expect(cellData).to.eq("eac7efa5dbd3d667f26eb3d3ab504464");
     });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/AdminSettings/Admin_settings_spec.js b/app/client/cypress/e2e/Regression/ClientSide/AdminSettings/Admin_settings_spec.js
index 640d6ffee6..dcc7cf26ec 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/AdminSettings/Admin_settings_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/AdminSettings/Admin_settings_spec.js
@@ -62,8 +62,8 @@ describe("Admin settings page", function () {
       cy.url().should("contain", "/settings/authentication");
       cy.get(adminsSettings.emailTab).click();
       cy.url().should("contain", "/settings/email");
-      cy.get(adminsSettings.googleMapsTab).click();
-      cy.url().should("contain", "/settings/google-maps");
+      cy.get(adminsSettings.developerSettingsTab).click();
+      cy.url().should("contain", "/settings/developer-settings");
       cy.get(adminsSettings.versionTab).click();
       cy.url().should("contain", "/settings/version");
     },
@@ -90,7 +90,7 @@ describe("Admin settings page", function () {
       cy.url().should("contain", "/settings/authentication");
       cy.get(adminsSettings.emailTab).click();
       cy.url().should("contain", "/settings/email");
-      cy.get(adminsSettings.googleMapsTab).should("not.exist");
+      cy.get(adminsSettings.developerSettingsTab).should("not.exist");
       cy.get(adminsSettings.versionTab).click();
       cy.url().should("contain", "/settings/version");
     },
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_1_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_1_spec.js
index 28e19fae75..2e5524d998 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_1_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_1_spec.js
@@ -12,7 +12,7 @@ const routes = {
   SETTINGS: "/settings",
   GENERAL: "/settings/general",
   EMAIL: "/settings/email",
-  GOOGLE_MAPS: "/settings/google-maps",
+  DEVELOPER_SETTINGS: "/settings/developer-settings",
   AUTHENTICATION: "/settings/authentication",
   GOOGLEAUTH: "/settings/authentication/google-auth",
   GITHUBAUTH: "/settings/authentication/github-auth",
@@ -45,8 +45,8 @@ describe("Admin settings page", function () {
 
   it("2. should test that page header is visible", () => {
     cy.get(adminsSettings.appsmithHeader).should("be.visible");
-    cy.visit(routes.GOOGLE_MAPS, { timeout: 60000 });
-    cy.url().should("contain", "/google-maps");
+    cy.visit(routes.DEVELOPER_SETTINGS, { timeout: 60000 });
+    cy.url().should("contain", "/developer-settings");
     cy.wait(2000); //page to load properly
     cy.get(adminsSettings.appsmithHeader).should("be.visible");
     cy.visit(routes.GOOGLEAUTH, { timeout: 60000 });
@@ -84,8 +84,8 @@ describe("Admin settings page", function () {
       cy.url().should("contain", routes.AUTHENTICATION);
       cy.get(adminsSettings.emailTab).click();
       cy.url().should("contain", routes.EMAIL);
-      cy.get(adminsSettings.googleMapsTab).click();
-      cy.url().should("contain", routes.GOOGLE_MAPS);
+      cy.get(adminsSettings.developerSettingsTab).click();
+      cy.url().should("contain", routes.DEVELOPER_SETTINGS);
       cy.get(adminsSettings.versionTab).click();
       cy.url().should("contain", routes.VERSION);
     },
@@ -105,7 +105,7 @@ describe("Admin settings page", function () {
       cy.get(adminsSettings.authenticationTab).click();
       cy.url().should("contain", routes.AUTHENTICATION);
       cy.get(adminsSettings.emailTab).click();
-      cy.get(adminsSettings.googleMapsTab).should("not.exist");
+      cy.get(adminsSettings.developerSettingsTab).should("not.exist");
       cy.url().should("contain", routes.EMAIL);
       cy.get(adminsSettings.versionTab).click();
       cy.url().should("contain", routes.VERSION);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_2_spec.js
index 70020fe1e6..116f302685 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Admin_settings_2_spec.js
@@ -12,7 +12,7 @@ const routes = {
   SETTINGS: "/settings",
   GENERAL: "/settings/general",
   EMAIL: "/settings/email",
-  GOOGLE_MAPS: "/settings/google-maps",
+  DEVELOPER_SETTINGS: "/settings/developer-settings",
   AUTHENTICATION: "/settings/authentication",
   GOOGLEAUTH: "/settings/authentication/google-auth",
   GITHUBAUTH: "/settings/authentication/github-auth",
@@ -23,7 +23,7 @@ const routes = {
 
 describe("Admin settings page", function () {
   it("1. should test that configure link redirects to google maps setup doc", () => {
-    cy.visit(routes.GOOGLE_MAPS, { timeout: 60000 });
+    cy.visit(routes.DEVELOPER_SETTINGS, { timeout: 60000 });
     cy.get(adminsSettings.readMoreLink).within(() => {
       cy.get("a")
         .should("have.attr", "target", "_blank")
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/Connection_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/Connection_spec.js
index f89bb177d9..0f77bed7e9 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/Connection_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/Connection_spec.js
@@ -221,7 +221,7 @@ describe("Git sync modal: connect tab", function () {
     });
 
     cy.get(gitSyncLocators.connectSubmitBtn).scrollIntoView().click();
-    cy.get(gitSyncLocators.connetStatusbar).should("exist");
+    // cy.get(gitSyncLocators.connetStatusbar).should("exist");
     cy.wait("@connectGitLocalRepo").then((interception) => {
       const status = interception.response.body.responseMeta.status;
       expect(status).to.be.gte(400);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/RepoLimitExceededErrorModal_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/RepoLimitExceededErrorModal_spec.js
index f537cfe973..b42282c3e6 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/RepoLimitExceededErrorModal_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/RepoLimitExceededErrorModal_spec.js
@@ -92,26 +92,10 @@ describe("Repo Limit Exceeded Error Modal", function () {
   });
 
   after(() => {
-    cy.request({
-      method: "DELETE",
-      url: "api/v1/applications/" + repoName1,
-      failOnStatusCode: false,
-    });
-    cy.request({
-      method: "DELETE",
-      url: "api/v1/applications/" + repoName2,
-      failOnStatusCode: false,
-    });
-    cy.request({
-      method: "DELETE",
-      url: "api/v1/applications/" + repoName3,
-      failOnStatusCode: false,
-    });
-    cy.request({
-      method: "DELETE",
-      url: "api/v1/applications/" + repoName4,
-      failOnStatusCode: false,
-    });
+    homePage.DeleteAppviaAPI(repoName1);
+    homePage.DeleteAppviaAPI(repoName2);
+    homePage.DeleteAppviaAPI(repoName3);
+    homePage.DeleteAppviaAPI(repoName4);
     gitSync.DeleteTestGithubRepo(repoName1);
     gitSync.DeleteTestGithubRepo(repoName2);
     gitSync.DeleteTestGithubRepo(repoName3);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Selected_Widgets_spec.js b/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Selected_Widgets_spec.js
index 01f5416bd7..afe47d3a16 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Selected_Widgets_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/IDE/Canvas_Context_Selected_Widgets_spec.js
@@ -272,4 +272,40 @@ describe("Canvas context widget selection", function () {
     cy.get(".is-selected").should("contain", "Tab 2");
     cy.get(".t--property-pane-title").should("contain", "Button4");
   });
+
+  it("11. Widgets inside modal widget should open when loaded from the URL", function () {
+    //select widget in page1
+    _.entityExplorer.SelectEntityInModal("Modal1", "Widgets");
+
+    //verify the Modal1 is open and Text1 is selected in page1
+    cy.get(`div[data-testid='t--selected']`).should("have.length", 1);
+    cy.get(".t--modal-widget").should("have.length", 1);
+    cy.get(".t--property-pane-title").should("contain", "Text1");
+
+    // Get the current URL
+    cy.url().then((url) => {
+      //switch to page2
+      _.entityExplorer.SelectEntityByName(page2, "Pages");
+
+      //select widget in page2
+      _.entityExplorer.SelectEntityByName("Text1", "Widgets");
+
+      //verify the widget is selected in page2
+      cy.get(`div[data-testid='t--selected']`).should("have.length", 1);
+
+      // open the URL
+      cy.visit(url);
+
+      // wati for the page to load
+      cy.wait(4000);
+
+      //select widget in page1
+      _.entityExplorer.SelectEntityInModal("Modal1", "Widgets");
+
+      //verify the Modal1 is open and Text1 is selected in page1
+      cy.get(`div[data-testid='t--selected']`).should("have.length", 1);
+      cy.get(".t--modal-widget").should("have.length", 1);
+      cy.get(".t--property-pane-title").should("contain", "Text1");
+    });
+  });
 });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Onboarding/FirstTimeUserOnboarding_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Onboarding/FirstTimeUserOnboarding_spec.js
index 2c1df3d10e..8e290495ac 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Onboarding/FirstTimeUserOnboarding_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Onboarding/FirstTimeUserOnboarding_spec.js
@@ -217,7 +217,7 @@ describe("FirstTimeUserOnboarding", function () {
       false,
     );
     agHelper.Sleep(500);
-    agHelper.GetNClick(debuggerHelper.locators._helpButton);
+    agHelper.GetNClick(debuggerHelper.locators._helpButton, 0, true);
     agHelper.AssertElementVisibility(OnboardingLocator.checklistDatasourceBtn);
   });
 
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/MapWidget_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/MapWidget_Spec.ts
new file mode 100644
index 0000000000..db84eaccfa
--- /dev/null
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/MapWidget_Spec.ts
@@ -0,0 +1,164 @@
+/// <reference types="Cypress" />
+import {
+  agHelper,
+  entityExplorer,
+  propPane,
+  draggableWidgets,
+  deployMode,
+  locators,
+} from "../../../../../support/Objects/ObjectsCore";
+
+const location = [
+  {
+    lat: 28.7040592,
+    long: 77.10249019999999,
+    title: "Delhi, India",
+  },
+  {
+    lat: 28.4594965,
+    long: 77.0266383,
+    title: "Gurugram, Haryana, India",
+  },
+  {
+    lat: 40.7127753,
+    long: -74.0059728,
+    title: "New York, NY, USA",
+  },
+];
+
+describe("Map Widget", function () {
+  it("1.Drag Map Widget and Verify the Map Widget with Initial Location", () => {
+    //Add map and verify
+    entityExplorer.DragDropWidgetNVerify(draggableWidgets.MAP, 200, 200);
+    deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.MAP));
+    agHelper.VerifySnapshot(locators._root, "mapsimple");
+    deployMode.NavigateBacktoEditor();
+    entityExplorer.SelectEntityByName("Map1", "Widgets");
+
+    // Add Initial location and verify
+    propPane.TypeTextIntoField("Initial location", "New York, NY, USA");
+    agHelper.PressEnter();
+    deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.MAP));
+    agHelper.VerifySnapshot(locators._root, "mapWithInitalLocation");
+    deployMode.NavigateBacktoEditor();
+    entityExplorer.SelectEntityByName("Map1", "Widgets");
+
+    // convert Initial location to JS, update and verify
+    propPane.EnterJSContext("Initial location", JSON.stringify(location[0]));
+    deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.MAP));
+    agHelper.VerifySnapshot(locators._root, "mapWithinItalLocationAsJS");
+    deployMode.NavigateBacktoEditor();
+    entityExplorer.SelectEntityByName("Map1", "Widgets");
+  });
+
+  it("2.Verify the Map Widget with Default markers", () => {
+    // With single default marker
+    propPane.TypeTextIntoField(
+      "Default Markers",
+      JSON.stringify(location.slice(0, 1)),
+    );
+    deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.MAP));
+    agHelper.VerifySnapshot(locators._root, "mapWithDefaultMarker1");
+    deployMode.NavigateBacktoEditor();
+    entityExplorer.SelectEntityByName("Map1", "Widgets");
+
+    // With multiple default marker
+    propPane.TypeTextIntoField(
+      "Default Markers",
+      JSON.stringify(location.slice(0, 2)),
+    );
+    deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.MAP));
+    agHelper.VerifySnapshot(locators._root, "mapWithDefaultMarker2");
+    deployMode.NavigateBacktoEditor();
+    entityExplorer.SelectEntityByName("Map1", "Widgets");
+  });
+
+  it("3.Verify the Map Widget with zoom level", () => {
+    // With multiple default marker
+    propPane.SetZoomLevel(70);
+    deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.MAP));
+    agHelper.VerifySnapshot(locators._root, "mapWithDefaultZoomOut");
+    deployMode.NavigateBacktoEditor();
+    entityExplorer.SelectEntityByName("Map1", "Widgets");
+
+    // Zoom in and verify
+    propPane.SetZoomLevel(30);
+    deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.MAP));
+    agHelper.VerifySnapshot(locators._root, "mapWithDefaultZoomIn");
+    deployMode.NavigateBacktoEditor();
+    entityExplorer.SelectEntityByName("Map1", "Widgets");
+  });
+
+  it("4.1 Verify the Map Widget with different general settings", () => {
+    // With visibility off
+    propPane.TogglePropertyState("Visible", "Off");
+    deployMode.DeployApp();
+    agHelper.VerifySnapshot(locators._root, "mapWithVisibilityOff");
+    deployMode.NavigateBacktoEditor();
+    entityExplorer.SelectEntityByName("Map1", "Widgets");
+
+    // Convert visibility to JS and set the visibility "On" and verify
+    propPane.EnterJSContext("Visible", "true");
+    deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.MAP));
+    agHelper.VerifySnapshot(locators._root, "mapWithVisibilityOnWithJS");
+    deployMode.NavigateBacktoEditor();
+    entityExplorer.SelectEntityByName("Map1", "Widgets");
+
+    // Toggle off Enable pick location and verify
+    propPane.TogglePropertyState("Enable pick location", "Off");
+    deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.MAP));
+    agHelper.VerifySnapshot(locators._root, "mapWithPickLocationOff");
+    deployMode.NavigateBacktoEditor();
+    entityExplorer.SelectEntityByName("Map1", "Widgets");
+
+    // Toggle off Map & marker centering and verify
+    propPane.TogglePropertyState("Map & marker centering", "Off");
+    deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.MAP));
+    agHelper.VerifySnapshot(locators._root, "mapWithMapNMarkerCenteringOff");
+    deployMode.NavigateBacktoEditor();
+    entityExplorer.SelectEntityByName("Map1", "Widgets");
+  });
+
+  it("4.2 Verify the Map Widget with different general settings", () => {
+    // Toggle On Enabling clustering and verify
+    propPane.TogglePropertyState("Enable clustering", "On");
+    deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.MAP));
+    agHelper.VerifySnapshot(locators._root, "mapWithEnablingClusteringON");
+    deployMode.NavigateBacktoEditor();
+    entityExplorer.SelectEntityByName("Map1", "Widgets");
+
+    // Convert Enabling clustering and disable it and verify
+    propPane.EnterJSContext("Enable clustering", "false");
+    deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.MAP));
+    agHelper.VerifySnapshot(locators._root, "mapWithEnablingClusteringOff");
+    deployMode.NavigateBacktoEditor();
+    entityExplorer.SelectEntityByName("Map1", "Widgets");
+
+    // Toggle off Enable search location and verify
+    propPane.TogglePropertyState("Enable search location", "Off");
+    deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.MAP));
+    agHelper.VerifySnapshot(locators._root, "mapWithEnableSearchLocationOff");
+    deployMode.NavigateBacktoEditor();
+    entityExplorer.SelectEntityByName("Map1", "Widgets");
+  });
+
+  it("5 Verify the style changes", () => {
+    // Change border radius and verify
+    propPane.MoveToTab("Style");
+    propPane.EnterJSContext("Border radius", "1.5rem");
+    deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.MAP));
+    agHelper.VerifySnapshot(locators._root, "mapWithBorderRadius");
+    deployMode.NavigateBacktoEditor();
+    entityExplorer.SelectEntityByName("Map1", "Widgets");
+
+    // Change box shadow and verify
+    const boxShadow =
+      "0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05)";
+    propPane.MoveToTab("Style");
+    propPane.EnterJSContext("Box shadow", boxShadow);
+    deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.MAP));
+    agHelper.VerifySnapshot(locators._root, "mapWithBoxShadow");
+    deployMode.NavigateBacktoEditor();
+    entityExplorer.SelectEntityByName("Map1", "Widgets");
+  });
+});
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Widget_Copy_Paste_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Widget_Copy_Paste_spec.js
index e55b6d67cb..64ca8476a1 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Widget_Copy_Paste_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/TableV2_Widget_Copy_Paste_spec.js
@@ -1,6 +1,7 @@
 const apiwidget = require("../../../../../locators/apiWidgetslocator.json");
 const commonlocators = require("../../../../../locators/commonlocators.json");
 const widgetsPage = require("../../../../../locators/Widgets.json");
+import { featureFlagIntercept } from "../../../../../support/Objects/FeatureFlags";
 import {
   agHelper,
   entityExplorer,
@@ -42,9 +43,23 @@ describe("Test Suite to validate copy/paste table Widget V2", function () {
     });
     cy.wait(200);
     cy.get(apiwidget.propertyList).then(function ($lis) {
-      expect($lis).to.have.length(23);
+      expect($lis).to.have.length(22);
       expect($lis.eq(0)).to.contain("{{Table1Copy.selectedRow}}");
       expect($lis.eq(1)).to.contain("{{Table1Copy.selectedRows}}");
     });
   });
+
+  it("2. Should check that table binding list gets updated when .filters gets added to it", () => {
+    featureFlagIntercept({ release_table_serverside_filtering_enabled: true });
+    cy.CheckAndUnfoldWidgets();
+    entityExplorer.ActionContextMenuByEntityName({
+      entityNameinLeftSidebar: "Table1Copy",
+      action: "Show bindings",
+    });
+    cy.wait(200);
+    cy.get(apiwidget.propertyList).then(function ($lis) {
+      expect($lis).to.have.length(23);
+      expect($lis.last()).to.contain("{{Table1Copy.filters}}");
+    });
+  });
 });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/server_side_filtering_spec_1.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/server_side_filtering_spec_1.ts
index 8c40a0fdc7..8c2addab72 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/server_side_filtering_spec_1.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/server_side_filtering_spec_1.ts
@@ -9,6 +9,7 @@ import {
 } from "../../../../../support/Objects/ObjectsCore";
 import oneClickBindingLocator from "../../../../../locators/OneClickBindingLocator";
 import { expandLoadMoreOptions } from "../../OneClickBinding/spec_utility";
+import { featureFlagIntercept } from "../../../../../support/Objects/FeatureFlags";
 
 const ALERT_SUCCESS_MSG = "Table data filtered";
 
@@ -22,6 +23,7 @@ describe("Table widget v2: test server side filtering", function () {
    * 5. Bind it as a WHERE condition inside an SQL query
    */
   before(() => {
+    featureFlagIntercept({ release_table_serverside_filtering_enabled: true });
     entityExplorer.DragDropWidgetNVerify(draggableWidgets.TABLE, 300, 300);
 
     // Create SQL data-source
@@ -110,3 +112,20 @@ describe("Table widget v2: test server side filtering", function () {
     });
   });
 });
+
+describe("Table v2: Server side filtering hidden behind feature flag", () => {
+  before(() => {
+    featureFlagIntercept({ release_table_serverside_filtering_enabled: false });
+    entityExplorer.DragDropWidgetNVerify(draggableWidgets.TABLE, 700, 300);
+  });
+
+  it("1. should test that server side filtering option and dtable.filters autocomplete should not be visible", () => {
+    agHelper.AssertElementAbsence(
+      propPane._propertyControl("serversidefiltering"),
+    );
+    entityExplorer.DragDropWidgetNVerify(draggableWidgets.TEXT, 300, 700);
+    entityExplorer.SelectEntityByName("Text1");
+    propPane.TypeTextIntoField("Text", "{{Table1.filters");
+    agHelper.AssertElementAbsence(locators._hints);
+  });
+});
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 6e3f8803e8..d9ed33889b 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/JSFunctionExecution_spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/JSFunctionExecution_spec.ts
@@ -366,13 +366,13 @@ describe("JS Function Execution", function () {
             : i === functionsLength - 1
             ? `
             ${functionName}: ${
-                isMarkedAsync ? "async" : ""
-              } ()=>"${functionName}",
+              isMarkedAsync ? "async" : ""
+            } ()=>"${functionName}",
           }`
             : `
             ${functionName}: ${
-                isMarkedAsync ? "async" : ""
-              } ()=> "${functionName}",`;
+              isMarkedAsync ? "async" : ""
+            } ()=> "${functionName}",`;
       }
       return JS_OBJECT_BODY;
     };
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 1b576e4e8c..ce17e6ab1a 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/GoogleSheets_spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/GoogleSheets_spec.ts
@@ -11,47 +11,6 @@ describe(
   "Google Sheets datasource row objects placeholder",
   function () {
     let pluginName = "Google Sheets";
-    let placeholderText =
-      '{\n  "name": {{nameInput.text}},\n  "dob": {{dobPicker.formattedDate}},\n  "gender": {{genderSelect.selectedOptionValue}} \n}';
-
-    //Skiiping due to open bug #18035: Should the Save button be renamed as "Save and Authorise" in case of Google sheets for datasource discard popup? -
-    //Bug #18035: Bug is to be taken in ds experience activation phase
-    it.skip("1. Bug: 16391 - Google Sheets DS, placeholder objects keys should have quotes", function () {
-      // create new Google Sheets datasource
-      dataSources.NavigateToDSCreateNew();
-      dataSources.CreatePlugIn(pluginName);
-
-      // navigate to create query tab and create a new query
-      // cy.get("@saveDatasource").then((httpResponse) => {
-      //   datasourceName = httpResponse.body.data.name;
-      //   // clicking on new query to write a query
-      //   cy.NavigateToQueryEditor();
-      //   cy.get(explorer.createNew).click();
-      //   cy.get("div:contains('" + datasourceName + " Query')")
-      //     .last()
-      //     .click();
-
-      // fill the create new api google sheets form
-      // and check for rowobject placeholder text
-      cy.get(datasource.gSheetsOperationDropdown).click();
-      cy.get(datasource.gSheetsInsertOneOption).click();
-
-      cy.get(datasource.gSheetsEntityDropdown).click();
-      cy.get(datasource.gSheetsSheetRowsOption).click();
-
-      cy.get(datasource.gSheetsCodeMirrorPlaceholder).should(
-        "have.text",
-        placeholderText,
-      );
-
-      // delete query and datasource after test is done
-      // cy.get("@createNewApi").then((httpResponse) => {
-      //   queryName = httpResponse.response.body.data.name;
-      //   cy.deleteQueryUsingContext();
-      //   cy.deleteDatasource(datasourceName);
-      // });
-      //});
-    });
 
     it("1. Verify GSheets dropdown options", function () {
       dataSources.NavigateToDSCreateNew();
diff --git a/app/client/cypress/fixtures/ImportAppAllAccess.json b/app/client/cypress/fixtures/ImportAppAllAccess.json
new file mode 100644
index 0000000000..c894182e4a
--- /dev/null
+++ b/app/client/cypress/fixtures/ImportAppAllAccess.json
@@ -0,0 +1 @@
+{"clientSchemaVersion":1.0,"serverSchemaVersion":6.0,"exportedApplication":{"name":"ImportAppAllAccess","isPublic":false,"pages":[{"id":"Page1","isDefault":true}],"publishedPages":[{"id":"Page1","isDefault":true}],"viewMode":false,"appIsExample":false,"unreadCommentThreads":0.0,"color":"#CCCCCC","icon":"call","slug":"importappallaccess","unpublishedCustomJSLibs":[],"publishedCustomJSLibs":[],"evaluationVersion":2.0,"applicationVersion":2.0,"collapseInvisibleWidgets":true,"isManualUpdate":false,"deleted":false},"datasourceList":[{"name":"gsheet","pluginId":"google-sheets-plugin","messages":[],"isAutoGenerated":false,"deleted":false,"gitSyncId":"6507db87f847163dfe7777c4_6507dbd7f847163dfe7777cd"}],"customJSLibList":[],"pageList":[{"unpublishedPage":{"name":"Page1","slug":"page1","layouts":[{"viewMode":false,"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":4896.0,"snapColumns":64.0,"detachFromLayout":true,"widgetId":"0","topRow":0.0,"bottomRow":380.0,"containerStyle":"none","snapRows":124.0,"parentRowSpace":1.0,"type":"CANVAS_WIDGET","canExtend":true,"version":86.0,"minHeight":1292.0,"dynamicTriggerPathList":[],"parentColumnSpace":1.0,"dynamicBindingPathList":[],"leftColumn":0.0,"children":[{"boxShadow":"{{appsmith.theme.boxShadow.appBoxShadow}}","borderColor":"#E0DEDE","isVisibleDownload":true,"iconSVG":"/static/media/icon.e6911f8bb94dc6c4a102a74740c41763.svg","topRow":0.0,"isSortable":true,"type":"TABLE_WIDGET_V2","inlineEditingSaveOption":"ROW_LEVEL","animateLoading":true,"dynamicBindingPathList":[{"key":"accentColor"},{"key":"borderRadius"},{"key":"boxShadow"},{"key":"tableData"},{"key":"primaryColumns.uniq_id.computedValue"},{"key":"primaryColumns.japanese_name.computedValue"},{"key":"primaryColumns.currencies.computedValue"},{"key":"primaryColumns.specialChars.computedValue"},{"key":"primaryColumns.product_name.computedValue"},{"key":"primaryColumns.manufacturer.computedValue"},{"key":"primaryColumns.price.computedValue"},{"key":"primaryColumns.number_available_in_stock.computedValue"},{"key":"primaryColumns.number_of_reviews.computedValue"},{"key":"primaryColumns.number_of_answered_questions.computedValue"},{"key":"primaryColumns.average_review_rating.computedValue"},{"key":"primaryColumns.amazon_category_and_sub_category.computedValue"},{"key":"primaryColumns.customers_who_bought_this_item_also_bought.computedValue"},{"key":"primaryColumns.rowIndex.computedValue"}],"needsHeightForContent":true,"leftColumn":0.0,"delimiter":",","defaultSelectedRowIndex":0.0,"accentColor":"{{appsmith.theme.colors.primaryColor}}","isVisibleFilters":true,"isVisible":true,"enableClientSideSearch":true,"version":2.0,"totalRecordsCount":0.0,"tags":["Suggested","Display"],"isLoading":false,"childStylesheet":{"button":{"buttonColor":"{{appsmith.theme.colors.primaryColor}}","borderRadius":"{{appsmith.theme.borderRadius.appBorderRadius}}","boxShadow":"none"},"menuButton":{"menuColor":"{{appsmith.theme.colors.primaryColor}}","borderRadius":"{{appsmith.theme.borderRadius.appBorderRadius}}","boxShadow":"none"},"iconButton":{"buttonColor":"{{appsmith.theme.colors.primaryColor}}","borderRadius":"{{appsmith.theme.borderRadius.appBorderRadius}}","boxShadow":"none"},"editActions":{"saveButtonColor":"{{appsmith.theme.colors.primaryColor}}","saveBorderRadius":"{{appsmith.theme.borderRadius.appBorderRadius}}","discardButtonColor":"{{appsmith.theme.colors.primaryColor}}","discardBorderRadius":"{{appsmith.theme.borderRadius.appBorderRadius}}"}},"borderRadius":"{{appsmith.theme.borderRadius.appBorderRadius}}","columnUpdatedAt":1.695963199756E12,"defaultSelectedRowIndices":[0.0],"mobileBottomRow":29.0,"widgetName":"Table1","defaultPageSize":0.0,"columnOrder":["uniq_id","japanese_name","currencies","specialChars","product_name","manufacturer","price","number_available_in_stock","number_of_reviews","number_of_answered_questions","average_review_rating","amazon_category_and_sub_category","customers_who_bought_this_item_also_bought","rowIndex"],"dynamicPropertyPathList":[],"displayName":"Table","bottomRow":28.0,"columnWidthMap":{},"parentRowSpace":10.0,"hideCard":false,"mobileRightColumn":34.0,"parentColumnSpace":16.65625,"dynamicTriggerPathList":[],"borderWidth":"1","primaryColumns":{"uniq_id":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":0.0,"width":150.0,"originalId":"uniq_id","id":"uniq_id","alias":"uniq_id","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"uniq_id","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"uniq_id\"]))}}","sticky":"","validation":{}},"japanese_name":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":1.0,"width":150.0,"originalId":"japanese_name","id":"japanese_name","alias":"japanese_name","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"japanese_name","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"japanese_name\"]))}}","sticky":"","validation":{}},"currencies":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":2.0,"width":150.0,"originalId":"currencies","id":"currencies","alias":"currencies","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"currencies","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"currencies\"]))}}","sticky":"","validation":{}},"specialChars":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":3.0,"width":150.0,"originalId":"specialChars","id":"specialChars","alias":"specialChars","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"specialChars","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"specialChars\"]))}}","sticky":"","validation":{}},"product_name":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":4.0,"width":150.0,"originalId":"product_name","id":"product_name","alias":"product_name","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"product_name","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"product_name\"]))}}","sticky":"","validation":{}},"manufacturer":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":5.0,"width":150.0,"originalId":"manufacturer","id":"manufacturer","alias":"manufacturer","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"manufacturer","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"manufacturer\"]))}}","sticky":"","validation":{}},"price":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":6.0,"width":150.0,"originalId":"price","id":"price","alias":"price","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"number","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"price","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"price\"]))}}","sticky":"","validation":{}},"number_available_in_stock":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":7.0,"width":150.0,"originalId":"number_available_in_stock","id":"number_available_in_stock","alias":"number_available_in_stock","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"number_available_in_stock","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"number_available_in_stock\"]))}}","sticky":"","validation":{}},"number_of_reviews":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":8.0,"width":150.0,"originalId":"number_of_reviews","id":"number_of_reviews","alias":"number_of_reviews","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"number","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"number_of_reviews","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"number_of_reviews\"]))}}","sticky":"","validation":{}},"number_of_answered_questions":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":9.0,"width":150.0,"originalId":"number_of_answered_questions","id":"number_of_answered_questions","alias":"number_of_answered_questions","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"number","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"number_of_answered_questions","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"number_of_answered_questions\"]))}}","sticky":"","validation":{}},"average_review_rating":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":10.0,"width":150.0,"originalId":"average_review_rating","id":"average_review_rating","alias":"average_review_rating","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"average_review_rating","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"average_review_rating\"]))}}","sticky":"","validation":{}},"amazon_category_and_sub_category":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":11.0,"width":150.0,"originalId":"amazon_category_and_sub_category","id":"amazon_category_and_sub_category","alias":"amazon_category_and_sub_category","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"amazon_category_and_sub_category","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"amazon_category_and_sub_category\"]))}}","sticky":"","validation":{}},"customers_who_bought_this_item_also_bought":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":12.0,"width":150.0,"originalId":"customers_who_bought_this_item_also_bought","id":"customers_who_bought_this_item_also_bought","alias":"customers_who_bought_this_item_also_bought","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"customers_who_bought_this_item_also_bought","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"customers_who_bought_this_item_also_bought\"]))}}","sticky":"","validation":{}},"rowIndex":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":13.0,"width":150.0,"originalId":"rowIndex","id":"rowIndex","alias":"rowIndex","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"number","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"rowIndex","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"rowIndex\"]))}}","sticky":"","validation":{}}},"key":"y3e8fye419","canFreezeColumn":true,"isDeprecated":false,"rightColumn":34.0,"textSize":"0.875rem","widgetId":"5w278g8zo9","minWidth":450.0,"tableData":"{{fetch_many_query.data}}","label":"Data","searchKey":"","parentId":"0","renderMode":"CANVAS","mobileTopRow":1.0,"horizontalAlignment":"LEFT","isVisibleSearch":true,"responsiveBehavior":"fill","mobileLeftColumn":0.0,"isVisiblePagination":true,"verticalAlignment":"CENTER"}]},"layoutOnLoadActions":[[{"id":"Page1_fetch_many_query","name":"fetch_many_query","confirmBeforeExecute":false,"pluginType":"SAAS","jsonPathKeys":[],"timeoutInMillisecond":10000.0}]],"layoutOnLoadActionErrors":[],"validOnPageLoadActions":true,"id":"Page1","deleted":false,"policies":[],"userPermissions":[]}],"userPermissions":[],"policies":[]},"publishedPage":{"name":"Page1","slug":"page1","layouts":[{"viewMode":false,"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1224.0,"snapColumns":16.0,"detachFromLayout":true,"widgetId":"0","topRow":0.0,"bottomRow":1250.0,"containerStyle":"none","snapRows":33.0,"parentRowSpace":1.0,"type":"CANVAS_WIDGET","canExtend":true,"version":4.0,"minHeight":1292.0,"dynamicTriggerPathList":[],"parentColumnSpace":1.0,"dynamicBindingPathList":[],"leftColumn":0.0,"children":[]},"validOnPageLoadActions":true,"id":"Page1","deleted":false,"policies":[],"userPermissions":[]}],"userPermissions":[],"policies":[]},"deleted":false,"gitSyncId":"65164f37b43d9217d781a524_65164f37b43d9217d781a526"}],"actionList":[{"pluginType":"SAAS","pluginId":"google-sheets-plugin","unpublishedAction":{"name":"fetch_many_query","datasource":{"name":"gsheet","pluginId":"google-sheets-plugin","messages":[],"isAutoGenerated":false,"id":"gsheet","deleted":false,"policies":[],"userPermissions":[]},"pageId":"Page1","actionConfiguration":{"timeoutInMillisecond":10000.0,"paginationType":"NONE","encodeParamsToggle":true,"selfReferencingDataPaths":[],"formData":{"command":{"data":"FETCH_MANY"},"entityType":{"data":"ROWS"},"tableHeaderIndex":{"data":"1"},"projection":{"data":[]},"queryFormat":{"data":"ROWS"},"range":{"data":""},"where":{"data":{"condition":"AND","children":[{"condition":"LT"}]}},"pagination":{"data":{"limit":"20","offset":"0"}},"smartSubstitution":{"data":true},"sheetUrl":{"data":"https://docs.google.com/spreadsheets/d/1rD1Bo4x-y9B7EqaVs8HuJViGSEVBeiLPuTdxMoC2uDw/edit"},"sheetName":{"data":"Sheet1"},"sortBy":{"data":[{"column":"","order":"Ascending"}]}}},"executeOnLoad":true,"dynamicBindingPathList":[],"isValid":true,"invalids":[],"messages":[],"jsonPathKeys":[],"userSetOnLoad":false,"confirmBeforeExecute":false,"policies":[],"userPermissions":[],"createdAt":"2023-09-29T04:15:25Z"},"publishedAction":{"datasource":{"messages":[],"isAutoGenerated":false,"deleted":false,"policies":[],"userPermissions":[]},"messages":[],"userSetOnLoad":false,"confirmBeforeExecute":false,"policies":[],"userPermissions":[]},"id":"Page1_fetch_many_query","deleted":false,"gitSyncId":"65164f37b43d9217d781a524_65164f5db43d9217d781a52b"}],"actionCollectionList":[],"updatedResources":{"customJSLibList":[],"actionList":["fetch_many_query##ENTITY_SEPARATOR##Page1"],"pageList":["Page1"],"actionCollectionList":[]},"editModeTheme":{"name":"Default-New","displayName":"Modern","isSystemTheme":true,"deleted":false},"publishedTheme":{"name":"Default-New","displayName":"Modern","isSystemTheme":true,"deleted":false}}
\ No newline at end of file
diff --git a/app/client/cypress/fixtures/ImportAppReadAccess.json b/app/client/cypress/fixtures/ImportAppReadAccess.json
new file mode 100644
index 0000000000..d26323d4e0
--- /dev/null
+++ b/app/client/cypress/fixtures/ImportAppReadAccess.json
@@ -0,0 +1 @@
+{"clientSchemaVersion":1.0,"serverSchemaVersion":6.0,"exportedApplication":{"name":"ImportAppReadAccess","isPublic":false,"pages":[{"id":"Page1","isDefault":true}],"publishedPages":[{"id":"Page1","isDefault":true}],"viewMode":false,"appIsExample":false,"unreadCommentThreads":0.0,"color":"#CCCCCC","icon":"call","slug":"importappreadaccess","unpublishedCustomJSLibs":[],"publishedCustomJSLibs":[],"evaluationVersion":2.0,"applicationVersion":2.0,"collapseInvisibleWidgets":true,"isManualUpdate":false,"deleted":false},"datasourceList":[{"name":"gsheet-read","pluginId":"google-sheets-plugin","messages":[],"isAutoGenerated":false,"deleted":false,"gitSyncId":"6507db87f847163dfe7777c4_6507dc86f847163dfe7777d5"}],"customJSLibList":[],"pageList":[{"unpublishedPage":{"name":"Page1","slug":"page1","layouts":[{"viewMode":false,"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":4896.0,"snapColumns":64.0,"detachFromLayout":true,"widgetId":"0","topRow":0.0,"bottomRow":380.0,"containerStyle":"none","snapRows":124.0,"parentRowSpace":1.0,"type":"CANVAS_WIDGET","canExtend":true,"version":86.0,"minHeight":1292.0,"dynamicTriggerPathList":[],"parentColumnSpace":1.0,"dynamicBindingPathList":[],"leftColumn":0.0,"children":[{"boxShadow":"{{appsmith.theme.boxShadow.appBoxShadow}}","borderColor":"#E0DEDE","isVisibleDownload":true,"iconSVG":"/static/media/icon.e6911f8bb94dc6c4a102a74740c41763.svg","topRow":0.0,"isSortable":true,"type":"TABLE_WIDGET_V2","inlineEditingSaveOption":"ROW_LEVEL","animateLoading":true,"dynamicBindingPathList":[{"key":"accentColor"},{"key":"borderRadius"},{"key":"boxShadow"},{"key":"tableData"},{"key":"primaryColumns.uniq_id.computedValue"},{"key":"primaryColumns.japanese_name.computedValue"},{"key":"primaryColumns.currencies.computedValue"},{"key":"primaryColumns.specialChars.computedValue"},{"key":"primaryColumns.product_name.computedValue"},{"key":"primaryColumns.manufacturer.computedValue"},{"key":"primaryColumns.price.computedValue"},{"key":"primaryColumns.number_available_in_stock.computedValue"},{"key":"primaryColumns.number_of_reviews.computedValue"},{"key":"primaryColumns.number_of_answered_questions.computedValue"},{"key":"primaryColumns.average_review_rating.computedValue"},{"key":"primaryColumns.amazon_category_and_sub_category.computedValue"},{"key":"primaryColumns.customers_who_bought_this_item_also_bought.computedValue"},{"key":"primaryColumns.rowIndex.computedValue"}],"needsHeightForContent":true,"leftColumn":0.0,"delimiter":",","defaultSelectedRowIndex":0.0,"accentColor":"{{appsmith.theme.colors.primaryColor}}","isVisibleFilters":true,"isVisible":true,"enableClientSideSearch":true,"version":2.0,"totalRecordsCount":0.0,"tags":["Suggested","Display"],"isLoading":false,"childStylesheet":{"button":{"buttonColor":"{{appsmith.theme.colors.primaryColor}}","borderRadius":"{{appsmith.theme.borderRadius.appBorderRadius}}","boxShadow":"none"},"menuButton":{"menuColor":"{{appsmith.theme.colors.primaryColor}}","borderRadius":"{{appsmith.theme.borderRadius.appBorderRadius}}","boxShadow":"none"},"iconButton":{"buttonColor":"{{appsmith.theme.colors.primaryColor}}","borderRadius":"{{appsmith.theme.borderRadius.appBorderRadius}}","boxShadow":"none"},"editActions":{"saveButtonColor":"{{appsmith.theme.colors.primaryColor}}","saveBorderRadius":"{{appsmith.theme.borderRadius.appBorderRadius}}","discardButtonColor":"{{appsmith.theme.colors.primaryColor}}","discardBorderRadius":"{{appsmith.theme.borderRadius.appBorderRadius}}"}},"borderRadius":"{{appsmith.theme.borderRadius.appBorderRadius}}","columnUpdatedAt":1.695963199756E12,"defaultSelectedRowIndices":[0.0],"mobileBottomRow":29.0,"widgetName":"Table1","defaultPageSize":0.0,"columnOrder":["uniq_id","japanese_name","currencies","specialChars","product_name","manufacturer","price","number_available_in_stock","number_of_reviews","number_of_answered_questions","average_review_rating","amazon_category_and_sub_category","customers_who_bought_this_item_also_bought","rowIndex"],"dynamicPropertyPathList":[],"displayName":"Table","bottomRow":28.0,"columnWidthMap":{},"parentRowSpace":10.0,"hideCard":false,"mobileRightColumn":34.0,"parentColumnSpace":16.65625,"dynamicTriggerPathList":[],"borderWidth":"1","primaryColumns":{"uniq_id":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":0.0,"width":150.0,"originalId":"uniq_id","id":"uniq_id","alias":"uniq_id","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"uniq_id","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"uniq_id\"]))}}","sticky":"","validation":{}},"japanese_name":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":1.0,"width":150.0,"originalId":"japanese_name","id":"japanese_name","alias":"japanese_name","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"japanese_name","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"japanese_name\"]))}}","sticky":"","validation":{}},"currencies":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":2.0,"width":150.0,"originalId":"currencies","id":"currencies","alias":"currencies","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"currencies","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"currencies\"]))}}","sticky":"","validation":{}},"specialChars":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":3.0,"width":150.0,"originalId":"specialChars","id":"specialChars","alias":"specialChars","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"specialChars","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"specialChars\"]))}}","sticky":"","validation":{}},"product_name":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":4.0,"width":150.0,"originalId":"product_name","id":"product_name","alias":"product_name","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"product_name","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"product_name\"]))}}","sticky":"","validation":{}},"manufacturer":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":5.0,"width":150.0,"originalId":"manufacturer","id":"manufacturer","alias":"manufacturer","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"manufacturer","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"manufacturer\"]))}}","sticky":"","validation":{}},"price":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":6.0,"width":150.0,"originalId":"price","id":"price","alias":"price","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"number","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"price","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"price\"]))}}","sticky":"","validation":{}},"number_available_in_stock":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":7.0,"width":150.0,"originalId":"number_available_in_stock","id":"number_available_in_stock","alias":"number_available_in_stock","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"number_available_in_stock","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"number_available_in_stock\"]))}}","sticky":"","validation":{}},"number_of_reviews":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":8.0,"width":150.0,"originalId":"number_of_reviews","id":"number_of_reviews","alias":"number_of_reviews","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"number","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"number_of_reviews","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"number_of_reviews\"]))}}","sticky":"","validation":{}},"number_of_answered_questions":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":9.0,"width":150.0,"originalId":"number_of_answered_questions","id":"number_of_answered_questions","alias":"number_of_answered_questions","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"number","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"number_of_answered_questions","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"number_of_answered_questions\"]))}}","sticky":"","validation":{}},"average_review_rating":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":10.0,"width":150.0,"originalId":"average_review_rating","id":"average_review_rating","alias":"average_review_rating","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"average_review_rating","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"average_review_rating\"]))}}","sticky":"","validation":{}},"amazon_category_and_sub_category":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":11.0,"width":150.0,"originalId":"amazon_category_and_sub_category","id":"amazon_category_and_sub_category","alias":"amazon_category_and_sub_category","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"amazon_category_and_sub_category","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"amazon_category_and_sub_category\"]))}}","sticky":"","validation":{}},"customers_who_bought_this_item_also_bought":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":12.0,"width":150.0,"originalId":"customers_who_bought_this_item_also_bought","id":"customers_who_bought_this_item_also_bought","alias":"customers_who_bought_this_item_also_bought","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"customers_who_bought_this_item_also_bought","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"customers_who_bought_this_item_also_bought\"]))}}","sticky":"","validation":{}},"rowIndex":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":13.0,"width":150.0,"originalId":"rowIndex","id":"rowIndex","alias":"rowIndex","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"number","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"rowIndex","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"rowIndex\"]))}}","sticky":"","validation":{}}},"key":"y3e8fye419","canFreezeColumn":true,"isDeprecated":false,"rightColumn":34.0,"textSize":"0.875rem","widgetId":"5w278g8zo9","minWidth":450.0,"tableData":"{{fetch_many_query_read_only.data}}","label":"Data","searchKey":"","parentId":"0","renderMode":"CANVAS","mobileTopRow":1.0,"horizontalAlignment":"LEFT","isVisibleSearch":true,"responsiveBehavior":"fill","mobileLeftColumn":0.0,"isVisiblePagination":true,"verticalAlignment":"CENTER"}]},"layoutOnLoadActions":[[{"id":"Page1_fetch_many_query_read_only","name":"fetch_many_query_read_only","confirmBeforeExecute":false,"pluginType":"SAAS","jsonPathKeys":[],"timeoutInMillisecond":10000.0}]],"layoutOnLoadActionErrors":[],"validOnPageLoadActions":true,"id":"Page1","deleted":false,"policies":[],"userPermissions":[]}],"userPermissions":[],"policies":[]},"publishedPage":{"name":"Page1","slug":"page1","layouts":[{"viewMode":false,"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1224.0,"snapColumns":16.0,"detachFromLayout":true,"widgetId":"0","topRow":0.0,"bottomRow":1250.0,"containerStyle":"none","snapRows":33.0,"parentRowSpace":1.0,"type":"CANVAS_WIDGET","canExtend":true,"version":4.0,"minHeight":1292.0,"dynamicTriggerPathList":[],"parentColumnSpace":1.0,"dynamicBindingPathList":[],"leftColumn":0.0,"children":[]},"validOnPageLoadActions":true,"id":"Page1","deleted":false,"policies":[],"userPermissions":[]}],"userPermissions":[],"policies":[]},"deleted":false,"gitSyncId":"65164f37b43d9217d781a524_65164f37b43d9217d781a526"}],"actionList":[{"pluginType":"SAAS","pluginId":"google-sheets-plugin","unpublishedAction":{"name":"fetch_many_query_read_only","datasource":{"name":"gsheet-read","pluginId":"google-sheets-plugin","messages":[],"isAutoGenerated":false,"id":"gsheet-read","deleted":false,"policies":[],"userPermissions":[]},"pageId":"Page1","actionConfiguration":{"timeoutInMillisecond":10000.0,"paginationType":"NONE","encodeParamsToggle":true,"selfReferencingDataPaths":[],"formData":{"command":{"data":"FETCH_MANY"},"entityType":{"data":"ROWS"},"tableHeaderIndex":{"data":"1"},"projection":{"data":[]},"queryFormat":{"data":"ROWS"},"range":{"data":""},"where":{"data":{"condition":"AND","children":[{"condition":"LT"}]}},"pagination":{"data":{"limit":"20","offset":"0"}},"smartSubstitution":{"data":true},"sheetUrl":{"data":"https://docs.google.com/spreadsheets/d/1rD1Bo4x-y9B7EqaVs8HuJViGSEVBeiLPuTdxMoC2uDw/edit"},"sheetName":{"data":"Sheet1"},"sortBy":{"data":[{"column":"","order":"Ascending"}]}}},"executeOnLoad":true,"dynamicBindingPathList":[],"isValid":true,"invalids":[],"messages":[],"jsonPathKeys":[],"userSetOnLoad":false,"confirmBeforeExecute":false,"policies":[],"userPermissions":[],"createdAt":"2023-09-29T04:53:53Z"},"publishedAction":{"datasource":{"messages":[],"isAutoGenerated":false,"deleted":false,"policies":[],"userPermissions":[]},"messages":[],"userSetOnLoad":false,"confirmBeforeExecute":false,"policies":[],"userPermissions":[]},"id":"Page1_fetch_many_query_read_only","deleted":false,"gitSyncId":"65164f37b43d9217d781a524_65164f5db43d9217d781a52b"}],"actionCollectionList":[],"updatedResources":{"customJSLibList":[],"actionList":["fetch_many_query_read_only##ENTITY_SEPARATOR##Page1"],"pageList":["Page1"],"actionCollectionList":[]},"editModeTheme":{"name":"Default-New","displayName":"Modern","isSystemTheme":true,"deleted":false},"publishedTheme":{"name":"Default-New","displayName":"Modern","isSystemTheme":true,"deleted":false}}
\ No newline at end of file
diff --git a/app/client/cypress/fixtures/ImportAppReadWriteAccess.json b/app/client/cypress/fixtures/ImportAppReadWriteAccess.json
new file mode 100644
index 0000000000..c30151c01a
--- /dev/null
+++ b/app/client/cypress/fixtures/ImportAppReadWriteAccess.json
@@ -0,0 +1 @@
+{"clientSchemaVersion":1.0,"serverSchemaVersion":6.0,"exportedApplication":{"name":"ImportAppReadWriteAccess","isPublic":false,"pages":[{"id":"Page1","isDefault":true}],"publishedPages":[{"id":"Page1","isDefault":true}],"viewMode":false,"appIsExample":false,"unreadCommentThreads":0.0,"color":"#CCCCCC","icon":"call","slug":"importappreadwriteaccess","unpublishedCustomJSLibs":[],"publishedCustomJSLibs":[],"evaluationVersion":2.0,"applicationVersion":2.0,"collapseInvisibleWidgets":true,"isManualUpdate":false,"deleted":false},"datasourceList":[{"name":"gsheet-read-write","pluginId":"google-sheets-plugin","messages":[],"isAutoGenerated":false,"deleted":false,"gitSyncId":"6507db87f847163dfe7777c4_6507dcb0f847163dfe7777d9"}],"customJSLibList":[],"pageList":[{"unpublishedPage":{"name":"Page1","slug":"page1","layouts":[{"viewMode":false,"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":4896.0,"snapColumns":64.0,"detachFromLayout":true,"widgetId":"0","topRow":0.0,"bottomRow":380.0,"containerStyle":"none","snapRows":124.0,"parentRowSpace":1.0,"type":"CANVAS_WIDGET","canExtend":true,"version":86.0,"minHeight":1292.0,"dynamicTriggerPathList":[],"parentColumnSpace":1.0,"dynamicBindingPathList":[],"leftColumn":0.0,"children":[{"boxShadow":"{{appsmith.theme.boxShadow.appBoxShadow}}","borderColor":"#E0DEDE","isVisibleDownload":true,"iconSVG":"/static/media/icon.e6911f8bb94dc6c4a102a74740c41763.svg","topRow":0.0,"isSortable":true,"type":"TABLE_WIDGET_V2","inlineEditingSaveOption":"ROW_LEVEL","animateLoading":true,"dynamicBindingPathList":[{"key":"accentColor"},{"key":"borderRadius"},{"key":"boxShadow"},{"key":"tableData"},{"key":"primaryColumns.uniq_id.computedValue"},{"key":"primaryColumns.japanese_name.computedValue"},{"key":"primaryColumns.currencies.computedValue"},{"key":"primaryColumns.specialChars.computedValue"},{"key":"primaryColumns.product_name.computedValue"},{"key":"primaryColumns.manufacturer.computedValue"},{"key":"primaryColumns.price.computedValue"},{"key":"primaryColumns.number_available_in_stock.computedValue"},{"key":"primaryColumns.number_of_reviews.computedValue"},{"key":"primaryColumns.number_of_answered_questions.computedValue"},{"key":"primaryColumns.average_review_rating.computedValue"},{"key":"primaryColumns.amazon_category_and_sub_category.computedValue"},{"key":"primaryColumns.customers_who_bought_this_item_also_bought.computedValue"},{"key":"primaryColumns.rowIndex.computedValue"}],"needsHeightForContent":true,"leftColumn":0.0,"delimiter":",","defaultSelectedRowIndex":0.0,"accentColor":"{{appsmith.theme.colors.primaryColor}}","isVisibleFilters":true,"isVisible":true,"enableClientSideSearch":true,"version":2.0,"totalRecordsCount":0.0,"tags":["Suggested","Display"],"isLoading":false,"childStylesheet":{"button":{"buttonColor":"{{appsmith.theme.colors.primaryColor}}","borderRadius":"{{appsmith.theme.borderRadius.appBorderRadius}}","boxShadow":"none"},"menuButton":{"menuColor":"{{appsmith.theme.colors.primaryColor}}","borderRadius":"{{appsmith.theme.borderRadius.appBorderRadius}}","boxShadow":"none"},"iconButton":{"buttonColor":"{{appsmith.theme.colors.primaryColor}}","borderRadius":"{{appsmith.theme.borderRadius.appBorderRadius}}","boxShadow":"none"},"editActions":{"saveButtonColor":"{{appsmith.theme.colors.primaryColor}}","saveBorderRadius":"{{appsmith.theme.borderRadius.appBorderRadius}}","discardButtonColor":"{{appsmith.theme.colors.primaryColor}}","discardBorderRadius":"{{appsmith.theme.borderRadius.appBorderRadius}}"}},"borderRadius":"{{appsmith.theme.borderRadius.appBorderRadius}}","columnUpdatedAt":1.695963199756E12,"defaultSelectedRowIndices":[0.0],"mobileBottomRow":29.0,"widgetName":"Table1","defaultPageSize":0.0,"columnOrder":["uniq_id","japanese_name","currencies","specialChars","product_name","manufacturer","price","number_available_in_stock","number_of_reviews","number_of_answered_questions","average_review_rating","amazon_category_and_sub_category","customers_who_bought_this_item_also_bought","rowIndex"],"dynamicPropertyPathList":[],"displayName":"Table","bottomRow":28.0,"columnWidthMap":{},"parentRowSpace":10.0,"hideCard":false,"mobileRightColumn":34.0,"parentColumnSpace":16.65625,"dynamicTriggerPathList":[],"borderWidth":"1","primaryColumns":{"uniq_id":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":0.0,"width":150.0,"originalId":"uniq_id","id":"uniq_id","alias":"uniq_id","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"uniq_id","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"uniq_id\"]))}}","sticky":"","validation":{}},"japanese_name":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":1.0,"width":150.0,"originalId":"japanese_name","id":"japanese_name","alias":"japanese_name","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"japanese_name","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"japanese_name\"]))}}","sticky":"","validation":{}},"currencies":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":2.0,"width":150.0,"originalId":"currencies","id":"currencies","alias":"currencies","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"currencies","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"currencies\"]))}}","sticky":"","validation":{}},"specialChars":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":3.0,"width":150.0,"originalId":"specialChars","id":"specialChars","alias":"specialChars","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"specialChars","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"specialChars\"]))}}","sticky":"","validation":{}},"product_name":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":4.0,"width":150.0,"originalId":"product_name","id":"product_name","alias":"product_name","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"product_name","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"product_name\"]))}}","sticky":"","validation":{}},"manufacturer":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":5.0,"width":150.0,"originalId":"manufacturer","id":"manufacturer","alias":"manufacturer","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"manufacturer","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"manufacturer\"]))}}","sticky":"","validation":{}},"price":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":6.0,"width":150.0,"originalId":"price","id":"price","alias":"price","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"number","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"price","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"price\"]))}}","sticky":"","validation":{}},"number_available_in_stock":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":7.0,"width":150.0,"originalId":"number_available_in_stock","id":"number_available_in_stock","alias":"number_available_in_stock","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"number_available_in_stock","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"number_available_in_stock\"]))}}","sticky":"","validation":{}},"number_of_reviews":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":8.0,"width":150.0,"originalId":"number_of_reviews","id":"number_of_reviews","alias":"number_of_reviews","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"number","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"number_of_reviews","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"number_of_reviews\"]))}}","sticky":"","validation":{}},"number_of_answered_questions":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":9.0,"width":150.0,"originalId":"number_of_answered_questions","id":"number_of_answered_questions","alias":"number_of_answered_questions","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"number","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"number_of_answered_questions","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"number_of_answered_questions\"]))}}","sticky":"","validation":{}},"average_review_rating":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":10.0,"width":150.0,"originalId":"average_review_rating","id":"average_review_rating","alias":"average_review_rating","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"average_review_rating","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"average_review_rating\"]))}}","sticky":"","validation":{}},"amazon_category_and_sub_category":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":11.0,"width":150.0,"originalId":"amazon_category_and_sub_category","id":"amazon_category_and_sub_category","alias":"amazon_category_and_sub_category","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"amazon_category_and_sub_category","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"amazon_category_and_sub_category\"]))}}","sticky":"","validation":{}},"customers_who_bought_this_item_also_bought":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":12.0,"width":150.0,"originalId":"customers_who_bought_this_item_also_bought","id":"customers_who_bought_this_item_also_bought","alias":"customers_who_bought_this_item_also_bought","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"customers_who_bought_this_item_also_bought","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"customers_who_bought_this_item_also_bought\"]))}}","sticky":"","validation":{}},"rowIndex":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":13.0,"width":150.0,"originalId":"rowIndex","id":"rowIndex","alias":"rowIndex","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"number","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"rowIndex","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"rowIndex\"]))}}","sticky":"","validation":{}}},"key":"y3e8fye419","canFreezeColumn":true,"isDeprecated":false,"rightColumn":34.0,"textSize":"0.875rem","widgetId":"5w278g8zo9","minWidth":450.0,"tableData":"{{fetch_many_query_read_write.data}}","label":"Data","searchKey":"","parentId":"0","renderMode":"CANVAS","mobileTopRow":1.0,"horizontalAlignment":"LEFT","isVisibleSearch":true,"responsiveBehavior":"fill","mobileLeftColumn":0.0,"isVisiblePagination":true,"verticalAlignment":"CENTER"}]},"layoutOnLoadActions":[[{"id":"Page1_fetch_many_query_read_write","name":"fetch_many_query_read_write","confirmBeforeExecute":false,"pluginType":"SAAS","jsonPathKeys":[],"timeoutInMillisecond":10000.0}]],"layoutOnLoadActionErrors":[],"validOnPageLoadActions":true,"id":"Page1","deleted":false,"policies":[],"userPermissions":[]}],"userPermissions":[],"policies":[]},"publishedPage":{"name":"Page1","slug":"page1","layouts":[{"viewMode":false,"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1224.0,"snapColumns":16.0,"detachFromLayout":true,"widgetId":"0","topRow":0.0,"bottomRow":1250.0,"containerStyle":"none","snapRows":33.0,"parentRowSpace":1.0,"type":"CANVAS_WIDGET","canExtend":true,"version":4.0,"minHeight":1292.0,"dynamicTriggerPathList":[],"parentColumnSpace":1.0,"dynamicBindingPathList":[],"leftColumn":0.0,"children":[]},"validOnPageLoadActions":true,"id":"Page1","deleted":false,"policies":[],"userPermissions":[]}],"userPermissions":[],"policies":[]},"deleted":false,"gitSyncId":"65164f37b43d9217d781a524_65164f37b43d9217d781a526"}],"actionList":[{"pluginType":"SAAS","pluginId":"google-sheets-plugin","unpublishedAction":{"name":"fetch_many_query_read_write","datasource":{"name":"gsheet-read-write","pluginId":"google-sheets-plugin","messages":[],"isAutoGenerated":false,"id":"gsheet-read-write","deleted":false,"policies":[],"userPermissions":[]},"pageId":"Page1","actionConfiguration":{"timeoutInMillisecond":10000.0,"paginationType":"NONE","encodeParamsToggle":true,"selfReferencingDataPaths":[],"formData":{"command":{"data":"FETCH_MANY"},"entityType":{"data":"ROWS"},"tableHeaderIndex":{"data":"1"},"projection":{"data":[]},"queryFormat":{"data":"ROWS"},"range":{"data":""},"where":{"data":{"condition":"AND","children":[{"condition":"LT"}]}},"pagination":{"data":{"limit":"20","offset":"0"}},"smartSubstitution":{"data":true},"sheetUrl":{"data":"https://docs.google.com/spreadsheets/d/1rD1Bo4x-y9B7EqaVs8HuJViGSEVBeiLPuTdxMoC2uDw/edit"},"sheetName":{"data":"Sheet1"},"sortBy":{"data":[{"column":"","order":"Ascending"}]}}},"executeOnLoad":true,"dynamicBindingPathList":[],"isValid":true,"invalids":[],"messages":[],"jsonPathKeys":[],"userSetOnLoad":false,"confirmBeforeExecute":false,"policies":[],"userPermissions":[],"createdAt":"2023-09-29T04:56:32Z"},"publishedAction":{"datasource":{"messages":[],"isAutoGenerated":false,"deleted":false,"policies":[],"userPermissions":[]},"messages":[],"userSetOnLoad":false,"confirmBeforeExecute":false,"policies":[],"userPermissions":[]},"id":"Page1_fetch_many_query_read_write","deleted":false,"gitSyncId":"65164f37b43d9217d781a524_65164f5db43d9217d781a52b"}],"actionCollectionList":[],"updatedResources":{"customJSLibList":[],"actionList":["fetch_many_query_read_write##ENTITY_SEPARATOR##Page1"],"pageList":["Page1"],"actionCollectionList":[]},"editModeTheme":{"name":"Default-New","displayName":"Modern","isSystemTheme":true,"deleted":false},"publishedTheme":{"name":"Default-New","displayName":"Modern","isSystemTheme":true,"deleted":false}}
\ No newline at end of file
diff --git a/app/client/cypress/fixtures/ImportAppSelectedAccess.json b/app/client/cypress/fixtures/ImportAppSelectedAccess.json
new file mode 100644
index 0000000000..8b2b6bdd0b
--- /dev/null
+++ b/app/client/cypress/fixtures/ImportAppSelectedAccess.json
@@ -0,0 +1 @@
+{"clientSchemaVersion":1.0,"serverSchemaVersion":6.0,"exportedApplication":{"name":"ImportAppSelectedAccess","isPublic":false,"pages":[{"id":"Page1","isDefault":true}],"publishedPages":[{"id":"Page1","isDefault":true}],"viewMode":false,"appIsExample":false,"unreadCommentThreads":0.0,"color":"#CCCCCC","icon":"call","slug":"importappselectedaccess","unpublishedCustomJSLibs":[],"publishedCustomJSLibs":[],"evaluationVersion":2.0,"applicationVersion":2.0,"collapseInvisibleWidgets":true,"isManualUpdate":false,"deleted":false},"datasourceList":[{"name":"gsheet-selected","pluginId":"google-sheets-plugin","messages":[],"isAutoGenerated":false,"deleted":false,"gitSyncId":"6507db87f847163dfe7777c4_6507dc29f847163dfe7777d1"}],"customJSLibList":[],"pageList":[{"unpublishedPage":{"name":"Page1","slug":"page1","layouts":[{"viewMode":false,"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":4896.0,"snapColumns":64.0,"detachFromLayout":true,"widgetId":"0","topRow":0.0,"bottomRow":380.0,"containerStyle":"none","snapRows":124.0,"parentRowSpace":1.0,"type":"CANVAS_WIDGET","canExtend":true,"version":86.0,"minHeight":1292.0,"dynamicTriggerPathList":[],"parentColumnSpace":1.0,"dynamicBindingPathList":[],"leftColumn":0.0,"children":[{"boxShadow":"{{appsmith.theme.boxShadow.appBoxShadow}}","borderColor":"#E0DEDE","isVisibleDownload":true,"iconSVG":"/static/media/icon.e6911f8bb94dc6c4a102a74740c41763.svg","topRow":0.0,"isSortable":true,"type":"TABLE_WIDGET_V2","inlineEditingSaveOption":"ROW_LEVEL","animateLoading":true,"dynamicBindingPathList":[{"key":"accentColor"},{"key":"borderRadius"},{"key":"boxShadow"},{"key":"tableData"},{"key":"primaryColumns.uniq_id.computedValue"},{"key":"primaryColumns.japanese_name.computedValue"},{"key":"primaryColumns.currencies.computedValue"},{"key":"primaryColumns.specialChars.computedValue"},{"key":"primaryColumns.product_name.computedValue"},{"key":"primaryColumns.manufacturer.computedValue"},{"key":"primaryColumns.price.computedValue"},{"key":"primaryColumns.number_available_in_stock.computedValue"},{"key":"primaryColumns.number_of_reviews.computedValue"},{"key":"primaryColumns.number_of_answered_questions.computedValue"},{"key":"primaryColumns.average_review_rating.computedValue"},{"key":"primaryColumns.amazon_category_and_sub_category.computedValue"},{"key":"primaryColumns.customers_who_bought_this_item_also_bought.computedValue"},{"key":"primaryColumns.rowIndex.computedValue"}],"needsHeightForContent":true,"leftColumn":0.0,"delimiter":",","defaultSelectedRowIndex":0.0,"accentColor":"{{appsmith.theme.colors.primaryColor}}","isVisibleFilters":true,"isVisible":true,"enableClientSideSearch":true,"version":2.0,"totalRecordsCount":0.0,"tags":["Suggested","Display"],"isLoading":false,"childStylesheet":{"button":{"buttonColor":"{{appsmith.theme.colors.primaryColor}}","borderRadius":"{{appsmith.theme.borderRadius.appBorderRadius}}","boxShadow":"none"},"menuButton":{"menuColor":"{{appsmith.theme.colors.primaryColor}}","borderRadius":"{{appsmith.theme.borderRadius.appBorderRadius}}","boxShadow":"none"},"iconButton":{"buttonColor":"{{appsmith.theme.colors.primaryColor}}","borderRadius":"{{appsmith.theme.borderRadius.appBorderRadius}}","boxShadow":"none"},"editActions":{"saveButtonColor":"{{appsmith.theme.colors.primaryColor}}","saveBorderRadius":"{{appsmith.theme.borderRadius.appBorderRadius}}","discardButtonColor":"{{appsmith.theme.colors.primaryColor}}","discardBorderRadius":"{{appsmith.theme.borderRadius.appBorderRadius}}"}},"borderRadius":"{{appsmith.theme.borderRadius.appBorderRadius}}","columnUpdatedAt":1.695963199756E12,"defaultSelectedRowIndices":[0.0],"mobileBottomRow":29.0,"widgetName":"Table1","defaultPageSize":0.0,"columnOrder":["uniq_id","japanese_name","currencies","specialChars","product_name","manufacturer","price","number_available_in_stock","number_of_reviews","number_of_answered_questions","average_review_rating","amazon_category_and_sub_category","customers_who_bought_this_item_also_bought","rowIndex"],"dynamicPropertyPathList":[],"displayName":"Table","bottomRow":28.0,"columnWidthMap":{},"parentRowSpace":10.0,"hideCard":false,"mobileRightColumn":34.0,"parentColumnSpace":16.65625,"dynamicTriggerPathList":[],"borderWidth":"1","primaryColumns":{"uniq_id":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":0.0,"width":150.0,"originalId":"uniq_id","id":"uniq_id","alias":"uniq_id","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"uniq_id","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"uniq_id\"]))}}","sticky":"","validation":{}},"japanese_name":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":1.0,"width":150.0,"originalId":"japanese_name","id":"japanese_name","alias":"japanese_name","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"japanese_name","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"japanese_name\"]))}}","sticky":"","validation":{}},"currencies":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":2.0,"width":150.0,"originalId":"currencies","id":"currencies","alias":"currencies","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"currencies","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"currencies\"]))}}","sticky":"","validation":{}},"specialChars":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":3.0,"width":150.0,"originalId":"specialChars","id":"specialChars","alias":"specialChars","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"specialChars","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"specialChars\"]))}}","sticky":"","validation":{}},"product_name":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":4.0,"width":150.0,"originalId":"product_name","id":"product_name","alias":"product_name","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"product_name","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"product_name\"]))}}","sticky":"","validation":{}},"manufacturer":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":5.0,"width":150.0,"originalId":"manufacturer","id":"manufacturer","alias":"manufacturer","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"manufacturer","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"manufacturer\"]))}}","sticky":"","validation":{}},"price":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":6.0,"width":150.0,"originalId":"price","id":"price","alias":"price","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"number","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"price","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"price\"]))}}","sticky":"","validation":{}},"number_available_in_stock":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":7.0,"width":150.0,"originalId":"number_available_in_stock","id":"number_available_in_stock","alias":"number_available_in_stock","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"number_available_in_stock","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"number_available_in_stock\"]))}}","sticky":"","validation":{}},"number_of_reviews":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":8.0,"width":150.0,"originalId":"number_of_reviews","id":"number_of_reviews","alias":"number_of_reviews","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"number","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"number_of_reviews","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"number_of_reviews\"]))}}","sticky":"","validation":{}},"number_of_answered_questions":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":9.0,"width":150.0,"originalId":"number_of_answered_questions","id":"number_of_answered_questions","alias":"number_of_answered_questions","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"number","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"number_of_answered_questions","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"number_of_answered_questions\"]))}}","sticky":"","validation":{}},"average_review_rating":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":10.0,"width":150.0,"originalId":"average_review_rating","id":"average_review_rating","alias":"average_review_rating","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"average_review_rating","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"average_review_rating\"]))}}","sticky":"","validation":{}},"amazon_category_and_sub_category":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":11.0,"width":150.0,"originalId":"amazon_category_and_sub_category","id":"amazon_category_and_sub_category","alias":"amazon_category_and_sub_category","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"amazon_category_and_sub_category","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"amazon_category_and_sub_category\"]))}}","sticky":"","validation":{}},"customers_who_bought_this_item_also_bought":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":12.0,"width":150.0,"originalId":"customers_who_bought_this_item_also_bought","id":"customers_who_bought_this_item_also_bought","alias":"customers_who_bought_this_item_also_bought","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"text","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"customers_who_bought_this_item_also_bought","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"customers_who_bought_this_item_also_bought\"]))}}","sticky":"","validation":{}},"rowIndex":{"allowCellWrapping":false,"allowSameOptionsInNewRow":true,"index":13.0,"width":150.0,"originalId":"rowIndex","id":"rowIndex","alias":"rowIndex","horizontalAlignment":"LEFT","verticalAlignment":"CENTER","columnType":"number","textSize":"0.875rem","enableFilter":true,"enableSort":true,"isVisible":true,"isDisabled":false,"isCellEditable":false,"isEditable":false,"isCellVisible":true,"isDerived":false,"label":"rowIndex","isSaveVisible":true,"isDiscardVisible":true,"computedValue":"{{Table1.processedTableData.map((currentRow, currentIndex) => ( currentRow[\"rowIndex\"]))}}","sticky":"","validation":{}}},"key":"y3e8fye419","canFreezeColumn":true,"isDeprecated":false,"rightColumn":34.0,"textSize":"0.875rem","widgetId":"5w278g8zo9","minWidth":450.0,"tableData":"{{fetch_many_selected_access.data}}","label":"Data","searchKey":"","parentId":"0","renderMode":"CANVAS","mobileTopRow":1.0,"horizontalAlignment":"LEFT","isVisibleSearch":true,"responsiveBehavior":"fill","mobileLeftColumn":0.0,"isVisiblePagination":true,"verticalAlignment":"CENTER"}]},"layoutOnLoadActions":[[{"id":"Page1_fetch_many_selected_access","name":"fetch_many_selected_access","confirmBeforeExecute":false,"pluginType":"SAAS","jsonPathKeys":[],"timeoutInMillisecond":10000.0}]],"layoutOnLoadActionErrors":[],"validOnPageLoadActions":true,"id":"Page1","deleted":false,"policies":[],"userPermissions":[]}],"userPermissions":[],"policies":[]},"publishedPage":{"name":"Page1","slug":"page1","layouts":[{"viewMode":false,"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1224.0,"snapColumns":16.0,"detachFromLayout":true,"widgetId":"0","topRow":0.0,"bottomRow":1250.0,"containerStyle":"none","snapRows":33.0,"parentRowSpace":1.0,"type":"CANVAS_WIDGET","canExtend":true,"version":4.0,"minHeight":1292.0,"dynamicTriggerPathList":[],"parentColumnSpace":1.0,"dynamicBindingPathList":[],"leftColumn":0.0,"children":[]},"validOnPageLoadActions":true,"id":"Page1","deleted":false,"policies":[],"userPermissions":[]}],"userPermissions":[],"policies":[]},"deleted":false,"gitSyncId":"65164f37b43d9217d781a524_65164f37b43d9217d781a526"}],"actionList":[{"pluginType":"SAAS","pluginId":"google-sheets-plugin","unpublishedAction":{"name":"fetch_many_selected_access","datasource":{"name":"gsheet-selected","pluginId":"google-sheets-plugin","messages":[],"isAutoGenerated":false,"id":"gsheet-selected","deleted":false,"policies":[],"userPermissions":[]},"pageId":"Page1","actionConfiguration":{"timeoutInMillisecond":10000.0,"paginationType":"NONE","encodeParamsToggle":true,"selfReferencingDataPaths":[],"formData":{"command":{"data":"FETCH_MANY"},"entityType":{"data":"ROWS"},"tableHeaderIndex":{"data":"1"},"projection":{"data":[]},"queryFormat":{"data":"ROWS"},"range":{"data":""},"where":{"data":{"condition":"AND","children":[{"condition":"LT"}]}},"pagination":{"data":{"limit":"20","offset":"0"}},"smartSubstitution":{"data":true},"sheetUrl":{"data":"https://docs.google.com/spreadsheets/d/1rD1Bo4x-y9B7EqaVs8HuJViGSEVBeiLPuTdxMoC2uDw/edit"},"sheetName":{"data":"Sheet1"},"sortBy":{"data":[{"column":"","order":"Ascending"}]}}},"executeOnLoad":true,"dynamicBindingPathList":[],"isValid":true,"invalids":[],"messages":[],"jsonPathKeys":[],"userSetOnLoad":false,"confirmBeforeExecute":false,"policies":[],"userPermissions":[],"createdAt":"2023-09-29T04:59:00Z"},"publishedAction":{"datasource":{"messages":[],"isAutoGenerated":false,"deleted":false,"policies":[],"userPermissions":[]},"messages":[],"userSetOnLoad":false,"confirmBeforeExecute":false,"policies":[],"userPermissions":[]},"id":"Page1_fetch_many_selected_access","deleted":false,"gitSyncId":"65164f37b43d9217d781a524_65164f5db43d9217d781a52b"}],"actionCollectionList":[],"updatedResources":{"customJSLibList":[],"actionList":["fetch_many_selected_access##ENTITY_SEPARATOR##Page1"],"pageList":["Page1"],"actionCollectionList":[]},"editModeTheme":{"name":"Default-New","displayName":"Modern","isSystemTheme":true,"deleted":false},"publishedTheme":{"name":"Default-New","displayName":"Modern","isSystemTheme":true,"deleted":false}}
\ No newline at end of file
diff --git a/app/client/cypress/locators/AdminsSettings.js b/app/client/cypress/locators/AdminsSettings.js
index 1fec88b0fb..ba9e74523b 100644
--- a/app/client/cypress/locators/AdminsSettings.js
+++ b/app/client/cypress/locators/AdminsSettings.js
@@ -4,7 +4,7 @@ export default {
   advancedTab: ".t--settings-category-advanced",
   authenticationTab: ".t--settings-category-authentication",
   emailTab: ".t--settings-category-email",
-  googleMapsTab: ".t--settings-category-google-maps",
+  developerSettingsTab: ".t--settings-category-developer-settings",
   googleButton: ".t--settings-sub-category-google-auth",
   githubButton: ".t--settings-sub-category-github-auth",
   formloginButton: ".t--settings-sub-category-form-login",
diff --git a/app/client/cypress/locators/WidgetLocators.ts b/app/client/cypress/locators/WidgetLocators.ts
index 3e356fb068..ef362c8c76 100644
--- a/app/client/cypress/locators/WidgetLocators.ts
+++ b/app/client/cypress/locators/WidgetLocators.ts
@@ -45,6 +45,7 @@ export const WIDGET = {
   JSONFORM: "jsonformwidget",
   MENUBUTTON: "menubuttonwidget",
   DATEPICKER: "datepickerwidget2",
+  MAP: "mapwidget",
 } as const;
 
 // property pane element selector are maintained here
diff --git a/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithBorderRadius.snap.png b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithBorderRadius.snap.png
new file mode 100644
index 0000000000..073ed59d28
Binary files /dev/null and b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithBorderRadius.snap.png differ
diff --git a/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithBoxShadow.snap.png b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithBoxShadow.snap.png
new file mode 100644
index 0000000000..9d02413822
Binary files /dev/null and b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithBoxShadow.snap.png differ
diff --git a/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithDefaultMarker1.snap.png b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithDefaultMarker1.snap.png
new file mode 100644
index 0000000000..79b48d2857
Binary files /dev/null and b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithDefaultMarker1.snap.png differ
diff --git a/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithDefaultMarker2.snap.png b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithDefaultMarker2.snap.png
new file mode 100644
index 0000000000..a27c00a799
Binary files /dev/null and b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithDefaultMarker2.snap.png differ
diff --git a/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithDefaultZoomIn.snap.png b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithDefaultZoomIn.snap.png
new file mode 100644
index 0000000000..af196e948d
Binary files /dev/null and b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithDefaultZoomIn.snap.png differ
diff --git a/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithDefaultZoomOut.snap.png b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithDefaultZoomOut.snap.png
new file mode 100644
index 0000000000..c30e60de62
Binary files /dev/null and b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithDefaultZoomOut.snap.png differ
diff --git a/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithEnableSearchLocationOff.snap.png b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithEnableSearchLocationOff.snap.png
new file mode 100644
index 0000000000..912836e846
Binary files /dev/null and b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithEnableSearchLocationOff.snap.png differ
diff --git a/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithEnablingClusteringON.snap.png b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithEnablingClusteringON.snap.png
new file mode 100644
index 0000000000..df9aa88996
Binary files /dev/null and b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithEnablingClusteringON.snap.png differ
diff --git a/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithEnablingClusteringOff.snap.png b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithEnablingClusteringOff.snap.png
new file mode 100644
index 0000000000..a61315a9e0
Binary files /dev/null and b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithEnablingClusteringOff.snap.png differ
diff --git a/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithInitalLocation.snap.png b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithInitalLocation.snap.png
new file mode 100644
index 0000000000..9734ba0ba3
Binary files /dev/null and b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithInitalLocation.snap.png differ
diff --git a/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithMapNMarkerCenteringOff.snap.png b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithMapNMarkerCenteringOff.snap.png
new file mode 100644
index 0000000000..7efb7e7d5c
Binary files /dev/null and b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithMapNMarkerCenteringOff.snap.png differ
diff --git a/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithPickLocationOff.snap.png b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithPickLocationOff.snap.png
new file mode 100644
index 0000000000..7efb7e7d5c
Binary files /dev/null and b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithPickLocationOff.snap.png differ
diff --git a/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithVisibilityOff.snap.png b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithVisibilityOff.snap.png
new file mode 100644
index 0000000000..3c8da7146c
Binary files /dev/null and b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithVisibilityOff.snap.png differ
diff --git a/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithVisibilityOnWithJS.snap.png b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithVisibilityOnWithJS.snap.png
new file mode 100644
index 0000000000..af196e948d
Binary files /dev/null and b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithVisibilityOnWithJS.snap.png differ
diff --git a/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithinItalLocationAsJS.snap.png b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithinItalLocationAsJS.snap.png
new file mode 100644
index 0000000000..f84ce5da5d
Binary files /dev/null and b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapWithinItalLocationAsJS.snap.png differ
diff --git a/app/client/cypress/snapshots/MapWidget_Spec.ts/mapsimple.snap.png b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapsimple.snap.png
new file mode 100644
index 0000000000..7e1c9ff5cb
Binary files /dev/null and b/app/client/cypress/snapshots/MapWidget_Spec.ts/mapsimple.snap.png differ
diff --git a/app/client/cypress/support/Objects/CommonLocators.ts b/app/client/cypress/support/Objects/CommonLocators.ts
index dd44be6e2f..60017c8745 100644
--- a/app/client/cypress/support/Objects/CommonLocators.ts
+++ b/app/client/cypress/support/Objects/CommonLocators.ts
@@ -319,4 +319,5 @@ export class CommonLocators {
   _richText_line = "#tinymce p span";
   _treeSelectedContent = ".rc-tree-select-selection-item-content";
   _switcherIcon = ".switcher-icon";
+  _root = "#root";
 }
diff --git a/app/client/cypress/support/Pages/AdminSettings.ts b/app/client/cypress/support/Pages/AdminSettings.ts
index 47f34be115..c4506bb040 100644
--- a/app/client/cypress/support/Pages/AdminSettings.ts
+++ b/app/client/cypress/support/Pages/AdminSettings.ts
@@ -4,6 +4,7 @@ export class AdminSettings {
   public agHelper = ObjectsRegistry.AggregateHelper;
   public locator = ObjectsRegistry.CommonLocators;
   public homePage = ObjectsRegistry.HomePage;
+  public assertHelper = ObjectsRegistry.AssertHelper;
 
   public _adminSettingsBtn = '[data-testid="t--admin-settings-menu-option"]';
   private _settingsList = ".t--settings-category-list";
@@ -11,13 +12,13 @@ export class AdminSettings {
   public _roles = (user: string) =>
     "//span[contains(text(), '" +
     user +
-    "')]/parent::div/parent::a/parent::td/following-sibling::td[1]";
-  public _instanceName =
-    "//label[text()='Instance name']/following-sibling::div//input";
+    "')]/parent::div/parent::span/parent::a/parent::td/following-sibling::td[1]";
+  public _instanceName = '[name="instanceName"]';
 
   public NavigateToAdminSettings() {
     this.homePage.NavigateToHome();
     this.agHelper.GetNClick(this._adminSettingsBtn);
+    this.assertHelper.AssertNetworkStatus("getEnvVariables");
     this.agHelper.AssertElementVisibility(this._settingsList);
   }
 }
diff --git a/app/client/cypress/support/Pages/AggregateHelper.ts b/app/client/cypress/support/Pages/AggregateHelper.ts
index 0f4c85aee1..c1747ae00d 100644
--- a/app/client/cypress/support/Pages/AggregateHelper.ts
+++ b/app/client/cypress/support/Pages/AggregateHelper.ts
@@ -1043,8 +1043,8 @@ export class AggregateHelper extends ReusableHelper {
 
   public ActionContextMenuWithInPane({
     action = "Delete",
-    subAction = "",
     entityType = EntityItems.JSObject,
+    subAction = "",
     toastToValidate = "",
   }: DeleteParams) {
     cy.get(this.locator._contextMenuInPane).click();
@@ -1663,6 +1663,10 @@ export class AggregateHelper extends ReusableHelper {
     this.GetElement(selector).should("have.class", className);
   }
 
+  public VerifySnapshot(selector: string, identifier: string) {
+    this.GetElement(selector).matchImageSnapshot(identifier);
+  }
+
   //Not used:
   // private xPathToCss(xpath: string) {
   //     return xpath
diff --git a/app/client/cypress/support/Pages/DataSources.ts b/app/client/cypress/support/Pages/DataSources.ts
index b131918b57..966d343ce0 100644
--- a/app/client/cypress/support/Pages/DataSources.ts
+++ b/app/client/cypress/support/Pages/DataSources.ts
@@ -295,6 +295,7 @@ export class DataSources {
     `.t--datasource-tab-container ${this._entityExplorerID(tableName)}`;
   _dsPageTableTriggermenuTarget = (tableName: string) =>
     `${this._dsPageTabContainerTableName(tableName)} .t--template-menu-trigger`;
+  _gSheetQueryPlaceholder = ".CodeMirror-placeholder";
 
   public AssertDSEditViewMode(mode: "Edit" | "View") {
     if (mode == "Edit") this.agHelper.AssertElementAbsence(this._editButton);
diff --git a/app/client/cypress/support/Pages/EntityExplorer.ts b/app/client/cypress/support/Pages/EntityExplorer.ts
index 8e42bd557a..48a94a178a 100644
--- a/app/client/cypress/support/Pages/EntityExplorer.ts
+++ b/app/client/cypress/support/Pages/EntityExplorer.ts
@@ -28,6 +28,7 @@ interface EntityActionParams {
     | "Refresh"
     | "Set as home page";
   subAction?: string;
+  //@ts-expect-error: type mismatch
   entityType?: EntityItems;
   toAssertAction?: boolean;
   toastToValidate?: string;
@@ -232,10 +233,10 @@ export class EntityExplorer {
   }
 
   public ActionContextMenuByEntityName({
-    entityNameinLeftSidebar,
     action = "Delete",
-    subAction = "",
+    entityNameinLeftSidebar,
     entityType = EntityItems.Query,
+    subAction = "",
     toAssertAction,
     toastToValidate = "",
   }: EntityActionParams) {
diff --git a/app/client/cypress/support/Pages/HomePage.ts b/app/client/cypress/support/Pages/HomePage.ts
index 9e3a03625f..846fb2e9c2 100644
--- a/app/client/cypress/support/Pages/HomePage.ts
+++ b/app/client/cypress/support/Pages/HomePage.ts
@@ -623,6 +623,17 @@ export class HomePage {
     this.agHelper.WaitUntilToastDisappear("Deleting application...");
   }
 
+  public DeleteAppviaAPI(appId: any) {
+    cy.request({
+      method: "DELETE",
+      url: "api/v1/applications/" + appId,
+      failOnStatusCode: false,
+      headers: {
+        "X-Requested-By": "Appsmith",
+      },
+    });
+  }
+
   //Maps to leaveworkspace in command.js
   public LeaveWorkspace(workspaceName: string) {
     this.OpenWorkspaceOptions(workspaceName);
diff --git a/app/client/cypress/support/Pages/PropertyPane.ts b/app/client/cypress/support/Pages/PropertyPane.ts
index 9c88e1424b..ed91976e76 100644
--- a/app/client/cypress/support/Pages/PropertyPane.ts
+++ b/app/client/cypress/support/Pages/PropertyPane.ts
@@ -53,11 +53,11 @@ export class PropertyPane {
   _mode = (modeName: string) =>
     "//span[contains(text(),'" + modeName + "')]//parent::span";
   _propertyToggle = (controlToToggle: string) =>
-    ".t--property-control-" +
+    "//div[contains(@class,'t--property-control-" +
     controlToToggle.replace(/ +/g, "").toLowerCase() +
-    " input[type='checkbox'], label:contains('" +
+    "')]//input[@type='checkbox'] | //label[text()='" +
     controlToToggle +
-    "') input[type='checkbox']";
+    "']//input[@type='checkbox']";
   _colorPickerV2Popover = ".t--colorpicker-v2-popover";
   _colorPickerV2Color = ".t--colorpicker-v2-color";
   _colorInput = (option: string) =>
@@ -163,6 +163,10 @@ export class PropertyPane {
   _countryCodeChangeDropDown = ".t--input-country-code-change .remixicon-icon";
   _searchCountryPlaceHolder = "[placeholder='Search by ISD code or country']";
   _closeModal = "//*[contains(@class,'ads-v2-button t--close')]";
+  _zoomLevelInput = ".t--property-control-zoomlevel input";
+  _zoomLevelControl = (control: "start" | "end") =>
+    ".t--property-control-zoomlevel .ads-v2-input__input-section-icon-" +
+    control;
 
   _dataIcon = (icon: string) => `[data-icon="${icon}"]`;
   public OpenJsonFormFieldSettings(fieldName: string) {
@@ -636,4 +640,20 @@ export class PropertyPane {
       );
     });
   }
+
+  public SetZoomLevel(zoom: number) {
+    this.agHelper.GetAttribute(this._zoomLevelInput, "value").then((value) => {
+      const currentValue = Number(value?.replace("%", ""));
+
+      if (currentValue === zoom || currentValue === 100 || currentValue === 0) {
+        return;
+      }
+      if (zoom > currentValue) {
+        this.agHelper.GetElement(this._zoomLevelControl("end")).click();
+      } else if (zoom < currentValue) {
+        this.agHelper.GetElement(this._zoomLevelControl("start")).click();
+      }
+      this.SetZoomLevel(zoom);
+    });
+  }
 }
diff --git a/app/client/cypress/support/Pages/Table.ts b/app/client/cypress/support/Pages/Table.ts
index 94add0da1c..bf48613063 100644
--- a/app/client/cypress/support/Pages/Table.ts
+++ b/app/client/cypress/support/Pages/Table.ts
@@ -189,7 +189,7 @@ export class Table {
   _divFirstChild = "div:first-child abbr";
   _listPreviousPage = ".rc-pagination-prev";
   _listNavigation = (move: string) =>
-    "//button[@area-label='" + move + " page']";
+    "//button[@aria-label='" + move + " page']";
   _listNextPage = ".rc-pagination-next";
   _listActivePage = (version: "v1" | "v2") =>
     `.t--widget-listwidget${
diff --git a/app/client/cypress_ci_hosted.config.ts b/app/client/cypress_ci_hosted.config.ts
index 33948c1aa5..fd3f80f2c0 100644
--- a/app/client/cypress_ci_hosted.config.ts
+++ b/app/client/cypress_ci_hosted.config.ts
@@ -52,8 +52,8 @@ export default defineConfig({
     specPattern: [
       "cypress/e2e/Sanity/Datasources/Airtable_Basic_Spec.ts",
       "cypress/e2e/GSheet/**/**/*",
-      "cypress/e2e/Regression/ServerSide/Datasources/ElasticSearch_Basic_Spec.ts",
       "cypress/e2e/Regression/ServerSide/Datasources/Oracle_Spec.ts",
+      "cypress/e2e/Regression/ClientSide/Widgets/Others/MapWidget_Spec.ts",
     ],
     testIsolation: false,
     excludeSpecPattern: ["cypress/e2e/**/spec_utility.ts"],
diff --git a/app/client/jest.config.js b/app/client/jest.config.js
index 3fd4b33709..b40121f623 100644
--- a/app/client/jest.config.js
+++ b/app/client/jest.config.js
@@ -103,8 +103,6 @@ module.exports = {
       },
       intercomAppID: "APP_ID",
       mailEnabled: parseConfig("__APPSMITH_MAIL_ENABLED__"),
-
-      hideWatermark: parseConfig("__APPSMITH_HIDE_WATERMARK__"),
       disableIframeWidgetSandbox: parseConfig(
         "__APPSMITH_DISABLE_IFRAME_WIDGET_SANDBOX__",
       ),
diff --git a/app/client/package.json b/app/client/package.json
index 07f8cceb0f..2079505bdc 100644
--- a/app/client/package.json
+++ b/app/client/package.json
@@ -97,7 +97,7 @@
     "cypress-log-to-output": "^1.1.2",
     "dayjs": "^1.10.6",
     "deep-diff": "^1.0.2",
-    "design-system": "npm:@appsmithorg/design-system@2.1.21",
+    "design-system": "npm:@appsmithorg/design-system@2.1.23",
     "design-system-old": "npm:@appsmithorg/design-system-old@1.1.12",
     "downloadjs": "^1.4.7",
     "echarts": "^5.4.2",
@@ -282,17 +282,18 @@
     "@types/tinycolor2": "^1.4.2",
     "@types/to-json-schema": "^0.2.1",
     "@types/toposort": "^2.0.3",
+    "@types/uuid": "^9.0.5",
     "@types/webfontloader": "1.6.33",
     "@types/zipcelx": "^1.5.0",
-    "@typescript-eslint/eslint-plugin": "^5.54.1",
-    "@typescript-eslint/parser": "^5.54.1",
+    "@typescript-eslint/eslint-plugin": "^6.7.4",
+    "@typescript-eslint/parser": "^6.7.4",
     "babel-plugin-lodash": "^3.3.4",
     "babel-plugin-module-resolver": "^4.1.0",
     "chalk": "^4.1.1",
     "compression-webpack-plugin": "^10.0.0",
     "cra-bundle-analyzer": "^0.1.0",
     "cy-verify-downloads": "^0.0.5",
-    "cypress": "13.2.0",
+    "cypress": "13.3.1",
     "cypress-file-upload": "^4.1.1",
     "cypress-image-snapshot": "^4.0.1",
     "cypress-mochawesome-reporter": "^3.5.1",
@@ -306,17 +307,17 @@
     "cypress-xpath": "^1.6.0",
     "diff": "^5.0.0",
     "dotenv": "^8.1.0",
-    "eslint": "^8.42.0",
-    "eslint-config-prettier": "^8.6.0",
-    "eslint-import-resolver-babel-module": "^5.3.1",
-    "eslint-plugin-cypress": "^2.11.2",
-    "eslint-plugin-import": "^2.25.2",
-    "eslint-plugin-jest": "^27.2.1",
-    "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-react": "^7.30.0",
-    "eslint-plugin-react-hooks": "^2.3.0",
-    "eslint-plugin-sort-destructure-keys": "^1.3.5",
-    "eslint-plugin-storybook": "^0.6.11",
+    "eslint": "^8.51.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-import-resolver-babel-module": "^5.3.2",
+    "eslint-plugin-cypress": "^2.15.1",
+    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-jest": "^27.4.2",
+    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-react": "^7.33.2",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-sort-destructure-keys": "^1.5.0",
+    "eslint-plugin-storybook": "^0.6.15",
     "esm": "^3.2.25",
     "factory.ts": "^0.5.1",
     "husky": "^8.0.0",
@@ -325,21 +326,19 @@
     "jest-environment-jsdom": "^27.4.1",
     "jest-styled-components": "^7.0.8",
     "json5": "^2.2.3",
-    "lint-staged": "^13.2.0",
+    "lint-staged": "^14.0.1",
     "msw": "^0.28.0",
     "pg": "^8.11.3",
     "plop": "^3.1.1",
-    "postcss": "^8.4.31",
+    "postcss": "8.4.31",
     "postcss-at-rules-variables": "^0.3.0",
-    "postcss-conditionals": "^2.1.0",
     "postcss-each": "^1.1.0",
-    "postcss-for": "^2.1.1",
     "postcss-import": "^15.1.0",
     "postcss-modules-values": "^4.0.0",
     "postcss-nesting": "^12.0.1",
     "postcss-url": "^10.1.3",
     "postinstall-postinstall": "^2.1.0",
-    "prettier": "^2.8.6",
+    "prettier": "^3.0.3",
     "prop-types": "^15.8.1",
     "raw-loader": "^4.0.2",
     "react-is": "^16.12.0",
@@ -378,6 +377,7 @@
     "@blueprintjs/core@^3.33.0": "patch:@blueprintjs/core@npm%3A3.47.0#./.yarn/patches/@blueprintjs-core-npm-3.47.0-a5bc1ea927.patch",
     "@blueprintjs/core@^3.47.0": "patch:@blueprintjs/core@npm%3A3.47.0#./.yarn/patches/@blueprintjs-core-npm-3.47.0-a5bc1ea927.patch",
     "@blueprintjs/icons": "3.22.0",
-    "@types/react": "^17.0.2"
+    "@types/react": "^17.0.2",
+    "postcss": "8.4.31"
   }
 }
diff --git a/app/client/packages/ast/src/index.ts b/app/client/packages/ast/src/index.ts
index 78e19623d7..334d23de92 100644
--- a/app/client/packages/ast/src/index.ts
+++ b/app/client/packages/ast/src/index.ts
@@ -142,12 +142,12 @@ export interface BlockStatementNode extends Node {
   body: [Node];
 }
 
-type NodeList = {
+interface NodeList {
   references: Set<string>;
   functionalParams: Set<string>;
   variableDeclarations: Set<string>;
   identifierList: Array<IdentifierNode>;
-};
+}
 
 // https://github.com/estree/estree/blob/master/es5.md#property
 export interface PropertyNode extends Node {
@@ -185,10 +185,10 @@ export type NodeWithLocation<NodeType> = NodeType & {
 
 type AstOptions = Omit<Options, "ecmaVersion">;
 
-type EntityRefactorResponse = {
+interface EntityRefactorResponse {
   isSuccess: boolean;
   body: { script: string; refactorCount: number } | { error: string };
-};
+}
 
 /* We need these functions to typescript casts the nodes with the correct types */
 export const isIdentifierNode = (node: Node): node is IdentifierNode => {
@@ -507,7 +507,10 @@ export const entityRefactorFromCode = (
   }
 };
 
-export type functionParam = { paramName: string; defaultValue: unknown };
+export interface functionParam {
+  paramName: string;
+  defaultValue: unknown;
+}
 
 export const getFunctionalParamsFromNode = (
   node:
diff --git a/app/client/packages/ast/src/peekOverlay/index.ts b/app/client/packages/ast/src/peekOverlay/index.ts
index 646d2757e8..c9d0efec2c 100644
--- a/app/client/packages/ast/src/peekOverlay/index.ts
+++ b/app/client/packages/ast/src/peekOverlay/index.ts
@@ -77,7 +77,7 @@ export class PeekOverlayExpressionIdentifier {
   }
 }
 
-export type PeekOverlayExpressionIdentifierOptions = {
+export interface PeekOverlayExpressionIdentifierOptions {
   sourceType: SourceType;
   thisExpressionReplacement?: string;
-};
+}
diff --git a/app/client/packages/ast/src/utils.ts b/app/client/packages/ast/src/utils.ts
index f6bc2e2aa7..b82005cb8b 100644
--- a/app/client/packages/ast/src/utils.ts
+++ b/app/client/packages/ast/src/utils.ts
@@ -25,10 +25,10 @@ export const isTrueObject = (
 export const getNameFromPropertyNode = (node: PropertyNode): string =>
   isLiteralNode(node.key) ? String(node.key.value) : node.key.name;
 
-type Position = {
+interface Position {
   line: number;
   ch: number;
-};
+}
 
 export const extractContentByPosition = (
   content: string,
diff --git a/app/client/packages/design-system/headless/src/components/Checkbox/src/Checkbox.tsx b/app/client/packages/design-system/headless/src/components/Checkbox/src/Checkbox.tsx
index 06149c86bd..c303a59001 100644
--- a/app/client/packages/design-system/headless/src/components/Checkbox/src/Checkbox.tsx
+++ b/app/client/packages/design-system/headless/src/components/Checkbox/src/Checkbox.tsx
@@ -15,9 +15,9 @@ import { SubtractIcon } from "./icons/SubtractIcon";
 import { Icon as HeadlessIcon } from "../../Icon";
 import type { CheckboxGroupContextType } from "./context";
 
-export type InlineLabelProps = {
+export interface InlineLabelProps {
   labelPosition?: "left" | "right";
-};
+}
 
 export interface CheckboxProps
   extends Omit<SpectrumCheckboxProps, keyof StyleProps>,
@@ -36,8 +36,8 @@ const _Checkbox = (props: CheckboxProps, ref: CheckboxRef) => {
     icon: Icon = CheckIcon,
     isDisabled: isDisabledProp = false,
     isIndeterminate = false,
-    validationState,
     labelPosition = "right",
+    validationState,
   } = props;
   const state = useToggleState(props);
   const inputRef = useRef<HTMLInputElement>(null);
diff --git a/app/client/packages/design-system/headless/src/components/Checkbox/src/context.ts b/app/client/packages/design-system/headless/src/components/Checkbox/src/context.ts
index 56ee4d5f1a..72f25be0eb 100644
--- a/app/client/packages/design-system/headless/src/components/Checkbox/src/context.ts
+++ b/app/client/packages/design-system/headless/src/components/Checkbox/src/context.ts
@@ -2,10 +2,10 @@ import React from "react";
 
 import type { CheckboxGroupState } from "@react-stately/checkbox";
 
-export type CheckboxGroupContextType = {
+export interface CheckboxGroupContextType {
   state: CheckboxGroupState;
   isDisabled?: boolean;
-};
+}
 
 export const CheckboxGroupContext =
   React.createContext<CheckboxGroupContextType | null>(null);
diff --git a/app/client/packages/design-system/headless/src/components/Field/src/Field.tsx b/app/client/packages/design-system/headless/src/components/Field/src/Field.tsx
index 8a388d553c..ffb5e26604 100644
--- a/app/client/packages/design-system/headless/src/components/Field/src/Field.tsx
+++ b/app/client/packages/design-system/headless/src/components/Field/src/Field.tsx
@@ -24,19 +24,19 @@ export type FieldRef = Ref<HTMLDivElement>;
 const _Field = (props: FieldProps, ref: FieldRef) => {
   const {
     children,
+    contextualHelp,
+    description,
+    descriptionProps,
     elementType,
     errorMessage,
     errorMessageProps = {},
+    fieldType = "field",
     isDisabled = false,
     label,
     labelProps,
     validationState,
     wrapperClassName,
-    description,
-    descriptionProps,
     wrapperProps = {},
-    contextualHelp,
-    fieldType = "field",
   } = props;
   const hasHelpText =
     Boolean(description) ||
diff --git a/app/client/packages/design-system/headless/src/components/Radio/src/context.ts b/app/client/packages/design-system/headless/src/components/Radio/src/context.ts
index b7c3e41994..eacc81f141 100644
--- a/app/client/packages/design-system/headless/src/components/Radio/src/context.ts
+++ b/app/client/packages/design-system/headless/src/components/Radio/src/context.ts
@@ -1,12 +1,12 @@
 import React, { useContext } from "react";
 import type { RadioGroupState } from "@react-stately/radio";
 
-export type RadioGroupContext = {
+export interface RadioGroupContext {
   name?: string;
   validationState?: "valid" | "invalid";
   state: RadioGroupState;
   isDisabled?: boolean;
-};
+}
 
 export const RadioContext = React.createContext<RadioGroupContext | null>(null);
 
diff --git a/app/client/packages/design-system/headless/src/components/Tooltip/src/useTooltip.ts b/app/client/packages/design-system/headless/src/components/Tooltip/src/useTooltip.ts
index bd7ee2387b..94360530e6 100644
--- a/app/client/packages/design-system/headless/src/components/Tooltip/src/useTooltip.ts
+++ b/app/client/packages/design-system/headless/src/components/Tooltip/src/useTooltip.ts
@@ -35,14 +35,14 @@ export interface TooltipOptions {
 export function useTooltip({
   closeDelay = 0,
   initialOpen = false,
+  interaction = "hover",
+  offset: offsetProp = DEFAULT_TOOLTIP_OFFSET,
   onOpenChange: setControlledOpen,
   open: controlledOpen,
   openDelay = 0,
-  placement = "top",
-  interaction = "hover",
-  offset: offsetProp = DEFAULT_TOOLTIP_OFFSET,
-  shift: shiftProp = DEFAULT_TOOLTIP_SHIFT,
   padding: paddingProp = DEFAULT_TOOLTIP_PADDING,
+  placement = "top",
+  shift: shiftProp = DEFAULT_TOOLTIP_SHIFT,
 }: TooltipOptions = {}) {
   const [uncontrolledOpen, setUncontrolledOpen] = React.useState(initialOpen);
 
diff --git a/app/client/packages/design-system/theming/src/theme/src/types.ts b/app/client/packages/design-system/theming/src/theme/src/types.ts
index 41f820bc81..342cef7d39 100644
--- a/app/client/packages/design-system/theming/src/theme/src/types.ts
+++ b/app/client/packages/design-system/theming/src/theme/src/types.ts
@@ -18,13 +18,13 @@ export interface ThemeProviderProps {
   style?: CSSProperties;
 }
 
-export type UseThemeProps = {
+export interface UseThemeProps {
   seedColor?: string;
   colorMode?: ColorMode;
   borderRadius?: string;
   fontFamily?: FontFamily;
   rootUnitRatio?: number;
-};
+}
 
 export const SHEET_TYPES = {
   fontFace: "fontFace",
diff --git a/app/client/packages/design-system/theming/src/token/src/styles.module.css b/app/client/packages/design-system/theming/src/token/src/styles.module.css
index 94240e4ef2..525c30fcf1 100644
--- a/app/client/packages/design-system/theming/src/token/src/styles.module.css
+++ b/app/client/packages/design-system/theming/src/token/src/styles.module.css
@@ -1,4 +1,4 @@
-//THIS FILE IS CREATED AUTOMATICALLY. PLEASE DON'T EDIT IT.
+/* THIS FILE IS CREATED AUTOMATICALLY. PLEASE DON'T EDIT IT. */
 :root {
   --root-unit: clamp(4px, calc(0.06vw + 3.77px), 5px);
   --spacing-0: 0;
@@ -159,7 +159,7 @@
   --color-fg-on-warning: rgb(21.953% 9.0775% 0%);
   --color-bd: rgb(72.54% 73.727% 82.602%);
   --color-bd-accent: rgb(33.333% 23.922% 91.373%);
-  --color-bd-focus: rgb(78.161% 34.431% 0%);
+  --color-bd-focus: rgb(33.333% 23.922% 91.373%);
   --color-bd-neutral: rgb(37.869% 38.922% 47.553%);
   --color-bd-neutral-hover: rgb(49.162% 50.308% 59.345%);
   --color-bd-positive: rgb(6.7435% 63.436% 18.481%);
diff --git a/app/client/packages/design-system/theming/src/token/src/themeTokens.json b/app/client/packages/design-system/theming/src/token/src/themeTokens.json
index 3a500e1f6c..e69207cc5c 100644
--- a/app/client/packages/design-system/theming/src/token/src/themeTokens.json
+++ b/app/client/packages/design-system/theming/src/token/src/themeTokens.json
@@ -193,7 +193,7 @@
       "type": "color"
     },
     "bd-focus": {
-      "value": "rgb(78.161% 34.431% 0%)",
+      "value": "rgb(33.333% 23.922% 91.373%)",
       "type": "color"
     },
     "bd-neutral": {
diff --git a/app/client/packages/design-system/theming/src/token/src/types.ts b/app/client/packages/design-system/theming/src/token/src/types.ts
index 57392027f2..26a1abe781 100644
--- a/app/client/packages/design-system/theming/src/token/src/types.ts
+++ b/app/client/packages/design-system/theming/src/token/src/types.ts
@@ -37,4 +37,6 @@ export interface TokenSource {
   spacing?: TokenObj;
 }
 
-export type TokenObj = { [key: string]: string | number };
+export interface TokenObj {
+  [key: string]: string | number;
+}
diff --git a/app/client/packages/design-system/theming/src/typography/src/types.ts b/app/client/packages/design-system/theming/src/typography/src/types.ts
index 5264d54122..c8f18bd5d0 100644
--- a/app/client/packages/design-system/theming/src/typography/src/types.ts
+++ b/app/client/packages/design-system/theming/src/typography/src/types.ts
@@ -52,11 +52,11 @@ export const TYPOGRAPHY_FONT_WEIGHTS = {
 
 export type FontFamily = keyof typeof FONT_METRICS | "System Default";
 
-export type TypographyVariantMetric = {
+export interface TypographyVariantMetric {
   capHeight: number;
   lineGap: number;
   fontFamily?: FontFamily;
-};
+}
 
 export type Typography = {
   [key in keyof typeof TYPOGRAPHY_VARIANTS]: TypographyVariantMetric;
diff --git a/app/client/packages/design-system/theming/src/utils/tokensToCss.ts b/app/client/packages/design-system/theming/src/utils/tokensToCss.ts
index 67de7e7058..3ab42ecc42 100644
--- a/app/client/packages/design-system/theming/src/utils/tokensToCss.ts
+++ b/app/client/packages/design-system/theming/src/utils/tokensToCss.ts
@@ -18,7 +18,7 @@ const allTokens = new TokensAccessor({
 }).getAllTokens();
 
 const ATTENTION_MESSAGE =
-  "//THIS FILE IS CREATED AUTOMATICALLY. PLEASE DON'T EDIT IT.";
+  "/* THIS FILE IS CREATED AUTOMATICALLY. PLEASE DON'T EDIT IT. */";
 const cssStyles = `:root {--root-unit: ${getFluidRootUnit(fluid)}; ${cssRule(
   allTokens,
 )}}`;
diff --git a/app/client/packages/design-system/widgets-old/src/Button/index.tsx b/app/client/packages/design-system/widgets-old/src/Button/index.tsx
index a0f6e04e5d..658a5e9853 100644
--- a/app/client/packages/design-system/widgets-old/src/Button/index.tsx
+++ b/app/client/packages/design-system/widgets-old/src/Button/index.tsx
@@ -44,7 +44,7 @@ export enum Size {
   large = "large",
 }
 
-type stateStyleType = {
+interface stateStyleType {
   bgColorPrimary: string;
   borderColorPrimary: string;
   txtColorPrimary: string;
@@ -54,20 +54,20 @@ type stateStyleType = {
   bgColorTertiary: string;
   borderColorTertiary: string;
   txtColorTertiary: string;
-};
+}
 
-type BtnColorType = {
+interface BtnColorType {
   bgColor: string;
   txtColor: string;
   border: string;
   outline: string;
-};
+}
 
-type BtnFontType = {
+interface BtnFontType {
   buttonFont: any;
   padding: string;
   height: number;
-};
+}
 
 export enum IconPositions {
   left = "left",
@@ -103,17 +103,17 @@ const defaultProps = {
   tag: "a",
 };
 
-type buttonVariant = {
+interface buttonVariant {
   main: string;
   light: string;
   dark: string;
   darker: string;
   darkest: string;
-};
+}
 
-type ButtonColorType = {
+interface ButtonColorType {
   [index: string]: buttonVariant;
-};
+}
 
 const ButtonColors: ButtonColorType = {
   info: {
diff --git a/app/client/packages/design-system/widgets-old/src/Dropdown/index.tsx b/app/client/packages/design-system/widgets-old/src/Dropdown/index.tsx
index fb9557c44d..b05c7c33f2 100644
--- a/app/client/packages/design-system/widgets-old/src/Dropdown/index.tsx
+++ b/app/client/packages/design-system/widgets-old/src/Dropdown/index.tsx
@@ -29,7 +29,7 @@ export type DropdownOnSelect = (
   isUpdatedViaKeyboard?: boolean,
 ) => void;
 
-export type DropdownOption = {
+export interface DropdownOption {
   label?: string;
   value?: string;
   id?: string;
@@ -47,7 +47,7 @@ export type DropdownOption = {
   disabledTooltipText?: string;
   hasCustomBadge?: boolean;
   link?: string;
-};
+}
 
 export interface DropdownSearchProps {
   enableSearch?: boolean;
@@ -346,7 +346,8 @@ export const DropdownWrapper = styled.div<{
   border: 1px solid var(--ads-dropdown-default-menu-border-color);
   overflow: hidden;
   overflow-y: auto;
-  box-shadow: 0px 12px 16px -4px rgba(0, 0, 0, 0.1),
+  box-shadow:
+    0px 12px 16px -4px rgba(0, 0, 0, 0.1),
     0px 4px 6px -2px rgba(0, 0, 0, 0.05);
   display: ${(props) => (props.isOpen ? "inline-block" : "none")};
   .dropdown-search {
@@ -1121,9 +1122,8 @@ export default function Dropdown(props: DropdownProps) {
 
   const handleKeydown = useCallback(
     (e: React.KeyboardEvent) => {
-      const elementList = document.getElementById(
-        "ds--dropdown-options",
-      )?.children;
+      const elementList = document.getElementById("ds--dropdown-options")
+        ?.children;
       if (!elementList || elementList?.length === 0) {
         setHighlight(-1);
       }
diff --git a/app/client/packages/design-system/widgets-old/src/Icon/index.tsx b/app/client/packages/design-system/widgets-old/src/Icon/index.tsx
index 0ebe120118..a6b5449dd8 100644
--- a/app/client/packages/design-system/widgets-old/src/Icon/index.tsx
+++ b/app/client/packages/design-system/widgets-old/src/Icon/index.tsx
@@ -916,7 +916,7 @@ export const IconCollection = Object.keys(ICON_LOOKUP);
 
 export type IconName = (typeof IconCollection)[number];
 
-export type IconProps = {
+export interface IconProps {
   size?: IconSize;
   name?: IconName;
   invisible?: boolean;
@@ -930,7 +930,7 @@ export type IconProps = {
   disabled?: boolean;
   withWrapper?: boolean;
   wrapperColor?: string;
-};
+}
 
 const Icon = forwardRef(
   (
diff --git a/app/client/packages/design-system/widgets-old/src/ListSegmentHeader/index.tsx b/app/client/packages/design-system/widgets-old/src/ListSegmentHeader/index.tsx
index b67dced5b0..37883db317 100644
--- a/app/client/packages/design-system/widgets-old/src/ListSegmentHeader/index.tsx
+++ b/app/client/packages/design-system/widgets-old/src/ListSegmentHeader/index.tsx
@@ -22,11 +22,11 @@ const StyledHr = styled.div`
   margin-left: var(--ads-spaces-3);
 `;
 
-export type SegmentHeaderProps = {
+export interface SegmentHeaderProps {
   title: string;
   style?: CSSProperties;
   hideStyledHr?: boolean;
-};
+}
 
 export default function SegmentHeader(props: SegmentHeaderProps) {
   return (
diff --git a/app/client/packages/design-system/widgets-old/src/Spinner/index.tsx b/app/client/packages/design-system/widgets-old/src/Spinner/index.tsx
index 727d660270..f99bf95bae 100644
--- a/app/client/packages/design-system/widgets-old/src/Spinner/index.tsx
+++ b/app/client/packages/design-system/widgets-old/src/Spinner/index.tsx
@@ -38,9 +38,9 @@ const SvgCircle = styled.circle`
   stroke-width: var(--ads-spaces-1);
 `;
 
-export type SpinnerProp = {
+export interface SpinnerProp {
   size?: IconSize;
-};
+}
 
 Spinner.defaultProp = {
   size: "small",
diff --git a/app/client/packages/design-system/widgets-old/src/TableDropdown/index.tsx b/app/client/packages/design-system/widgets-old/src/TableDropdown/index.tsx
index 2d56b0aa47..bf7aab63c0 100644
--- a/app/client/packages/design-system/widgets-old/src/TableDropdown/index.tsx
+++ b/app/client/packages/design-system/widgets-old/src/TableDropdown/index.tsx
@@ -11,11 +11,11 @@ import Text, { TextType } from "../Text";
 import type { CommonComponentProps } from "../types/common";
 import { Classes } from "../constants/classes";
 
-export type TableDropdownOption = {
+export interface TableDropdownOption {
   id: string;
   name: string;
   desc: string;
-};
+}
 
 type DropdownProps = CommonComponentProps & {
   options: TableDropdownOption[];
diff --git a/app/client/packages/design-system/widgets-old/src/constants/Icon.tsx b/app/client/packages/design-system/widgets-old/src/constants/Icon.tsx
index 27fe3f1bed..371602e997 100644
--- a/app/client/packages/design-system/widgets-old/src/constants/Icon.tsx
+++ b/app/client/packages/design-system/widgets-old/src/constants/Icon.tsx
@@ -1,6 +1,6 @@
 import styled from "styled-components";
 
-export type IconProps = {
+export interface IconProps {
   width?: number;
   height?: number;
   color?: string;
@@ -10,7 +10,7 @@ export type IconProps = {
   keepColors?: boolean;
   disabled?: boolean;
   cursor?: "move" | "grab" | "default";
-};
+}
 
 export const IconWrapper = styled.div<IconProps>`
   &:focus {
diff --git a/app/client/packages/design-system/widgets-old/src/types/common.ts b/app/client/packages/design-system/widgets-old/src/types/common.ts
index 118084d823..593877d14e 100644
--- a/app/client/packages/design-system/widgets-old/src/types/common.ts
+++ b/app/client/packages/design-system/widgets-old/src/types/common.ts
@@ -19,11 +19,11 @@ export enum DSEventTypes {
   KEYPRESS = "KEYPRESS",
 }
 
-export type DSEventDetail = {
+export interface DSEventDetail {
   component: string;
   event: DSEventTypes;
   meta: Record<string, unknown>;
-};
+}
 
 export function createDSEvent(detail: DSEventDetail) {
   return new CustomEvent(DS_EVENT, {
diff --git a/app/client/packages/design-system/widgets/src/components/Button/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Button/src/styles.module.css
index 1a882211e2..99ec4a3435 100644
--- a/app/client/packages/design-system/widgets/src/components/Button/src/styles.module.css
+++ b/app/client/packages/design-system/widgets/src/components/Button/src/styles.module.css
@@ -108,7 +108,9 @@
   *-----------------------------------------------------------------------------
   */
   &[data-focused] {
-    box-shadow: 0 0 0 2px var(--color-bg), 0 0 0 4px var(--color-bd-focus);
+    box-shadow:
+      0 0 0 2px var(--color-bg),
+      0 0 0 4px var(--color-bd-focus);
   }
 
   /**
diff --git a/app/client/packages/design-system/widgets/src/components/Checkbox/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Checkbox/src/styles.module.css
index 6cde08c23e..08c22fa5a9 100644
--- a/app/client/packages/design-system/widgets/src/components/Checkbox/src/styles.module.css
+++ b/app/client/packages/design-system/widgets/src/components/Checkbox/src/styles.module.css
@@ -50,7 +50,9 @@
   *-----------------------------------------------------------------------------
   */
   &[data-focused] [data-icon] {
-    box-shadow: var(--checkbox-box-shadow), 0 0 0 2px var(--color-bg),
+    box-shadow:
+      var(--checkbox-box-shadow),
+      0 0 0 2px var(--color-bg),
       0 0 0 4px var(--color-bd-focus);
   }
 
diff --git a/app/client/packages/design-system/widgets/src/components/Radio/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Radio/src/styles.module.css
index 79a92fa649..5da0dc267f 100644
--- a/app/client/packages/design-system/widgets/src/components/Radio/src/styles.module.css
+++ b/app/client/packages/design-system/widgets/src/components/Radio/src/styles.module.css
@@ -48,7 +48,9 @@
   *-----------------------------------------------------------------------------
   */
   &[data-focused] [data-icon] {
-    box-shadow: var(--radio-box-shadow), 0 0 0 2px var(--color-bg),
+    box-shadow:
+      var(--radio-box-shadow),
+      0 0 0 2px var(--color-bg),
       0 0 0 4px var(--color-bd-focus);
   }
 
diff --git a/app/client/packages/design-system/widgets/src/components/Switch/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Switch/src/styles.module.css
index e4f3ebdaa8..57332dfe0e 100644
--- a/app/client/packages/design-system/widgets/src/components/Switch/src/styles.module.css
+++ b/app/client/packages/design-system/widgets/src/components/Switch/src/styles.module.css
@@ -56,6 +56,8 @@
   *-----------------------------------------------------------------------------
   */
   &[data-focused] [data-icon] {
-    box-shadow: 0 0 0 2px var(--color-bg), 0 0 0 4px var(--color-bd-focus);
+    box-shadow:
+      0 0 0 2px var(--color-bg),
+      0 0 0 4px var(--color-bd-focus);
   }
 }
diff --git a/app/client/packages/design-system/widgets/src/components/Text/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Text/src/styles.module.css
index 04770ed2c8..d4bfb953b2 100644
--- a/app/client/packages/design-system/widgets/src/components/Text/src/styles.module.css
+++ b/app/client/packages/design-system/widgets/src/components/Text/src/styles.module.css
@@ -4,6 +4,7 @@
   /* using auto instead of 100% so that text doesnot push everything to the edge */
   width: auto;
   color: inherit;
+  overflow-wrap: anywhere;
 
   @each $color in colors {
     &[data-color="$(color)"] {
@@ -16,5 +17,4 @@
   display: -webkit-box;
   -webkit-box-orient: vertical;
   overflow: hidden;
-  overflow-wrap: break-word;
 }
diff --git a/app/client/packages/design-system/widgets/src/components/testing/styles.module.css b/app/client/packages/design-system/widgets/src/components/testing/styles.module.css
index 5677dac88c..bc1c1cb604 100644
--- a/app/client/packages/design-system/widgets/src/components/testing/styles.module.css
+++ b/app/client/packages/design-system/widgets/src/components/testing/styles.module.css
@@ -59,7 +59,9 @@
 
   &[data-focused],
   &:focus-visible {
-    box-shadow: 0 0 0 2px var(--color-bg), 0 0 0 4px var(--color-bd-focus);
+    box-shadow:
+      0 0 0 2px var(--color-bg),
+      0 0 0 4px var(--color-bd-focus);
   }
 
   &[data-disabled] {
diff --git a/app/client/packages/dsl/src/DSL.ts b/app/client/packages/dsl/src/DSL.ts
index bc9a41793d..e40579c8d9 100644
--- a/app/client/packages/dsl/src/DSL.ts
+++ b/app/client/packages/dsl/src/DSL.ts
@@ -6,9 +6,13 @@ export type NestedDSLWidget<W> = W & { children?: NestedDSLWidget<W>[] };
 export type NestedDSL<W> = NestedDSLWidget<W>;
 
 export type FlattenedDSLWidget<W> = W & { children?: string[] };
-export type FlattenedDSL<W> = { [widgetId: string]: FlattenedDSLWidget<W> };
+export interface FlattenedDSL<W> {
+  [widgetId: string]: FlattenedDSLWidget<W>;
+}
 
-export type FlattenedDSLEntities<W> = { canvasWidgets: FlattenedDSL<W> };
+export interface FlattenedDSLEntities<W> {
+  canvasWidgets: FlattenedDSL<W>;
+}
 
 // Schema by widgetId
 const SCHEMA_BY_ID = new schema.Entity(
diff --git a/app/client/packages/rts/.lintstagedrc.json b/app/client/packages/rts/.lintstagedrc.json
new file mode 100644
index 0000000000..39a1b229ca
--- /dev/null
+++ b/app/client/packages/rts/.lintstagedrc.json
@@ -0,0 +1,4 @@
+{
+  "src/**/*.{js,ts,tsx}": ["npx eslint --fix"],
+  "src/**/*.{js,ts,tsx,css,md,json}": ["npx prettier --write"]
+}
diff --git a/app/client/packages/rts/src/controllers/Ast/AstController.ts b/app/client/packages/rts/src/controllers/Ast/AstController.ts
index 77f9bd0278..02348b3101 100644
--- a/app/client/packages/rts/src/controllers/Ast/AstController.ts
+++ b/app/client/packages/rts/src/controllers/Ast/AstController.ts
@@ -4,23 +4,23 @@ import { StatusCodes } from "http-status-codes";
 import BaseController from "@controllers/BaseController";
 import AstService from "@services/AstService";
 
-type ScriptToIdentifiersType = {
+interface ScriptToIdentifiersType {
   script: string;
   evalVersion?: number;
-};
+}
 
-type entityRefactorType = {
+interface entityRefactorType {
   script: string;
   oldName: string;
   newName: string;
   isJSObject: boolean;
   evalVersion?: number;
-};
+}
 
-type MultipleScriptToIdentifiersType = {
+interface MultipleScriptToIdentifiersType {
   scripts: string[];
   evalVersion?: number;
-};
+}
 export default class AstController extends BaseController {
   constructor() {
     super();
diff --git a/app/client/packages/rts/src/controllers/BaseController.ts b/app/client/packages/rts/src/controllers/BaseController.ts
index df3ec0c127..389cc243f3 100644
--- a/app/client/packages/rts/src/controllers/BaseController.ts
+++ b/app/client/packages/rts/src/controllers/BaseController.ts
@@ -3,22 +3,22 @@ import type { ValidationError } from "express-validator";
 import { StatusCodes } from "http-status-codes";
 import type { IdentifierInfo } from "@shared/ast";
 
-type ErrorData = {
+interface ErrorData {
   error: string | string[];
   validationErrors?: ValidationError[];
-};
+}
 
-type ErrorBag = {
+interface ErrorBag {
   success: boolean;
   message: string;
   data?: ErrorData;
-};
+}
 
-type ResponseData = {
+interface ResponseData {
   success: boolean;
   message?: string;
   data: IdentifierInfo;
-};
+}
 
 export default class BaseController {
   serverErrorMessaage = "Something went wrong";
diff --git a/app/client/packages/storybook/.storybook/main.ts b/app/client/packages/storybook/.storybook/main.ts
index a479bba93e..7081b4da4d 100644
--- a/app/client/packages/storybook/.storybook/main.ts
+++ b/app/client/packages/storybook/.storybook/main.ts
@@ -3,8 +3,6 @@ import svgr from "vite-plugin-svgr";
 import postcssNesting from "postcss-nesting";
 import postcssImport from "postcss-import";
 import postcssAtRulesVariables from "postcss-at-rules-variables";
-import postcssConditionals from "postcss-conditionals";
-import postcssFor from "postcss-for";
 import postcssEach from "postcss-each";
 import postcssModulesValues from "postcss-modules-values";
 import * as glob from "glob";
@@ -33,8 +31,6 @@ module.exports = {
             postcssNesting,
             postcssImport,
             postcssAtRulesVariables,
-            postcssConditionals,
-            postcssFor,
             postcssEach,
             postcssModulesValues,
           ],
diff --git a/app/client/packages/storybook/package.json b/app/client/packages/storybook/package.json
index 54bdb065b1..1eeee0ddbe 100644
--- a/app/client/packages/storybook/package.json
+++ b/app/client/packages/storybook/package.json
@@ -29,9 +29,7 @@
     "chromatic": "^6.20.0",
     "postcss": "*",
     "postcss-at-rules-variables": "*",
-    "postcss-conditionals": "*",
     "postcss-each": "*",
-    "postcss-for": "*",
     "postcss-import": "*",
     "postcss-loader": "*",
     "postcss-modules-values": "*",
diff --git a/app/client/src/LandingScreen.tsx b/app/client/src/LandingScreen.tsx
index 066d1c945f..ec07d7882e 100755
--- a/app/client/src/LandingScreen.tsx
+++ b/app/client/src/LandingScreen.tsx
@@ -9,10 +9,10 @@ import { APPLICATIONS_URL, AUTH_LOGIN_URL, BASE_URL } from "constants/routes";
 import PageLoadingBar from "pages/common/PageLoadingBar";
 import ServerUnavailable from "pages/common/ErrorPages/ServerUnavailable";
 
-type Props = {
+interface Props {
   user?: User;
   authError: string;
-};
+}
 
 function LandingScreen(props: Props) {
   if (props.user && window.location.pathname === BASE_URL) {
diff --git a/app/client/src/RouteBuilder.test.ts b/app/client/src/RouteBuilder.test.ts
deleted file mode 100644
index 7dcd8591e5..0000000000
--- a/app/client/src/RouteBuilder.test.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { getQueryStringfromObject } from "./RouteBuilder";
-
-describe("Route builder", () => {
-  describe("tests getQueryStringfromObject", () => {
-    const cases = [
-      {
-        index: 0,
-        input: { id: 0, a: "b&c ltd" },
-        expected: "?id=0&a=b%26c%20ltd",
-      },
-      { index: 1, input: {}, expected: "" },
-      {
-        index: 2,
-        input: { rando: "রিমিল" },
-        expected: "?rando=%E0%A6%B0%E0%A6%BF%E0%A6%AE%E0%A6%BF%E0%A6%B2",
-      },
-      {
-        index: 3,
-        input: { a1: "1234*&^%~`<>:';,./?" },
-        expected: "?a1=1234*%26%5E%25~%60%3C%3E%3A'%3B%2C.%2F%3F",
-      },
-      { index: 4, input: { isSignedIn: false }, expected: "?isSignedIn=false" },
-    ];
-
-    test.each(cases.map((x) => [x.index, x.input, x.expected]))(
-      "test case %d",
-      (_, input, expected) => {
-        const result = getQueryStringfromObject(input as any);
-        expect(result).toStrictEqual(expected);
-      },
-    );
-  });
-});
diff --git a/app/client/src/RouteParamsMiddleware.ts b/app/client/src/RouteParamsMiddleware.ts
index 2481533348..3eba48065b 100644
--- a/app/client/src/RouteParamsMiddleware.ts
+++ b/app/client/src/RouteParamsMiddleware.ts
@@ -8,8 +8,8 @@ import type { UpdatePageResponse } from "api/PageApi";
 import type {
   ApplicationURLParams,
   PageURLParams,
-} from "entities/URLRedirect/URLAssembly";
-import urlBuilder from "entities/URLRedirect/URLAssembly";
+} from "@appsmith/entities/URLRedirect/URLAssembly";
+import urlBuilder from "@appsmith/entities/URLRedirect/URLAssembly";
 import type { Middleware } from "redux";
 
 const routeParamsMiddleware: Middleware =
diff --git a/app/client/src/WidgetProvider/constants.ts b/app/client/src/WidgetProvider/constants.ts
index b503d205b7..7b4818268c 100644
--- a/app/client/src/WidgetProvider/constants.ts
+++ b/app/client/src/WidgetProvider/constants.ts
@@ -25,19 +25,25 @@ import type {
   ResponsiveBehavior,
 } from "layoutSystems/common/utils/constants";
 
-export type WidgetSizeConfig = {
+export interface WidgetSizeConfig {
   viewportMinWidth: number;
   configuration: (props: any) => Record<string, string | number>;
-};
+}
 
-type ResizableValues = { vertical?: boolean; horizontal?: boolean };
+interface ResizableValues {
+  vertical?: boolean;
+  horizontal?: boolean;
+}
 type ResizableOptions = ResizableValues | ((props: any) => ResizableValues);
-export type AutoDimensionValues = { width?: boolean; height?: boolean };
+export interface AutoDimensionValues {
+  width?: boolean;
+  height?: boolean;
+}
 export type AutoDimensionOptions =
   | AutoDimensionValues
   | ((props: any) => AutoDimensionValues);
 
-export type AutoLayoutConfig = {
+export interface AutoLayoutConfig {
   // Indicates if a widgets dimensions should be auto adjusted according to content inside it
   autoDimension?: AutoDimensionOptions;
   // min/max sizes for the widget
@@ -48,7 +54,7 @@ export type AutoLayoutConfig = {
   defaults?: Partial<WidgetConfigProps>;
   // default values for the properties that are hidden/disabled in auto-layout
   disabledPropsDefaults?: Partial<WidgetProps>;
-};
+}
 
 export interface WidgetBaseConfiguration {
   name: string;
@@ -85,25 +91,25 @@ export interface WidgetConfiguration extends WidgetBaseConfiguration {
   methods?: Record<string, WidgetMethods>;
 }
 
-export type PropertyUpdates = {
+export interface PropertyUpdates {
   propertyPath: string;
   propertyValue?: unknown;
   isDynamicPropertyPath?: boolean; // Toggles the property mode to JS
   shouldDeleteProperty?: boolean; // Deletes the property, propertyValue is ignored
-};
+}
 
-export type WidgetMethods = {
+export interface WidgetMethods {
   getQueryGenerationConfig?: GetQueryGenerationConfig;
   getPropertyUpdatesForQueryBinding?: GetPropertyUpdatesForQueryBinding;
   getSnipingModeUpdates?: GetSnipingModeUpdates;
   getCanvasHeightOffset?: GetCanvasHeightOffset;
   getEditorCallouts?: GetEditorCallouts;
   getOneClickBindingConnectableWidgetConfig?: GetOneClickBindingConnectableWidgetConfig;
-};
+}
 
 type GetEditorCallouts = (props: WidgetProps) => WidgetCallout[];
 
-export type WidgetCallout = {
+export interface WidgetCallout {
   message: string;
   links: [
     {
@@ -111,7 +117,7 @@ export type WidgetCallout = {
       url: string;
     },
   ];
-};
+}
 
 export type GetQueryGenerationConfig = (
   widgetProps: WidgetProps,
@@ -126,10 +132,10 @@ export type GetPropertyUpdatesForQueryBinding = (
 
 type SnipingModeSupportedKeys = "data" | "run" | "isDynamicPropertyPath";
 
-type OneClickBindingConnectableWidgetConfig = {
+interface OneClickBindingConnectableWidgetConfig {
   widgetBindPath: string;
   message: string;
-};
+}
 
 export type GetOneClickBindingConnectableWidgetConfig = (
   widgetProps: WidgetProps,
@@ -410,9 +416,9 @@ export const dateFormatOptions = [
   },
 ];
 
-export type ThemeProp = {
+export interface ThemeProp {
   theme: Theme;
-};
+}
 
 export type SnipingModeProperty = Record<
   SnipingModeSupportedKeys,
@@ -424,7 +430,7 @@ export enum DefaultMobileCameraTypes {
   BACK = "environment",
 }
 
-export type WidgetBlueprint = {
+export interface WidgetBlueprint {
   view?: Array<{
     type: string;
     size?: { rows: number; cols: number };
@@ -432,7 +438,7 @@ export type WidgetBlueprint = {
     props: Record<string, any>;
   }>;
   operations?: any;
-};
+}
 
 export interface WidgetConfigProps {
   rows: number;
diff --git a/app/client/src/WidgetQueryGenerators/GSheets/index.ts b/app/client/src/WidgetQueryGenerators/GSheets/index.ts
index b79a1ef3b4..fed3841500 100644
--- a/app/client/src/WidgetQueryGenerators/GSheets/index.ts
+++ b/app/client/src/WidgetQueryGenerators/GSheets/index.ts
@@ -15,6 +15,7 @@ enum COMMAND_TYPES {
   "FIND" = "FETCH_MANY",
   "INSERT" = "INSERT_ONE",
   "UPDATE" = "UPDATE_ONE",
+  // eslint-disable-next-line @typescript-eslint/no-duplicate-enum-values
   "COUNT" = "FETCH_MANY",
 }
 const COMMON_INITIAL_VALUE_KEYS = [
@@ -237,10 +238,13 @@ export default abstract class GSheets extends BaseQueryGenerator {
     ];
     const scrubedOutInitialValues = allowedInitialValueKeys
       .filter((key) => initialValues[key as keyof GSheetsFormData])
-      .reduce((acc, key) => {
-        acc[key] = initialValues[key as keyof GSheetsFormData];
-        return acc;
-      }, {} as Record<string, object>);
+      .reduce(
+        (acc, key) => {
+          acc[key] = initialValues[key as keyof GSheetsFormData];
+          return acc;
+        },
+        {} as Record<string, object>,
+      );
 
     const { formData, ...rest } = builtValues;
 
diff --git a/app/client/src/WidgetQueryGenerators/MongoDB/index.ts b/app/client/src/WidgetQueryGenerators/MongoDB/index.ts
index cf6b3c1b45..eaf0b6d88d 100644
--- a/app/client/src/WidgetQueryGenerators/MongoDB/index.ts
+++ b/app/client/src/WidgetQueryGenerators/MongoDB/index.ts
@@ -191,10 +191,13 @@ export default abstract class MongoDB extends BaseQueryGenerator {
 
     const scrubedOutInitalValues = [...ALLOWED_INITAL_VALUE_KEYS, commandKey]
       .filter((key) => initialValues[key as keyof MongoDBFormData])
-      .reduce((acc, key) => {
-        acc[key] = initialValues[key as keyof MongoDBFormData];
-        return acc;
-      }, {} as Record<string, object>);
+      .reduce(
+        (acc, key) => {
+          acc[key] = initialValues[key as keyof MongoDBFormData];
+          return acc;
+        },
+        {} as Record<string, object>,
+      );
 
     const { formData, ...rest } = builtValues;
 
diff --git a/app/client/src/WidgetQueryGenerators/types.ts b/app/client/src/WidgetQueryGenerators/types.ts
index 162fd3990b..29fa7a4318 100644
--- a/app/client/src/WidgetQueryGenerators/types.ts
+++ b/app/client/src/WidgetQueryGenerators/types.ts
@@ -1,15 +1,15 @@
 import type { AlertMessage } from "components/editorComponents/WidgetQueryGeneratorForm/types";
 
-type Column = {
+export interface Column {
   name: string;
   type: string;
   isSelected: boolean;
-};
+}
 
-type GsheetConfig = {
+interface GsheetConfig {
   sheetName?: string;
   tableHeaderIndex?: number;
-};
+}
 export type WidgetQueryGenerationFormConfig = {
   tableName: string;
   datasourceId: string;
@@ -27,7 +27,7 @@ export type WidgetQueryGenerationFormConfig = {
   dataIdentifier?: string;
 } & GsheetConfig;
 
-export type WidgetQueryGenerationConfig = {
+export interface WidgetQueryGenerationConfig {
   select?: {
     limit?: string;
     offset?: string;
@@ -43,7 +43,7 @@ export type WidgetQueryGenerationConfig = {
     where?: string;
   };
   totalRecord?: boolean;
-};
+}
 
 export enum QUERY_TYPE {
   SELECT = "select",
@@ -60,23 +60,23 @@ export type WidgetQueryConfig = Record<
   }
 >;
 
-export type MongoDBFormData = {
+export interface MongoDBFormData {
   aggregate: object;
   smartSubstitution: object;
   find: object;
   updateMany: object;
   insert: object;
   count: object;
-};
-export type ActionConfigurationMongoDB = {
+}
+export interface ActionConfigurationMongoDB {
   formData: MongoDBFormData;
-};
+}
 
-export type ActionConfigurationSQL = {
+export interface ActionConfigurationSQL {
   pluginSpecifiedTemplates: Array<object>;
-};
+}
 
-export type GSheetsFormData = {
+export interface GSheetsFormData {
   entityType: object;
   tableHeaderIndex: object;
   projection: object;
@@ -85,7 +85,7 @@ export type GSheetsFormData = {
   where: object;
   pagination: object;
   smartSubstitution: object;
-};
-export type ActionConfigurationGSheets = {
+}
+export interface ActionConfigurationGSheets {
   formData: GSheetsFormData;
-};
+}
diff --git a/app/client/src/actions/appThemingActions.tsx b/app/client/src/actions/appThemingActions.tsx
index 22cfe60d2e..b0e211b651 100644
--- a/app/client/src/actions/appThemingActions.tsx
+++ b/app/client/src/actions/appThemingActions.tsx
@@ -8,39 +8,39 @@ import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
  * ----------------------------------------------------------------------------
  */
 
-export type FetchAppThemesAction = {
+export interface FetchAppThemesAction {
   applicationId: string;
-};
+}
 
-export type FetchSelectedAppThemeAction = {
+export interface FetchSelectedAppThemeAction {
   applicationId: string;
-};
+}
 
-export type UpdateSelectedAppThemeAction = {
+export interface UpdateSelectedAppThemeAction {
   applicationId: string;
   theme: AppTheme;
   shouldReplay?: boolean;
-};
+}
 
-export type ChangeSelectedAppThemeAction = {
+export interface ChangeSelectedAppThemeAction {
   applicationId: string;
   theme: AppTheme;
   shouldReplay?: boolean;
-};
+}
 
-export type HydrateSelectedAppThemeAction = {
+export interface HydrateSelectedAppThemeAction {
   theme: AppTheme;
-};
+}
 
-export type SaveAppThemeAction = {
+export interface SaveAppThemeAction {
   applicationId: string;
   name: string;
-};
+}
 
-export type DeleteAppThemeAction = {
+export interface DeleteAppThemeAction {
   themeId: string;
   name: string;
-};
+}
 
 /**
  * ----------------------------------------------------------------------------
diff --git a/app/client/src/actions/communityTemplateActions.ts b/app/client/src/actions/communityTemplateActions.ts
index ab391e595e..ff681b40ae 100644
--- a/app/client/src/actions/communityTemplateActions.ts
+++ b/app/client/src/actions/communityTemplateActions.ts
@@ -1,6 +1,6 @@
 import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 
-export type PublishCommunityTemplatePayload = {
+export interface PublishCommunityTemplatePayload {
   title: string;
   headline: string;
   description: string;
@@ -11,7 +11,7 @@ export type PublishCommunityTemplatePayload = {
   shouldUpdateName: boolean;
   branchName: string;
   appUrl: string;
-};
+}
 export const publishCommunityTemplate = (
   payload: PublishCommunityTemplatePayload,
 ) => ({
diff --git a/app/client/src/actions/crudInfoModalActions.ts b/app/client/src/actions/crudInfoModalActions.ts
index d13787a284..4fca805963 100644
--- a/app/client/src/actions/crudInfoModalActions.ts
+++ b/app/client/src/actions/crudInfoModalActions.ts
@@ -1,12 +1,12 @@
 import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 
-export type SetCrudInfoModalOpenPayload = {
+export interface SetCrudInfoModalOpenPayload {
   open: boolean;
   generateCRUDSuccessInfo?: {
     successImageUrl: string;
     successMessage: string;
   };
-};
+}
 
 export const setCrudInfoModalData = (payload: SetCrudInfoModalOpenPayload) => {
   return {
diff --git a/app/client/src/actions/datasourceActions.ts b/app/client/src/actions/datasourceActions.ts
index 6ce9c6a0c7..b678e728ba 100644
--- a/app/client/src/actions/datasourceActions.ts
+++ b/app/client/src/actions/datasourceActions.ts
@@ -60,19 +60,19 @@ export const updateDatasource = (
   };
 };
 
-export type UpdateDatasourceSuccessAction = {
+export interface UpdateDatasourceSuccessAction {
   type: string;
   payload: Datasource;
   redirect: boolean;
   queryParams?: Record<string, string>;
-};
+}
 
-export type CreateDatasourceSuccessAction = {
+export interface CreateDatasourceSuccessAction {
   type: string;
   payload: Datasource;
   isDBCreated: boolean;
   redirect: boolean;
-};
+}
 
 export const updateDatasourceSuccess = (
   payload: Datasource,
@@ -336,7 +336,7 @@ export const getOAuthAccessToken = (datasourceId: string) => {
   };
 };
 
-export type executeDatasourceQuerySuccessPayload<T> = {
+export interface executeDatasourceQuerySuccessPayload<T> {
   responseMeta: ResponseMeta;
   data: {
     body: T;
@@ -345,7 +345,7 @@ export type executeDatasourceQuerySuccessPayload<T> = {
     statusCode: string;
     isExecutionSuccess: boolean;
   };
-};
+}
 type errorPayload = string;
 
 export interface executeDatasourceReduxActionPayload {
diff --git a/app/client/src/actions/editorContextActions.ts b/app/client/src/actions/editorContextActions.ts
index 357d94a118..6cc64b1960 100644
--- a/app/client/src/actions/editorContextActions.ts
+++ b/app/client/src/actions/editorContextActions.ts
@@ -25,13 +25,13 @@ export const setCodeEditorCursorAction = (
   };
 };
 
-export type CodeEditorFocusState = {
+export interface CodeEditorFocusState {
   key: string | undefined;
   cursorPosition: {
     ch: number;
     line: number;
   };
-};
+}
 
 export const setEditorFieldFocusAction = (payload: CodeEditorFocusState) => {
   return {
diff --git a/app/client/src/actions/focusHistoryActions.ts b/app/client/src/actions/focusHistoryActions.ts
index b9b46ee293..27d2c20b05 100644
--- a/app/client/src/actions/focusHistoryActions.ts
+++ b/app/client/src/actions/focusHistoryActions.ts
@@ -4,10 +4,10 @@ import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 import type { Location } from "history";
 import type { AppsmithLocationState } from "utils/history";
 
-export type RouteChangeActionPayload = {
+export interface RouteChangeActionPayload {
   location: Location<AppsmithLocationState>;
   prevLocation: Location<AppsmithLocationState>;
-};
+}
 
 export const routeChanged = (
   location: Location<AppsmithLocationState>,
diff --git a/app/client/src/actions/gitSyncActions.ts b/app/client/src/actions/gitSyncActions.ts
index ce998114e4..c488e69fb6 100644
--- a/app/client/src/actions/gitSyncActions.ts
+++ b/app/client/src/actions/gitSyncActions.ts
@@ -16,9 +16,9 @@ import type {
 import type { ResponseMeta } from "api/ApiResponses";
 import { noop } from "lodash";
 
-export type GitStatusParams = {
+export interface GitStatusParams {
   compareRemote?: boolean;
-};
+}
 
 export const setIsGitSyncModalOpen = (payload: {
   isOpen: boolean;
@@ -62,15 +62,15 @@ export const clearDiscardErrorState = () => ({
   type: ReduxActionTypes.CLEAR_DISCARD_ERROR_STATE,
 });
 
-export type ConnectToGitResponse = {
+export interface ConnectToGitResponse {
   gitApplicationMetadata: GitApplicationMetadata;
-};
+}
 
-type ConnectToGitRequestParams = {
+interface ConnectToGitRequestParams {
   payload: ConnectToGitPayload;
   onSuccessCallback?: (payload: ConnectToGitResponse) => void;
   onErrorCallback?: (error: any, response?: any) => void;
-};
+}
 
 export interface ConnectToGitReduxAction
   extends ReduxAction<ConnectToGitPayload> {
@@ -183,8 +183,8 @@ export const fetchGitStatusSuccess = (payload: GitStatusData) => ({
 });
 
 export const fetchGitRemoteStatusInit = ({
-  onSuccessCallback = noop,
   onErrorCallback = noop,
+  onSuccessCallback = noop,
 } = {}) => ({
   type: ReduxActionTypes.FETCH_GIT_REMOTE_STATUS_INIT,
   onSuccessCallback,
@@ -215,7 +215,10 @@ export const updateBranchLocally = (payload: string) => ({
   payload,
 });
 
-type MergeBranchPayload = { sourceBranch: string; destinationBranch: string };
+interface MergeBranchPayload {
+  sourceBranch: string;
+  destinationBranch: string;
+}
 
 export const mergeBranchInit = (params: {
   payload: { sourceBranch: string; destinationBranch: string };
@@ -310,22 +313,22 @@ export const importAppFromGit = ({
 
 type ErrorPayload = string;
 
-export type SSHKeyType = {
+export interface SSHKeyType {
   keySize: number;
   platFormSupported: string;
   protocolName: string;
-};
+}
 
-export type GetSSHKeyResponseData = {
+export interface GetSSHKeyResponseData {
   gitSupportedSSHKeyType: SSHKeyType[];
   docUrl: string;
   publicKey?: string;
-};
+}
 
-export type GenerateSSHKeyPairResponsePayload<T> = {
+export interface GenerateSSHKeyPairResponsePayload<T> {
   responseMeta: ResponseMeta;
   data: T;
-};
+}
 
 export type GenerateSSHKeyPairReduxAction = ReduxActionWithCallbacks<
   { keyType?: string } | undefined,
@@ -333,13 +336,13 @@ export type GenerateSSHKeyPairReduxAction = ReduxActionWithCallbacks<
   ErrorPayload
 >;
 
-export type GenerateKeyParams = {
+export interface GenerateKeyParams {
   onErrorCallback?: (payload: ErrorPayload) => void;
   onSuccessCallback?: (
     payload: GenerateSSHKeyPairResponsePayload<GetSSHKeyResponseData>,
   ) => void;
   payload?: { keyType?: string };
-};
+}
 
 export const generateSSHKeyPair = ({
   onErrorCallback,
@@ -361,10 +364,10 @@ export const generateSSHKeyPairSuccess = (
   };
 };
 
-export type GetSSHKeyPairResponsePayload<T> = {
+export interface GetSSHKeyPairResponsePayload<T> {
   responseMeta: ResponseMeta;
   data: T;
-};
+}
 
 export type GetSSHKeyPairReduxAction = ReduxActionWithCallbacks<
   undefined,
@@ -372,13 +375,13 @@ export type GetSSHKeyPairReduxAction = ReduxActionWithCallbacks<
   ErrorPayload
 >;
 
-export type GetKeyParams = {
+export interface GetKeyParams {
   onErrorCallback?: (payload: ErrorPayload) => void;
   onSuccessCallback?: (
     payload: GetSSHKeyPairResponsePayload<GetSSHKeyResponseData>,
   ) => void;
   payload?: undefined;
-};
+}
 
 export const getSSHKeyPair = ({
   onErrorCallback,
diff --git a/app/client/src/actions/initActions.ts b/app/client/src/actions/initActions.ts
index 589d9a82e4..9f220f56f8 100644
--- a/app/client/src/actions/initActions.ts
+++ b/app/client/src/actions/initActions.ts
@@ -8,12 +8,12 @@ export const initCurrentPage = () => {
   };
 };
 
-export type InitializeEditorPayload = {
+export interface InitializeEditorPayload {
   applicationId?: string;
   pageId?: string;
   branch?: string;
   mode: APP_MODE;
-};
+}
 
 export const initEditor = (
   payload: InitializeEditorPayload,
@@ -22,12 +22,12 @@ export const initEditor = (
   payload,
 });
 
-export type InitAppViewerPayload = {
+export interface InitAppViewerPayload {
   branch: string;
   applicationId?: string;
   pageId: string;
   mode: APP_MODE;
-};
+}
 
 export const initAppViewer = ({
   applicationId,
diff --git a/app/client/src/actions/jsActionActions.ts b/app/client/src/actions/jsActionActions.ts
index 5a9a5b8fca..a0cb75fb63 100644
--- a/app/client/src/actions/jsActionActions.ts
+++ b/app/client/src/actions/jsActionActions.ts
@@ -10,9 +10,9 @@ import type { JSCollection } from "entities/JSCollection";
 import type { CreateJSCollectionRequest } from "api/JSActionAPI";
 import type { EventLocation } from "@appsmith/utils/analyticsUtilTypes";
 
-export type FetchJSCollectionsPayload = {
+export interface FetchJSCollectionsPayload {
   applicationId: string;
-};
+}
 
 export const fetchJSCollections = ({
   applicationId,
diff --git a/app/client/src/actions/metaActions.ts b/app/client/src/actions/metaActions.ts
index 0a9ca1b50a..779002e734 100644
--- a/app/client/src/actions/metaActions.ts
+++ b/app/client/src/actions/metaActions.ts
@@ -33,11 +33,11 @@ export const updateWidgetMetaPropAndEval = (
   });
 };
 
-export type ResetWidgetMetaPayload = {
+export interface ResetWidgetMetaPayload {
   widgetId: string;
   evaluatedWidget: WidgetEntity | undefined;
   evaluatedWidgetConfig: DataTreeEntityConfig | undefined;
-};
+}
 
 export const resetWidgetMetaProperty = (
   widgetId: string,
diff --git a/app/client/src/actions/pageActions.tsx b/app/client/src/actions/pageActions.tsx
index ac038b25ef..92eafb81d9 100644
--- a/app/client/src/actions/pageActions.tsx
+++ b/app/client/src/actions/pageActions.tsx
@@ -46,11 +46,11 @@ export interface CreatePageActionPayload {
   blockNavigation?: boolean;
 }
 
-export type updateLayoutOptions = {
+export interface updateLayoutOptions {
   isRetry?: boolean;
   shouldReplay?: boolean;
   updatedWidgetIds?: string[];
-};
+}
 
 export const fetchPage = (
   pageId: string,
@@ -275,12 +275,12 @@ export const updatePageError = (payload: UpdatePageErrorPayload) => {
   };
 };
 
-export type UpdatePageErrorPayload = {
+export interface UpdatePageErrorPayload {
   request: UpdatePageRequest;
   error: unknown;
-};
+}
 
-export type WidgetAddChild = {
+export interface WidgetAddChild {
   widgetId: string;
   widgetName?: string;
   type: WidgetType;
@@ -294,27 +294,27 @@ export type WidgetAddChild = {
   tabId: string;
   props?: Record<string, any>;
   dynamicBindingPathList?: DynamicPath[];
-};
+}
 
-export type WidgetRemoveChild = {
+export interface WidgetRemoveChild {
   widgetId: string;
   childWidgetId: string;
-};
+}
 
-export type WidgetDelete = {
+export interface WidgetDelete {
   widgetId?: string;
   parentId?: string;
   disallowUndo?: boolean;
   isShortcut?: boolean;
-};
+}
 
-export type MultipleWidgetDeletePayload = {
+export interface MultipleWidgetDeletePayload {
   widgetIds: string[];
   disallowUndo?: boolean;
   isShortcut?: boolean;
-};
+}
 
-export type WidgetResize = {
+export interface WidgetResize {
   widgetId: string;
   parentId: string;
   leftColumn?: number;
@@ -327,16 +327,16 @@ export type WidgetResize = {
   mobileBottomRow?: number;
   snapColumnSpace: number;
   snapRowSpace: number;
-};
+}
 
-export type ModalWidgetResize = {
+export interface ModalWidgetResize {
   height: number;
   width: number;
   widgetId: string;
   canvasWidgetId: string;
-};
+}
 
-export type WidgetAddChildren = {
+export interface WidgetAddChildren {
   widgetId: string;
   children: Array<{
     type: WidgetType;
@@ -350,13 +350,13 @@ export type WidgetAddChildren = {
     bottomRow: number;
     isLoading: boolean;
   }>;
-};
+}
 
-export type WidgetUpdateProperty = {
+export interface WidgetUpdateProperty {
   widgetId: string;
   propertyPath: string;
   propertyValue: any;
-};
+}
 
 export const updateWidget = (
   operation: WidgetOperation,
@@ -404,7 +404,7 @@ export interface ReduxActionWithExtraParams<T> extends ReduxAction<T> {
   extraParams: Record<any, any>;
 }
 
-export type GenerateCRUDSuccess = {
+export interface GenerateCRUDSuccess {
   page: {
     layouts: Array<any>;
     id: string;
@@ -414,7 +414,7 @@ export type GenerateCRUDSuccess = {
     description?: string;
   };
   isNewPage: boolean;
-};
+}
 
 export const generateTemplateSuccess = (payload: GenerateCRUDSuccess) => {
   return {
diff --git a/app/client/src/actions/pluginActionActions.ts b/app/client/src/actions/pluginActionActions.ts
index 57aab224e6..616d221f15 100644
--- a/app/client/src/actions/pluginActionActions.ts
+++ b/app/client/src/actions/pluginActionActions.ts
@@ -29,9 +29,9 @@ export const createActionSuccess = (payload: Action) => {
   };
 };
 
-export type FetchActionsPayload = {
+export interface FetchActionsPayload {
   applicationId: string;
-};
+}
 
 export const fetchActions = (
   { applicationId }: { applicationId: string },
@@ -258,12 +258,12 @@ export const saveActionName = (payload: { id: string; name: string }) => ({
   payload: payload,
 });
 
-export type SetActionPropertyPayload = {
+export interface SetActionPropertyPayload {
   actionId: string;
   propertyName: string;
   value: any;
   skipSave?: boolean;
-};
+}
 
 export const setActionProperty = (
   payload: SetActionPropertyPayload,
@@ -274,11 +274,11 @@ export const setActionProperty = (
   postEvalActions,
 });
 
-export type UpdateActionPropertyActionPayload = {
+export interface UpdateActionPropertyActionPayload {
   id: string;
   field: string;
   value: any;
-};
+}
 
 export const updateActionProperty = (
   payload: UpdateActionPropertyActionPayload,
diff --git a/app/client/src/actions/pluginActions.ts b/app/client/src/actions/pluginActions.ts
index 1c0b2a574e..8955651211 100644
--- a/app/client/src/actions/pluginActions.ts
+++ b/app/client/src/actions/pluginActions.ts
@@ -20,13 +20,13 @@ export const fetchPluginFormConfigs = (): ReduxActionWithoutPayload => ({
   type: ReduxActionTypes.FETCH_PLUGIN_FORM_CONFIGS_REQUEST,
 });
 
-export type PluginFormsPayload = {
+export interface PluginFormsPayload {
   formConfigs: Record<string, any[]>;
   editorConfigs: Record<string, any[]>;
   settingConfigs: Record<string, any[]>;
   dependencies: Record<string, DependencyMap>;
   datasourceFormButtonConfigs: Record<string, string[]>;
-};
+}
 
 export const fetchPluginFormConfigsSuccess = (
   payload: PluginFormsPayload,
diff --git a/app/client/src/actions/widgetSelectionActions.ts b/app/client/src/actions/widgetSelectionActions.ts
index 5f30ac1a8f..2f3f83a26b 100644
--- a/app/client/src/actions/widgetSelectionActions.ts
+++ b/app/client/src/actions/widgetSelectionActions.ts
@@ -3,12 +3,12 @@ import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 import type { SelectionRequestType } from "sagas/WidgetSelectUtils";
 import type { NavigationMethod } from "utils/history";
 
-export type WidgetSelectionRequestPayload = {
+export interface WidgetSelectionRequestPayload {
   selectionRequestType: SelectionRequestType;
   payload?: string[];
   invokedBy?: NavigationMethod;
   pageId?: string;
-};
+}
 
 export type WidgetSelectionRequest = (
   selectionRequestType: SelectionRequestType,
@@ -28,10 +28,10 @@ export const selectWidgetInitAction: WidgetSelectionRequest = (
   payload: { selectionRequestType, payload, pageId, invokedBy },
 });
 
-export type SetSelectedWidgetsPayload = {
+export interface SetSelectedWidgetsPayload {
   widgetIds: string[];
   invokedBy?: NavigationMethod;
-};
+}
 
 // To be used to collect selected widget state from url and set on state
 export const setSelectedWidgets = (
diff --git a/app/client/src/api/ApiResponses.tsx b/app/client/src/api/ApiResponses.tsx
index 65a85ea29c..c20272bca0 100644
--- a/app/client/src/api/ApiResponses.tsx
+++ b/app/client/src/api/ApiResponses.tsx
@@ -1,16 +1,16 @@
-export type APIResponseError = {
+export interface APIResponseError {
   code: string | number;
   message: string;
-};
+}
 
-export type ResponseMeta = {
+export interface ResponseMeta {
   status: number;
   success: boolean;
   error?: APIResponseError;
-};
+}
 
-export type ApiResponse<T = unknown> = {
+export interface ApiResponse<T = unknown> {
   responseMeta: ResponseMeta;
   data: T;
   code?: string;
-};
+}
diff --git a/app/client/src/api/GitSyncAPI.tsx b/app/client/src/api/GitSyncAPI.tsx
index 8369054b27..d7e130704c 100644
--- a/app/client/src/api/GitSyncAPI.tsx
+++ b/app/client/src/api/GitSyncAPI.tsx
@@ -4,44 +4,44 @@ import type { ApiResponse } from "./ApiResponses";
 import type { GitConfig } from "entities/GitSync";
 import ApplicationApi from "@appsmith/api/ApplicationApi";
 
-export type CommitPayload = {
+export interface CommitPayload {
   applicationId: string;
   commitMessage: string;
   doPush: boolean;
   branch: string;
-};
+}
 
-export type MergeBranchPayload = {
+export interface MergeBranchPayload {
   applicationId: string;
   sourceBranch: string;
   destinationBranch: string;
-};
+}
 
-export type MergeStatusPayload = {
+export interface MergeStatusPayload {
   applicationId: string;
   sourceBranch: string;
   destinationBranch: string;
-};
+}
 
-export type ConnectToGitPayload = {
+export interface ConnectToGitPayload {
   remoteUrl: string;
   gitProfile?: {
     authorName: string;
     authorEmail: string;
   };
   isDefaultProfile?: boolean;
-};
+}
 
-type GitStatusParam = {
+interface GitStatusParam {
   applicationId: string;
   branch: string;
   compareRemote: "true" | "false";
-};
+}
 
-type GitRemoteStatusParam = {
+interface GitRemoteStatusParam {
   applicationId: string;
   branch: string;
-};
+}
 
 class GitSyncAPI extends Api {
   static baseURL = `/v1/git`;
diff --git a/app/client/src/api/JSActionAPI.tsx b/app/client/src/api/JSActionAPI.tsx
index c4396b3253..9aa8cec809 100644
--- a/app/client/src/api/JSActionAPI.tsx
+++ b/app/client/src/api/JSActionAPI.tsx
@@ -34,11 +34,11 @@ export interface CreateJSCollectionRequest {
   pluginType: PluginType;
 }
 
-export type SetFunctionPropertyPayload = {
+export interface SetFunctionPropertyPayload {
   action: JSAction;
   propertyName: string;
   value: any;
-};
+}
 export interface RefactorAction {
   pageId: string;
   actionId: string;
diff --git a/app/client/src/api/PageApi.tsx b/app/client/src/api/PageApi.tsx
index b53f8f0ae7..6161b343cb 100644
--- a/app/client/src/api/PageApi.tsx
+++ b/app/client/src/api/PageApi.tsx
@@ -13,31 +13,31 @@ import type {
 } from "actions/pageActions";
 import type { FetchApplicationResponse } from "@appsmith/api/ApplicationApi";
 
-export type FetchPageRequest = {
+export interface FetchPageRequest {
   id: string;
   isFirstLoad?: boolean;
   handleResponseLater?: boolean;
-};
+}
 
-export type FetchPublishedPageRequest = {
+export interface FetchPublishedPageRequest {
   pageId: string;
   bustCache?: boolean;
-};
+}
 
-export type SavePageRequest = {
+export interface SavePageRequest {
   dsl: DSLWidget;
   layoutId: string;
   pageId: string;
   applicationId: string;
-};
+}
 
-export type PageLayout = {
+export interface PageLayout {
   id: string;
   dsl: Partial<DSLWidget>;
   layoutOnLoadActions: PageAction[][];
   layoutActions: PageAction[];
   layoutOnLoadActionErrors?: LayoutOnLoadActionErrors[];
-};
+}
 
 export interface PageLayoutsRequest {
   layoutId: string;
@@ -47,7 +47,7 @@ export interface PageLayoutsRequest {
   };
 }
 
-export type FetchPageResponseData = {
+export interface FetchPageResponseData {
   id: string;
   name: string;
   slug: string;
@@ -57,11 +57,11 @@ export type FetchPageResponseData = {
   customSlug?: string;
   userPermissions?: string[];
   layoutOnLoadActionErrors?: LayoutOnLoadActionErrors[];
-};
+}
 
 export type FetchPublishedPageResponseData = FetchPageResponseData;
 
-export type SavePageResponseData = {
+export interface SavePageResponseData {
   id: string;
   layoutOnLoadActions: PageAction[][];
   dsl: Partial<DSLWidget>;
@@ -73,21 +73,21 @@ export type SavePageResponseData = {
     collectionId?: string;
   }>;
   layoutOnLoadActionErrors?: Array<LayoutOnLoadActionErrors>;
-};
+}
 
 export type CreatePageRequest = Omit<
   CreatePageActionPayload,
   "blockNavigation"
 >;
 
-export type UpdatePageRequest = {
+export interface UpdatePageRequest {
   id: string;
   name?: string;
   isHidden?: boolean;
   customSlug?: string;
-};
+}
 
-export type UpdatePageResponse = {
+export interface UpdatePageResponse {
   id: string;
   name: string;
   slug: string;
@@ -97,17 +97,17 @@ export type UpdatePageResponse = {
   isHidden: boolean;
   lastUpdatedTime: number;
   defaultResources: unknown[];
-};
+}
 
-export type SetPageOrderRequest = {
+export interface SetPageOrderRequest {
   order: number;
   pageId: string;
   applicationId: string;
-};
+}
 
 export type CreatePageResponse = ApiResponse;
 
-export type FetchPageListResponseData = {
+export interface FetchPageListResponseData {
   pages: Array<{
     id: string;
     name: string;
@@ -119,7 +119,7 @@ export type FetchPageListResponseData = {
     description?: string;
   }>;
   workspaceId: string;
-};
+}
 
 export interface DeletePageRequest {
   id: string;
@@ -145,12 +145,12 @@ export interface GenerateTemplatePageRequest {
   pluginSpecificParams?: Record<any, any>;
 }
 
-export type GenerateTemplatePageResponseData = {
+export interface GenerateTemplatePageResponseData {
   id: string;
   name: string;
   applicationId: string;
   layouts: Array<PageLayout>;
-};
+}
 
 export type SavePageResponse = ApiResponse<SavePageResponseData>;
 
diff --git a/app/client/src/api/TemplatesApi.ts b/app/client/src/api/TemplatesApi.ts
index 975586a922..4b6d8c2d0b 100644
--- a/app/client/src/api/TemplatesApi.ts
+++ b/app/client/src/api/TemplatesApi.ts
@@ -42,7 +42,7 @@ export interface TemplateFiltersResponse extends ApiResponse {
   };
 }
 
-export type PublishCommunityTemplateRequest = {
+export interface PublishCommunityTemplateRequest {
   applicationId: string;
   workspaceId: string;
   branchName: string;
@@ -51,7 +51,7 @@ export type PublishCommunityTemplateRequest = {
   description: string;
   useCases: string[];
   authorEmail: string;
-};
+}
 
 export type PublishCommunityTemplateResponse = ApiResponse<{
   isPublic: boolean;
diff --git a/app/client/src/ce/AppRouter.tsx b/app/client/src/ce/AppRouter.tsx
index 1d95ef88c6..71f68ef18f 100644
--- a/app/client/src/ce/AppRouter.tsx
+++ b/app/client/src/ce/AppRouter.tsx
@@ -1,6 +1,6 @@
 import React, { Suspense, useEffect } from "react";
 import history from "utils/history";
-import AppHeader from "pages/common/AppHeader";
+import AppHeader from "@appsmith/pages/common/AppHeader";
 import { Redirect, Route, Router, Switch } from "react-router-dom";
 import {
   ADMIN_SETTINGS_CATEGORY_PATH,
diff --git a/app/client/src/RouteBuilder.ts b/app/client/src/ce/RouteBuilder.ts
similarity index 83%
rename from app/client/src/RouteBuilder.ts
rename to app/client/src/ce/RouteBuilder.ts
index 9a5e35ff8f..7f7e20a0b8 100644
--- a/app/client/src/RouteBuilder.ts
+++ b/app/client/src/ce/RouteBuilder.ts
@@ -7,21 +7,12 @@ import {
   TEMPLATES_PATH,
 } from "constants/routes";
 import { APP_MODE } from "entities/App";
-import urlBuilder from "entities/URLRedirect/URLAssembly";
+import urlBuilder from "@appsmith/entities/URLRedirect/URLAssembly";
+import type { URLBuilderParams } from "@appsmith/entities/URLRedirect/URLAssembly";
 import type {
   ApplicationPayload,
   Page,
 } from "@appsmith/constants/ReduxActionConstants";
-import { isNil } from "lodash";
-
-export type URLBuilderParams = {
-  suffix?: string;
-  branch?: string;
-  hash?: string;
-  params?: Record<string, any>;
-  pageId: string;
-  persistExistingParams?: boolean;
-};
 
 export const fillPathname = (
   pathname: string,
@@ -38,24 +29,6 @@ export const fillPathname = (
   );
 };
 
-export function getQueryStringfromObject(
-  params: Record<string, string> = {},
-): string {
-  const paramKeys = Object.keys(params);
-  const queryParams: string[] = [];
-  if (paramKeys) {
-    paramKeys.forEach((paramKey: string) => {
-      if (!isNil(params[paramKey])) {
-        const value = encodeURIComponent(params[paramKey]);
-        if (paramKey && value) {
-          queryParams.push(`${paramKey}=${value}`);
-        }
-      }
-    });
-  }
-  return queryParams.length ? "?" + queryParams.join("&") : "";
-}
-
 export const datasourcesEditorURL = (props: URLBuilderParams): string =>
   urlBuilder.build({
     ...props,
diff --git a/app/client/src/ce/api/ApplicationApi.tsx b/app/client/src/ce/api/ApplicationApi.tsx
index 93ea233340..4b3786b132 100644
--- a/app/client/src/ce/api/ApplicationApi.tsx
+++ b/app/client/src/ce/api/ApplicationApi.tsx
@@ -105,7 +105,7 @@ export interface ForkApplicationRequest {
 
 export type GetAllApplicationResponse = ApiResponse<ApplicationPagePayload[]>;
 
-export type UpdateApplicationPayload = {
+export interface UpdateApplicationPayload {
   icon?: string;
   color?: string;
   name?: string;
@@ -118,7 +118,7 @@ export type UpdateApplicationPayload = {
     appPositioning?: LayoutSystemTypeConfig;
   };
   forkingEnabled?: boolean;
-};
+}
 
 export type UpdateApplicationRequest = UpdateApplicationPayload & {
   id: string;
diff --git a/app/client/src/ce/api/TenantApi.ts b/app/client/src/ce/api/TenantApi.ts
index c3de1c0437..59e68d4a82 100644
--- a/app/client/src/ce/api/TenantApi.ts
+++ b/app/client/src/ce/api/TenantApi.ts
@@ -12,11 +12,11 @@ export type UpdateTenantConfigResponse = ApiResponse<{
   tenantConfiguration: Record<string, string>;
 }>;
 
-export type UpdateTenantConfigRequest = {
+export interface UpdateTenantConfigRequest {
   tenantConfiguration: Record<string, string>;
   needsRefresh?: boolean;
   isOnlyTenantSettings?: boolean;
-};
+}
 
 export class TenantApi extends Api {
   static tenantsUrl = "v1/tenants";
diff --git a/app/client/src/ce/components/DSDataFilter/index.tsx b/app/client/src/ce/components/DSDataFilter/index.tsx
index 3b753b0832..9bc93d84ef 100644
--- a/app/client/src/ce/components/DSDataFilter/index.tsx
+++ b/app/client/src/ce/components/DSDataFilter/index.tsx
@@ -52,7 +52,7 @@ const TooltipLink = styled(Link)`
   display: inline;
 `;
 
-type DSDataFilterProps = {
+interface DSDataFilterProps {
   updateFilter: (
     id: string,
     name: string,
@@ -63,14 +63,14 @@ type DSDataFilterProps = {
   isInsideReconnectModal: boolean;
   viewMode: boolean;
   filterId: string; // id of the selected environment, used to keep the parent and child in sync
-};
+}
 
-type EnvironmentType = {
+interface EnvironmentType {
   id: string;
   name: string;
   selected: boolean;
   userPermissions: string[];
-};
+}
 
 const environments: Array<EnvironmentType> = [
   {
diff --git a/app/client/src/ce/components/SwitchEnvironment/index.tsx b/app/client/src/ce/components/SwitchEnvironment/index.tsx
index 2c5c9ff31c..138c7df6c0 100644
--- a/app/client/src/ce/components/SwitchEnvironment/index.tsx
+++ b/app/client/src/ce/components/SwitchEnvironment/index.tsx
@@ -46,15 +46,15 @@ const StyledIcon = styled(Icon)`
   margin-right: 8px;
 `;
 
-type Props = {
+interface Props {
   viewMode?: boolean;
-};
+}
 
-type EnvironmentType = {
+interface EnvironmentType {
   id: string;
   name: string;
   selected: boolean;
-};
+}
 
 const environmentList: Array<EnvironmentType> = [
   {
diff --git a/app/client/src/ce/components/editorComponents/EditorFormSignPosting.tsx b/app/client/src/ce/components/editorComponents/EditorFormSignPosting.tsx
index bc54978c45..82d9cc4a20 100644
--- a/app/client/src/ce/components/editorComponents/EditorFormSignPosting.tsx
+++ b/app/client/src/ce/components/editorComponents/EditorFormSignPosting.tsx
@@ -1,9 +1,9 @@
 import type { TEditorModes } from "components/editorComponents/CodeEditor/EditorConfig";
 
-export type Props = {
+export interface Props {
   isAIEnabled: boolean;
   mode: TEditorModes;
-};
+}
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export function EditorFormSignPosting(props: Props) {
diff --git a/app/client/src/ce/components/editorComponents/GPT/AskAIButton.tsx b/app/client/src/ce/components/editorComponents/GPT/AskAIButton.tsx
index 1bc3a41200..e98cedd439 100644
--- a/app/client/src/ce/components/editorComponents/GPT/AskAIButton.tsx
+++ b/app/client/src/ce/components/editorComponents/GPT/AskAIButton.tsx
@@ -3,11 +3,11 @@ import type {
   TEditorModes,
 } from "components/editorComponents/CodeEditor/EditorConfig";
 
-type AskAIButtonProps = {
+interface AskAIButtonProps {
   mode: TEditorModes;
   onClick: () => void;
   entity: FieldEntityInformation;
-};
+}
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export function AskAIButton(props: AskAIButtonProps) {
diff --git a/app/client/src/ce/components/editorComponents/GPT/index.tsx b/app/client/src/ce/components/editorComponents/GPT/index.tsx
index d613a38674..092dcfe265 100644
--- a/app/client/src/ce/components/editorComponents/GPT/index.tsx
+++ b/app/client/src/ce/components/editorComponents/GPT/index.tsx
@@ -5,12 +5,25 @@ import type {
 } from "components/editorComponents/CodeEditor/EditorConfig";
 import type { EntityNavigationData } from "selectors/navigationSelectors";
 import React from "react";
+import type CodeMirror from "codemirror";
 
-export type TAIWrapperProps = {
+export type AIEditorContext = Partial<{
+  functionName: string;
+  cursorLineNumber: number;
+  functionString: string;
+  cursorPosition: CodeMirror.Position;
+  cursorCoordinates: {
+    left: number;
+    top: number;
+    bottom: number;
+  };
+  mode: string;
+}>;
+
+export interface TAIWrapperProps {
   children?: React.ReactNode;
-  isOpen?: boolean;
+  isOpen: boolean;
   currentValue: string;
-  close: () => void;
   update?: (...args: any) => void;
   triggerContext?: CodeEditorExpected;
   enableAIAssistance: boolean;
@@ -18,7 +31,9 @@ export type TAIWrapperProps = {
   mode: TEditorModes;
   entity: FieldEntityInformation;
   entitiesForNavigation: EntityNavigationData;
-};
+  editor: CodeMirror.Editor;
+  onOpenChanged: (isOpen: boolean) => void;
+}
 
 export function AIWindow(props: TAIWrapperProps) {
   const { children } = props;
diff --git a/app/client/src/ce/components/editorComponents/GPT/trigger.tsx b/app/client/src/ce/components/editorComponents/GPT/trigger.tsx
index 6e31801550..b2f735238f 100644
--- a/app/client/src/ce/components/editorComponents/GPT/trigger.tsx
+++ b/app/client/src/ce/components/editorComponents/GPT/trigger.tsx
@@ -1,8 +1,34 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 import type { TEditorModes } from "components/editorComponents/CodeEditor/EditorConfig";
-export const APPSMITH_AI = "Appsmith AI";
 import type { FeatureFlags } from "@appsmith/entities/FeatureFlag";
+import type { ENTITY_TYPE } from "@appsmith/entities/DataTree/types";
+
+export const APPSMITH_AI = "Appsmith AI";
 
-/* eslint-disable-next-line */
 export function isAIEnabled(ff: FeatureFlags, mode: TEditorModes) {
   return false;
 }
+
+export const isAISlashCommand = (editor: CodeMirror.Editor) => {
+  return false;
+};
+
+export const getAIContext = ({
+  cursorPosition,
+  editor,
+}: {
+  entityType?: ENTITY_TYPE;
+  slashIndex?: number;
+  currentLineValue?: string;
+  cursorPosition: CodeMirror.Position;
+  editor: CodeMirror.Editor;
+}) => {
+  return {
+    functionName: "",
+    cursorLineNumber: cursorPosition.line,
+    functionString: "",
+    mode: editor.getMode().name,
+    cursorPosition,
+    cursorCoordinates: editor.cursorCoords(true, "local"),
+  };
+};
diff --git a/app/client/src/ce/configs/index.ts b/app/client/src/ce/configs/index.ts
index c523207439..6e2a399c48 100644
--- a/app/client/src/ce/configs/index.ts
+++ b/app/client/src/ce/configs/index.ts
@@ -40,7 +40,6 @@ export interface INJECTED_CONFIGS {
   cloudServicesBaseUrl: string;
   googleRecaptchaSiteKey: string;
   supportEmail: string;
-  hideWatermark: boolean;
   disableIframeWidgetSandbox: boolean;
   pricingUrl: string;
   customerPortalUrl: string;
@@ -107,9 +106,7 @@ export const getConfigsFromEnvVars = (): INJECTED_CONFIGS => {
     googleRecaptchaSiteKey:
       process.env.REACT_APP_GOOGLE_RECAPTCHA_SITE_KEY || "",
     supportEmail: process.env.APPSMITH_SUPPORT_EMAIL || "support@appsmith.com",
-    hideWatermark: process.env.APPSMITH_HIDE_WATERMARK
-      ? process.env.APPSMITH_HIDE_WATERMARK.length > 0
-      : false,
+
     disableIframeWidgetSandbox: process.env
       .APPSMITH_DISABLE_IFRAME_WIDGET_SANDBOX
       ? process.env.APPSMITH_DISABLE_IFRAME_WIDGET_SANDBOX.length > 0
@@ -261,10 +258,6 @@ export const getAppsmithConfigs = (): AppsmithUIConfigs => {
       APPSMITH_FEATURE_CONFIGS?.cloudServicesBaseUrl ||
       "",
     appsmithSupportEmail: ENV_CONFIG.supportEmail,
-    hideWatermark:
-      ENV_CONFIG.hideWatermark ||
-      APPSMITH_FEATURE_CONFIGS?.hideWatermark ||
-      false,
     disableIframeWidgetSandbox:
       ENV_CONFIG.disableIframeWidgetSandbox ||
       APPSMITH_FEATURE_CONFIGS?.disableIframeWidgetSandbox ||
diff --git a/app/client/src/ce/configs/types.ts b/app/client/src/ce/configs/types.ts
index cb35195994..5433dbb5a2 100644
--- a/app/client/src/ce/configs/types.ts
+++ b/app/client/src/ce/configs/types.ts
@@ -1,15 +1,15 @@
 import type { LogLevelDesc } from "loglevel";
 
-export type SentryConfig = {
+export interface SentryConfig {
   dsn: string;
   environment: string;
-};
+}
 
-export type AppVersionData = {
+export interface AppVersionData {
   id: string;
   releaseDate: string;
   edition: string;
-};
+}
 
 export interface AppsmithUIConfigs {
   sentry: {
@@ -60,7 +60,6 @@ export interface AppsmithUIConfigs {
     apiKey: string;
   };
   appsmithSupportEmail: string;
-  hideWatermark: boolean;
   disableIframeWidgetSandbox: boolean;
   pricingUrl: string;
   customerPortalUrl: string;
diff --git a/app/client/src/ce/constants/PackageConstants.ts b/app/client/src/ce/constants/PackageConstants.ts
index cc94a15a79..653d2a3acc 100644
--- a/app/client/src/ce/constants/PackageConstants.ts
+++ b/app/client/src/ce/constants/PackageConstants.ts
@@ -1,6 +1,6 @@
 type ID = string;
 
-export type Package = {
+export interface Package {
   id: ID;
   name: string; // Name of the package.
   icon: string;
@@ -10,6 +10,6 @@ export type Package = {
   modifiedBy: string;
   modifiedAt: string;
   userPermissions: string[];
-};
+}
 
 export type PackageMetadata = Package;
diff --git a/app/client/src/ce/constants/ReduxActionConstants.tsx b/app/client/src/ce/constants/ReduxActionConstants.tsx
index 4056b04b74..8f3b498836 100644
--- a/app/client/src/ce/constants/ReduxActionConstants.tsx
+++ b/app/client/src/ce/constants/ReduxActionConstants.tsx
@@ -838,7 +838,7 @@ const ActionTypes = {
   BIND_WIDGET_TO_DATASOURCE_SUCCESS: "BIND_WIDGET_TO_DATASOURCE_SUCCESS",
   BIND_WIDGET_TO_DATASOURCE_ERROR: "BIND_WIDGET_TO_DATASOURCE_ERROR",
   LOAD_FILE_PICKER_ACTION: "LOAD_FILE_PICKER_ACTION",
-  TOGGLE_AI_WINDOW: "TOGGLE_AI_WINDOW",
+  UPDATE_AI_CONTEXT: "UPDATE_AI_CONTEXT",
   UPDATE_AI_TRIGGERED: "UPDATE_AI_TRIGGERED",
   UPDATE_DATASOURCE_AUTH_STATE: "UPDATE_DATASOURCE_AUTH_STATE",
   UPDATE_POSITIONS_ON_TAB_CHANGE: "UPDATE_POSITIONS_ON_TAB_CHANGE",
@@ -1202,10 +1202,10 @@ export interface ApplicationPayload {
   publishedAppToCommunityTemplate?: boolean;
 }
 
-export type WorkspaceDetails = {
+export interface WorkspaceDetails {
   workspace: Workspace;
   applications: any[];
-};
+}
 
 export interface LoadWidgetEditorPayload {
   widgets: WidgetProps[];
diff --git a/app/client/src/ce/constants/SocialLogin.tsx b/app/client/src/ce/constants/SocialLogin.tsx
index 70aaf03313..2cb2c182c8 100644
--- a/app/client/src/ce/constants/SocialLogin.tsx
+++ b/app/client/src/ce/constants/SocialLogin.tsx
@@ -5,12 +5,12 @@ import {
 
 import GithubLogo from "assets/images/Github.png";
 import GoogleLogo from "assets/images/Google.png";
-export type SocialLoginButtonProps = {
+export interface SocialLoginButtonProps {
   url: string;
   name: string;
   logo: string;
   label?: string;
-};
+}
 
 export const GoogleSocialLoginButtonProps: SocialLoginButtonProps = {
   url: GoogleOAuthURL,
diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts
index 85ebf0d6c9..48544eac1d 100644
--- a/app/client/src/ce/constants/messages.ts
+++ b/app/client/src/ce/constants/messages.ts
@@ -8,15 +8,10 @@ export function createMessage(
 }
 
 /*
-  For self hosted, it displays the string "Appsmith Community v1.10.0" or "Appsmith Business v1.10.0".
-  For cloud hosting, it displays "Appsmith v1.10.0".
-  This is because Appsmith Cloud doesn't support business features yet.
+  For self hosted CE, it displays the string "Appsmith Community v1.10.0".
  */
-export const APPSMITH_DISPLAY_VERSION = (
-  edition: string,
-  version: string,
-  cloudHosting: boolean,
-) => `Appsmith ${!cloudHosting ? edition : ""} ${version}`;
+export const APPSMITH_DISPLAY_VERSION = (edition: string, version: string) =>
+  `Appsmith ${edition} ${version}`;
 export const INTERCOM_CONSENT_MESSAGE = () =>
   `Can we have your email for better support?`;
 export const YES = () => `Yes`;
@@ -269,6 +264,8 @@ export const WORKSPACES_HEADING = () => `Workspaces`;
 export const WELCOME_TOUR = () => `Welcome tour`;
 export const NO_APPS_FOUND = () =>
   `Whale! Whale! This name doesn't ring a bell!`;
+export const APPLICATION_CARD_LIST_ZERO_STATE = () =>
+  `There are no apps in this workspace.`;
 
 // Lightning menu
 export const LIGHTNING_MENU_DATA_API = () => `Use data from an API`;
@@ -1650,6 +1647,7 @@ export const EMPTY_QUERY_JS_MAIN_TEXT = () => "No query/JS to display";
 export const EMPTY_QUERY_JS_BUTTON_TEXT = () => "New query/JS";
 export const EMPTY_DATASOURCE_MAIN_TEXT = () => "No datasource to display";
 export const EMPTY_DATASOURCE_BUTTON_TEXT = () => "New datasource";
+export const SEARCH_DATASOURCES = () => "Search datasources";
 
 // Templates
 export const MORE = () => "More";
@@ -2075,7 +2073,7 @@ export const DATASOURCE_DROPDOWN_OPTIONS = {
 };
 
 export const COMMUNITY_TEMPLATES = {
-  publish: () => "Publish",
+  tabTitle: () => "Showcase",
   cancel: () => "Cancel",
   publishSuccessPage: {
     title: () => "Live on Appsmith community",
diff --git a/app/client/src/ce/constants/tenantConstants.ts b/app/client/src/ce/constants/tenantConstants.ts
index 19b4a43192..6f9cde1c44 100644
--- a/app/client/src/ce/constants/tenantConstants.ts
+++ b/app/client/src/ce/constants/tenantConstants.ts
@@ -4,6 +4,7 @@ export const tenantConfigConnection: string[] = [
   "emailVerificationEnabled",
   "singleSessionPerUserEnabled",
   "showRolesAndGroups",
+  "hideWatermark",
 ];
 
 export const RESTART_POLL_TIMEOUT = 2 * 150 * 1000;
diff --git a/app/client/src/ce/constants/workspaceConstants.ts b/app/client/src/ce/constants/workspaceConstants.ts
index b210dcc65c..9be786d478 100644
--- a/app/client/src/ce/constants/workspaceConstants.ts
+++ b/app/client/src/ce/constants/workspaceConstants.ts
@@ -1,13 +1,13 @@
 import type { ApplicationPayload } from "@appsmith/constants/ReduxActionConstants";
 
-export type WorkspaceRole = {
+export interface WorkspaceRole {
   id: string;
   name: string;
   displayName?: string;
   isDefault?: boolean;
-};
+}
 
-export type Workspace = {
+export interface Workspace {
   id: string;
   name: string;
   website?: string;
@@ -15,9 +15,9 @@ export type Workspace = {
   logoUrl?: string;
   uploadProgress?: number;
   userPermissions?: string[];
-};
+}
 
-export type WorkspaceUserRoles = {
+export interface WorkspaceUserRoles {
   id?: string;
   name?: string;
   description?: string;
@@ -25,9 +25,9 @@ export type WorkspaceUserRoles = {
   entityName?: string;
   entityId?: string;
   autoCreated: boolean;
-};
+}
 
-export type WorkspaceUser = {
+export interface WorkspaceUser {
   name: string;
   username: string;
   userId: string;
@@ -37,13 +37,13 @@ export type WorkspaceUser = {
   isChangingRole: boolean;
   photoId?: string;
   roles: WorkspaceUserRoles[];
-};
+}
 
-export type Workspaces = {
+export interface Workspaces {
   applications: ApplicationPayload[];
   workspace: Workspace;
   users: WorkspaceUser[];
-};
+}
 
 export enum ENTITY_TYPE {
   WORKSPACE = "Workspace",
diff --git a/app/client/src/ce/entities/DataTree/actionTriggers.ts b/app/client/src/ce/entities/DataTree/actionTriggers.ts
index 93321e8e4e..14e0ba7e15 100644
--- a/app/client/src/ce/entities/DataTree/actionTriggers.ts
+++ b/app/client/src/ce/entities/DataTree/actionTriggers.ts
@@ -163,17 +163,17 @@ export type ClearIntervalDescription = ActionDescriptionInterface<
   "CLEAR_INTERVAL"
 >;
 
-type GeolocationOptions = {
+interface GeolocationOptions {
   maximumAge?: number;
   timeout?: number;
   enableHighAccuracy?: boolean;
-};
+}
 
-type GeolocationPayload = {
+interface GeolocationPayload {
   onSuccess?: string;
   onError?: string;
   options?: GeolocationOptions;
-};
+}
 
 export type GetCurrentLocationDescription = ActionDescriptionInterface<
   GeolocationPayload,
diff --git a/app/client/src/ce/entities/DataTree/types.ts b/app/client/src/ce/entities/DataTree/types.ts
index f2daa0fed1..7d38fbbbfa 100644
--- a/app/client/src/ce/entities/DataTree/types.ts
+++ b/app/client/src/ce/entities/DataTree/types.ts
@@ -145,11 +145,6 @@ export type UnEvalTreeEntityObject =
   | JSActionEntity
   | WidgetEntity;
 
-export type UnEvalTreeEntity = UnEvalTreeEntityObject | AppsmithEntity | Page[];
-
-export type UnEvalTree = {
-  [entityName: string]: UnEvalTreeEntity;
-};
 export interface WidgetEntity extends WidgetProps {
   meta: Record<string, unknown>;
   ENTITY_TYPE: ENTITY_TYPE.WIDGET;
@@ -160,12 +155,6 @@ export type DataTreeEntityObject =
   | WidgetEntity
   | AppsmithEntity;
 
-export type DataTreeEntity = DataTreeEntityObject | Page[] | ActionDispatcher;
-
-export type DataTree = {
-  [entityName: string]: DataTreeEntity;
-};
-
 export interface WidgetEntityConfig
   extends Partial<WidgetProps>,
     Omit<WidgetConfigProps, "widgetName" | "rows" | "columns">,
@@ -181,7 +170,7 @@ export interface AppsmithEntity extends Omit<AppDataState, "store"> {
   theme: AppTheme["properties"];
 }
 
-export type DataTreeSeed = {
+export interface DataTreeSeed {
   actions: ActionDataState;
   editorConfigs: Record<string, any[]>;
   pluginDependencyConfig: Record<string, DependencyMap>;
@@ -196,23 +185,14 @@ export type DataTreeSeed = {
   moduleInputs: Record<string, ModuleInput>;
   layoutSystemType: LayoutSystemTypes;
   loadingEntities: LoadingEntitiesState;
-};
+}
 
-export type ModuleInput = {
+export interface ModuleInput {
   name: string;
   defaultValue: any;
-};
+}
 
 export type DataTreeEntityConfig =
   | WidgetEntityConfig
   | ActionEntityConfig
   | JSActionEntityConfig;
-
-export type ConfigTree = {
-  [entityName: string]: DataTreeEntityConfig;
-};
-
-export type unEvalAndConfigTree = {
-  unEvalTree: UnEvalTree;
-  configTree: ConfigTree;
-};
diff --git a/app/client/src/ce/entities/DataTree/utils.ts b/app/client/src/ce/entities/DataTree/utils.ts
index 60cbcf622b..1fe133b8a4 100644
--- a/app/client/src/ce/entities/DataTree/utils.ts
+++ b/app/client/src/ce/entities/DataTree/utils.ts
@@ -2,14 +2,12 @@ import type {
   PropertyOverrideDependency,
   OverridingPropertyPaths,
   ModuleInput,
-  DataTreeEntity,
   WidgetEntity,
   ActionEntity,
   JSActionEntity,
-  ConfigTree,
-  UnEvalTree,
   DataTreeEntityConfig,
 } from "@appsmith/entities/DataTree/types";
+import type { DataTreeEntity } from "entities/DataTree/dataTreeTypes";
 import { OverridingPropertyType } from "@appsmith/entities/DataTree/types";
 import {
   isAction,
@@ -17,13 +15,13 @@ import {
   isWidget,
 } from "@appsmith/workers/Evaluation/evaluationUtils";
 
-type SetOverridingPropertyParams = {
+interface SetOverridingPropertyParams {
   key: string;
   value: string;
   propertyOverrideDependency: PropertyOverrideDependency;
   overridingPropertyPaths: OverridingPropertyPaths;
   type: OverridingPropertyType;
-};
+}
 
 export const setOverridingProperty = ({
   key: propertyName,
@@ -70,14 +68,12 @@ export const setOverridingProperty = ({
 };
 
 export const generateDataTreeModuleInputs = (
-  dataTree: UnEvalTree,
-  configTree: ConfigTree,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  moduleInputs: Record<string, ModuleInput>,
+  moduleInput: ModuleInput,
 ) => {
   return {
-    dataTree,
-    configTree,
+    unEvalEntity: null,
+    configEntity: null,
   };
 };
 
diff --git a/app/client/src/ce/entities/FeatureFlag.ts b/app/client/src/ce/entities/FeatureFlag.ts
index 752d2498e0..97070a73f0 100644
--- a/app/client/src/ce/entities/FeatureFlag.ts
+++ b/app/client/src/ce/entities/FeatureFlag.ts
@@ -3,15 +3,14 @@ export const FEATURE_FLAG = {
   TEST_FLAG: "TEST_FLAG",
   release_datasource_environments_enabled:
     "release_datasource_environments_enabled",
-  ask_ai: "ask_ai",
   release_appnavigationlogoupload_enabled:
     "release_appnavigationlogoupload_enabled",
-  ask_ai_sql: "ask_ai_sql",
-  ask_ai_js: "ask_ai_js",
   release_embed_hide_share_settings_enabled:
     "release_embed_hide_share_settings_enabled",
   ab_gsheet_schema_enabled: "ab_gsheet_schema_enabled",
   ab_wds_enabled: "ab_wds_enabled",
+  release_table_serverside_filtering_enabled:
+    "release_table_serverside_filtering_enabled",
   release_custom_echarts_enabled: "release_custom_echarts_enabled",
   license_branding_enabled: "license_branding_enabled",
   ab_gif_signposting_enabled: "ab_gif_signposting_enabled",
@@ -26,6 +25,7 @@ export const FEATURE_FLAG = {
   release_show_publish_app_to_community_enabled:
     "release_show_publish_app_to_community_enabled",
   license_gac_enabled: "license_gac_enabled",
+  release_app_sidebar_enabled: "release_app_sidebar_enabled",
 } as const;
 
 export type FeatureFlag = keyof typeof FEATURE_FLAG;
@@ -35,13 +35,11 @@ export type FeatureFlags = Record<FeatureFlag, boolean>;
 export const DEFAULT_FEATURE_FLAG_VALUE: FeatureFlags = {
   TEST_FLAG: true,
   release_datasource_environments_enabled: false,
-  ask_ai: false,
   release_appnavigationlogoupload_enabled: false,
-  ask_ai_js: false,
-  ask_ai_sql: false,
   release_embed_hide_share_settings_enabled: false,
   ab_gsheet_schema_enabled: false,
   ab_wds_enabled: false,
+  release_table_serverside_filtering_enabled: false,
   release_custom_echarts_enabled: false,
   license_branding_enabled: false,
   ab_gif_signposting_enabled: false,
@@ -54,6 +52,7 @@ export const DEFAULT_FEATURE_FLAG_VALUE: FeatureFlags = {
   license_private_embeds_enabled: false,
   release_show_publish_app_to_community_enabled: false,
   license_gac_enabled: false,
+  release_app_sidebar_enabled: false,
 };
 
 export const AB_TESTING_EVENT_KEYS = {
diff --git a/app/client/src/ce/entities/URLRedirect/URLAssembly.test.ts b/app/client/src/ce/entities/URLRedirect/URLAssembly.test.ts
new file mode 100644
index 0000000000..27fa5b3407
--- /dev/null
+++ b/app/client/src/ce/entities/URLRedirect/URLAssembly.test.ts
@@ -0,0 +1,142 @@
+import urlBuilder, {
+  URLBuilder,
+  getQueryStringfromObject,
+} from "./URLAssembly";
+import { APP_MODE } from "entities/App";
+
+describe("URLBuilder", () => {
+  beforeEach(() => {
+    // Reset the URLBuilder instance before each test
+    urlBuilder.resetURLParams();
+  });
+
+  it("should correctly set and use currentPageId in build function when currentPageId is set", () => {
+    const testPageId = "testPageId";
+    const testMode = APP_MODE.EDIT;
+
+    urlBuilder.setCurrentPageId(testPageId);
+
+    const builderParams = {
+      suffix: "testSuffix",
+      branch: "testBranch",
+      hash: "testHash",
+      params: { param1: "value1", param2: "value2" },
+      persistExistingParams: true,
+    };
+
+    URLBuilder.prototype.generateBasePath = jest.fn((pageId, mode) => {
+      expect(pageId).toBe(testPageId); // Ensure the current page id is used
+      expect(mode).toBe(testMode);
+      return `mockedBasePath/${pageId}/${mode}`;
+    });
+
+    const result = urlBuilder.build(builderParams, testMode);
+
+    expect(URLBuilder.prototype.generateBasePath).toHaveBeenCalledWith(
+      testPageId,
+      testMode,
+    );
+
+    expect(result).toEqual(
+      "mockedBasePath/testPageId/EDIT/testSuffix?param1=value1&param2=value2&branch=testBranch#testHash",
+    );
+  });
+
+  it("should correctly set and use pageId in build function when currentPageId is set to null", () => {
+    const testPageId = "testPageId";
+    const testMode = APP_MODE.EDIT;
+
+    // Set currentPageId to null
+    urlBuilder.setCurrentPageId(null);
+
+    const builderParams = {
+      suffix: "testSuffix",
+      branch: "testBranch",
+      hash: "testHash",
+      params: { param1: "value1", param2: "value2" },
+      pageId: testPageId, // Set the pageId to be used
+      persistExistingParams: true,
+    };
+
+    URLBuilder.prototype.generateBasePath = jest.fn((pageId, mode) => {
+      expect(pageId).toBe(testPageId); // Ensure the passed pageId is used
+      expect(mode).toBe(testMode);
+      return `mockedBasePath/${pageId}/${mode}`;
+    });
+
+    const result = urlBuilder.build(builderParams, testMode);
+
+    expect(URLBuilder.prototype.generateBasePath).toHaveBeenCalledWith(
+      testPageId,
+      testMode,
+    );
+
+    expect(result).toEqual(
+      "mockedBasePath/testPageId/EDIT/testSuffix?param1=value1&param2=value2&branch=testBranch#testHash",
+    );
+  });
+
+  it("should correctly set and use pageId in build function when currentPageId is set", () => {
+    const currentPageId = "currentPageId";
+    const testPageId = "testPageId";
+    const testMode = APP_MODE.EDIT;
+
+    urlBuilder.setCurrentPageId(currentPageId);
+
+    const builderParams = {
+      suffix: "testSuffix",
+      branch: "testBranch",
+      hash: "testHash",
+      params: { param1: "value1", param2: "value2" },
+      pageId: testPageId, // This should override the current page id
+      persistExistingParams: true,
+    };
+
+    URLBuilder.prototype.generateBasePath = jest.fn((pageId, mode) => {
+      expect(pageId).toBe(testPageId); // Ensure the overridden pageId is used
+      expect(mode).toBe(testMode);
+      return `mockedBasePath/${pageId}/${mode}`;
+    });
+
+    const result = urlBuilder.build(builderParams, testMode);
+
+    expect(URLBuilder.prototype.generateBasePath).toHaveBeenCalledWith(
+      testPageId,
+      testMode,
+    );
+
+    expect(result).toEqual(
+      "mockedBasePath/testPageId/EDIT/testSuffix?param1=value1&param2=value2&branch=testBranch#testHash",
+    );
+  });
+});
+
+describe(".getQueryStringfromObject", () => {
+  const cases = [
+    {
+      index: 0,
+      input: { id: 0, a: "b&c ltd" },
+      expected: "?id=0&a=b%26c%20ltd",
+    },
+    { index: 1, input: {}, expected: "" },
+    {
+      index: 2,
+      input: { rando: "রিমিল" },
+      expected: "?rando=%E0%A6%B0%E0%A6%BF%E0%A6%AE%E0%A6%BF%E0%A6%B2",
+    },
+    {
+      index: 3,
+      input: { a1: "1234*&^%~`<>:';,./?" },
+      expected: "?a1=1234*%26%5E%25~%60%3C%3E%3A'%3B%2C.%2F%3F",
+    },
+    { index: 4, input: { isSignedIn: false }, expected: "?isSignedIn=false" },
+  ];
+
+  test.each(cases.map((x) => [x.index, x.input, x.expected]))(
+    "test case %d",
+    (_, input, expected) => {
+      const result = getQueryStringfromObject(input as any);
+      expect(result).toStrictEqual(expected);
+    },
+  );
+});
diff --git a/app/client/src/entities/URLRedirect/URLAssembly.ts b/app/client/src/ce/entities/URLRedirect/URLAssembly.ts
similarity index 67%
rename from app/client/src/entities/URLRedirect/URLAssembly.ts
rename to app/client/src/ce/entities/URLRedirect/URLAssembly.ts
index 45bbb79a98..ee54d04276 100644
--- a/app/client/src/entities/URLRedirect/URLAssembly.ts
+++ b/app/client/src/ce/entities/URLRedirect/URLAssembly.ts
@@ -11,17 +11,25 @@ import {
 } from "constants/routes";
 import { APP_MODE } from "entities/App";
 import { generatePath } from "react-router";
-import type { URLBuilderParams } from "RouteBuilder";
-import { getQueryStringfromObject } from "RouteBuilder";
 import getQueryParamsObject from "utils/getQueryParamsObject";
+import { isNil } from "lodash";
 
-enum URL_TYPE {
+export interface URLBuilderParams {
+  suffix?: string;
+  branch?: string;
+  hash?: string;
+  params?: Record<string, any>;
+  pageId?: string | null;
+  persistExistingParams?: boolean;
+}
+
+export enum URL_TYPE {
   DEFAULT,
   SLUG,
   CUSTOM_SLUG,
 }
 
-const baseURLRegistry = {
+export const baseURLRegistry = {
   [URL_TYPE.DEFAULT]: {
     [APP_MODE.EDIT]: BUILDER_PATH_DEPRECATED,
     [APP_MODE.PUBLISHED]: VIEWER_PATH_DEPRECATED,
@@ -36,17 +44,35 @@ const baseURLRegistry = {
   },
 };
 
-export type ApplicationURLParams = {
+export interface ApplicationURLParams {
   applicationId?: string;
   applicationSlug?: string;
   applicationVersion?: ApplicationVersion;
-};
+}
 
-export type PageURLParams = {
+export interface PageURLParams {
   pageId: string;
   pageSlug: string;
   customSlug?: string;
-};
+}
+
+export function getQueryStringfromObject(
+  params: Record<string, string> = {},
+): string {
+  const paramKeys = Object.keys(params);
+  const queryParams: string[] = [];
+  if (paramKeys) {
+    paramKeys.forEach((paramKey: string) => {
+      if (!isNil(params[paramKey])) {
+        const value = encodeURIComponent(params[paramKey]);
+        if (paramKey && value) {
+          queryParams.push(`${paramKey}=${value}`);
+        }
+      }
+    });
+  }
+  return queryParams.length ? "?" + queryParams.join("&") : "";
+}
 
 const fetchQueryParamsToPersist = (persistExistingParams: boolean) => {
   const existingParams = getQueryParamsObject() || {};
@@ -65,18 +91,34 @@ const fetchQueryParamsToPersist = (persistExistingParams: boolean) => {
   return params;
 };
 
+/**
+ * NOTE TO ENGINEERS:
+ * This class has extended features in EE; please do check the EE implementation
+ * of it before modifying any functionality here.
+ *
+ * This class is inherited in EE and basePath generation is modified based on the type
+ * of editor the user is currently on. This is done to remove the dependency of current
+ * page as a required param to build any route. However if a pageId is provided while
+ * building a route, it will override the cache and use the passed pageId value.
+ *
+ * However the current implementation can be improved and a holistic solution can be
+ * devised to support all different types of routing pattern. The current solution acts as a stop-gap
+ * solution to help Package Editor feature in EE.
+ */
 export class URLBuilder {
   appParams: ApplicationURLParams;
   pageParams: Record<string, PageURLParams>;
+  currentPageId?: string | null;
 
   static _instance: URLBuilder;
 
-  private constructor() {
+  constructor() {
     this.appParams = {
       applicationId: "",
       applicationSlug: PLACEHOLDER_APP_SLUG,
     };
     this.pageParams = {};
+    this.currentPageId;
   }
 
   static getInstance() {
@@ -116,6 +158,10 @@ export class URLBuilder {
     return { ...currentAppParams, ...currentPageParams };
   }
 
+  setCurrentPageId(pageId?: string | null) {
+    this.currentPageId = pageId;
+  }
+
   public updateURLParams(
     appParams: ApplicationURLParams | null,
     pageParams?: PageURLParams[],
@@ -129,14 +175,18 @@ export class URLBuilder {
         appParams.applicationVersion || this.appParams.applicationVersion;
     }
     if (pageParams) {
-      const params = pageParams.reduce((acc, page) => {
-        acc[page.pageId] = page;
-        return acc;
-      }, {} as Record<string, PageURLParams>);
+      const params = pageParams.reduce(
+        (acc, page) => {
+          acc[page.pageId] = page;
+          return acc;
+        },
+        {} as Record<string, PageURLParams>,
+      );
       Object.assign(this.pageParams, params);
     }
   }
 
+  // Currently only used in pages/Applications page on mount
   resetURLParams() {
     this.appParams = {
       applicationId: "",
@@ -145,11 +195,12 @@ export class URLBuilder {
     this.pageParams = {};
   }
 
+  // Current only used in src/pages/slug.test.tsx
   getURLParams(pageId: string) {
     return { ...this.appParams, ...this.pageParams[pageId] };
   }
 
-  generateBasePath(pageId: string, mode: APP_MODE) {
+  generateBasePathForApp(pageId: string, mode: APP_MODE) {
     const { applicationVersion } = this.appParams;
 
     const customSlug = this.pageParams[pageId]?.customSlug || "";
@@ -165,6 +216,10 @@ export class URLBuilder {
     return basePath;
   }
 
+  generateBasePath(pageId: string, mode: APP_MODE) {
+    return this.generateBasePathForApp(pageId, mode);
+  }
+
   getCustomSlugPathPreview(pageId: string, customSlug: string) {
     const urlPattern =
       baseURLRegistry[URL_TYPE.CUSTOM_SLUG][APP_MODE.PUBLISHED];
@@ -188,6 +243,20 @@ export class URLBuilder {
     return generatePath(urlPattern, formattedParams).toLowerCase();
   }
 
+  resolveEntityIdForApp(builderParams: URLBuilderParams) {
+    return {
+      entityId: builderParams.pageId || this.currentPageId,
+      entityType: "pageId",
+    };
+  }
+
+  resolveEntityId(builderParams: URLBuilderParams): {
+    entityId?: string | null;
+    entityType: string;
+  } {
+    return this.resolveEntityIdForApp(builderParams);
+  }
+
   /**
    * @throws {URIError}
    * @param builderParams
@@ -196,21 +265,22 @@ export class URLBuilder {
    */
   build(builderParams: URLBuilderParams, mode: APP_MODE = APP_MODE.EDIT) {
     const {
+      branch,
       hash = "",
       params = {},
       persistExistingParams = false,
       suffix,
-      pageId,
-      branch,
     } = builderParams;
 
-    if (!pageId) {
+    const { entityId, entityType } = this.resolveEntityId(builderParams);
+
+    if (!entityId) {
       throw new URIError(
-        "Missing pageId. If you are trying to set href inside a react component use the 'useHref' hook.",
+        `Missing ${entityType}. If you are trying to set href inside a react component use the 'useHref' hook.`,
       );
     }
 
-    const basePath = this.generateBasePath(pageId, mode);
+    const basePath = this.generateBasePath(entityId, mode);
 
     const queryParamsToPersist = fetchQueryParamsToPersist(
       persistExistingParams,
diff --git a/app/client/src/ce/pages/AdminSettings/Branding/UpgradeBanner.tsx b/app/client/src/ce/pages/AdminSettings/Branding/UpgradeBanner.tsx
index 533bc7e374..ac66bdbd2e 100644
--- a/app/client/src/ce/pages/AdminSettings/Branding/UpgradeBanner.tsx
+++ b/app/client/src/ce/pages/AdminSettings/Branding/UpgradeBanner.tsx
@@ -53,7 +53,6 @@ const UpgradeBanner = () => {
             data-testid="t--branding-upgrade-button"
             onClick={onUpgrade}
             size="md"
-            startIcon="star-line"
           >
             Upgrade
           </Button>
diff --git a/app/client/src/ce/pages/AdminSettings/BreadcrumbCategories.tsx b/app/client/src/ce/pages/AdminSettings/BreadcrumbCategories.tsx
index ff1bbe61c9..7be4be1087 100644
--- a/app/client/src/ce/pages/AdminSettings/BreadcrumbCategories.tsx
+++ b/app/client/src/ce/pages/AdminSettings/BreadcrumbCategories.tsx
@@ -1,6 +1,6 @@
 import { APPLICATIONS_URL } from "constants/routes";
 import { SettingCategories } from "@appsmith/pages/AdminSettings/config/types";
-import { adminSettingsCategoryUrl } from "RouteBuilder";
+import { adminSettingsCategoryUrl } from "@appsmith/RouteBuilder";
 
 export const BreadcrumbCategories = {
   HOMEPAGE: {
@@ -15,9 +15,11 @@ export const BreadcrumbCategories = {
     href: adminSettingsCategoryUrl({ category: SettingCategories.EMAIL }),
     text: "Email",
   },
-  [SettingCategories.GOOGLE_MAPS]: {
-    href: adminSettingsCategoryUrl({ category: SettingCategories.GOOGLE_MAPS }),
-    text: "Google Maps",
+  [SettingCategories.DEVELOPER_SETTINGS]: {
+    href: adminSettingsCategoryUrl({
+      category: SettingCategories.DEVELOPER_SETTINGS,
+    }),
+    text: "Developer settings",
   },
   [SettingCategories.VERSION]: {
     href: adminSettingsCategoryUrl({ category: SettingCategories.VERSION }),
diff --git a/app/client/src/ce/pages/AdminSettings/config/DeveloperSettings/googleMaps.ts b/app/client/src/ce/pages/AdminSettings/config/DeveloperSettings/googleMaps.ts
new file mode 100644
index 0000000000..7835e79366
--- /dev/null
+++ b/app/client/src/ce/pages/AdminSettings/config/DeveloperSettings/googleMaps.ts
@@ -0,0 +1,24 @@
+import { GOOGLE_MAPS_SETUP_DOC } from "constants/ThirdPartyConstants";
+import type { Setting } from "../types";
+import {
+  SettingCategories,
+  SettingSubtype,
+  SettingTypes,
+} from "@appsmith/pages/AdminSettings/config/types";
+
+export const googleMapsConfig: Setting[] = [
+  {
+    id: "APPSMITH_GOOGLE_MAPS_READ_MORE",
+    category: SettingCategories.DEVELOPER_SETTINGS,
+    controlType: SettingTypes.CALLOUT,
+    label: "How to configure google maps?",
+    url: GOOGLE_MAPS_SETUP_DOC,
+  },
+  {
+    id: "googleMapsKey",
+    category: SettingCategories.DEVELOPER_SETTINGS,
+    controlType: SettingTypes.TEXTINPUT,
+    controlSubType: SettingSubtype.TEXT,
+    label: "Google Maps API key",
+  },
+];
diff --git a/app/client/src/ce/pages/AdminSettings/config/DeveloperSettings/index.ts b/app/client/src/ce/pages/AdminSettings/config/DeveloperSettings/index.ts
new file mode 100644
index 0000000000..1d887a6388
--- /dev/null
+++ b/app/client/src/ce/pages/AdminSettings/config/DeveloperSettings/index.ts
@@ -0,0 +1,17 @@
+import type { AdminConfigType } from "@appsmith/pages/AdminSettings/config/types";
+import {
+  CategoryType,
+  SettingCategories,
+  SettingTypes,
+} from "@appsmith/pages/AdminSettings/config/types";
+import { googleMapsConfig } from "./googleMaps";
+
+export const config: AdminConfigType = {
+  icon: "snippet",
+  type: SettingCategories.DEVELOPER_SETTINGS,
+  categoryType: CategoryType.GENERAL,
+  controlType: SettingTypes.GROUP,
+  title: "Developer settings",
+  canSave: true,
+  settings: [...googleMapsConfig],
+};
diff --git a/app/client/src/ce/pages/AdminSettings/config/general.tsx b/app/client/src/ce/pages/AdminSettings/config/general.tsx
index 4a4417e944..a3ede65683 100644
--- a/app/client/src/ce/pages/AdminSettings/config/general.tsx
+++ b/app/client/src/ce/pages/AdminSettings/config/general.tsx
@@ -73,12 +73,12 @@ export const APPSMITH_DISABLE_TELEMETRY_SETTING: Setting = {
 };
 
 export const APPSMITH_HIDE_WATERMARK_SETTING: Setting = {
-  id: "APPSMITH_HIDE_WATERMARK",
-  name: "APPSMITH_HIDE_WATERMARK",
+  id: "hideWatermark",
+  name: "hideWatermark",
   category: SettingCategories.GENERAL,
   controlType: SettingTypes.CHECKBOX,
   label: "Appsmith watermark",
-  text: "Show Appsmith watermark",
+  text: "Hide Appsmith watermark",
   isFeatureEnabled: false,
   isDisabled: () => true,
   textSuffix: <BrandingBadge />,
diff --git a/app/client/src/ce/pages/AdminSettings/config/index.ts b/app/client/src/ce/pages/AdminSettings/config/index.ts
index b5ac5778ba..e87e2f1add 100644
--- a/app/client/src/ce/pages/AdminSettings/config/index.ts
+++ b/app/client/src/ce/pages/AdminSettings/config/index.ts
@@ -2,7 +2,7 @@ import { ConfigFactory } from "pages/AdminSettings/config/ConfigFactory";
 
 import { config as GeneralConfig } from "@appsmith/pages/AdminSettings/config/general";
 import { config as EmailConfig } from "pages/AdminSettings/config/email";
-import { config as MapsConfig } from "pages/AdminSettings/config/googleMaps";
+import { config as DeveloperSettings } from "@appsmith/pages/AdminSettings/config/DeveloperSettings";
 import { config as VersionConfig } from "pages/AdminSettings/config/version";
 import { config as AdvancedConfig } from "pages/AdminSettings/config/advanced";
 import { config as Authentication } from "@appsmith/pages/AdminSettings/config/authentication";
@@ -13,7 +13,7 @@ import { config as AuditLogsConfig } from "@appsmith/pages/AdminSettings/config/
 
 ConfigFactory.register(GeneralConfig);
 ConfigFactory.register(EmailConfig);
-ConfigFactory.register(MapsConfig);
+ConfigFactory.register(DeveloperSettings);
 ConfigFactory.register(Authentication);
 ConfigFactory.register(AdvancedConfig);
 ConfigFactory.register(VersionConfig);
diff --git a/app/client/src/ce/pages/AdminSettings/config/types.ts b/app/client/src/ce/pages/AdminSettings/config/types.ts
index 7b214c07e7..39ffeb086e 100644
--- a/app/client/src/ce/pages/AdminSettings/config/types.ts
+++ b/app/client/src/ce/pages/AdminSettings/config/types.ts
@@ -11,7 +11,7 @@ type ControlType = {
   };
 }[keyof ControlPropsType];
 
-type ControlPropsType = {
+interface ControlPropsType {
   [SettingTypes.RADIO]: RadioOptionProps;
   [SettingTypes.TEXTINPUT]: unknown;
   [SettingTypes.TOGGLE]: unknown;
@@ -25,7 +25,7 @@ type ControlPropsType = {
   [SettingTypes.TAGINPUT]: unknown;
   [SettingTypes.DROPDOWN]: unknown;
   [SettingTypes.CHECKBOX]: unknown;
-};
+}
 
 export enum SettingTypes {
   RADIO = "RADIO",
@@ -86,6 +86,7 @@ export type Setting = ControlType & {
   dropdownOptions?: Partial<SelectOptionProps>[];
   isFeatureEnabled?: boolean;
   tooltip?: string;
+  isEnterprise?: boolean;
 };
 
 export interface Category {
@@ -104,7 +105,6 @@ export interface Category {
 export const SettingCategories = {
   GENERAL: "general",
   EMAIL: "email",
-  GOOGLE_MAPS: "google-maps",
   VERSION: "version",
   ADVANCED: "advanced",
   AUTHENTICATION: "authentication",
@@ -117,6 +117,7 @@ export const SettingCategories = {
   BRANDING: "branding",
   SAML_AUTH: "saml-auth",
   OIDC_AUTH: "oidc-auth",
+  DEVELOPER_SETTINGS: "developer-settings",
 };
 
 export enum CategoryType {
@@ -125,7 +126,7 @@ export enum CategoryType {
   OTHER = "other",
 }
 
-export type AdminConfigType = {
+export interface AdminConfigType {
   type: string;
   controlType: SettingTypes;
   title: string;
@@ -140,4 +141,4 @@ export type AdminConfigType = {
   categoryType: CategoryType;
   isEnterprise?: boolean;
   isFeatureEnabled?: boolean;
-};
+}
diff --git a/app/client/src/ce/pages/AppViewer/NavigationLogo.tsx b/app/client/src/ce/pages/AppViewer/NavigationLogo.tsx
index 9c5c549c2c..e87dd92426 100644
--- a/app/client/src/ce/pages/AppViewer/NavigationLogo.tsx
+++ b/app/client/src/ce/pages/AppViewer/NavigationLogo.tsx
@@ -16,13 +16,13 @@ import {
 } from "selectors/editorSelectors";
 import { useHref } from "pages/Editor/utils";
 import { APP_MODE } from "entities/App";
-import { builderURL, viewerURL } from "RouteBuilder";
+import { builderURL, viewerURL } from "@appsmith/RouteBuilder";
 import { get } from "lodash";
 import { getAssetUrl } from "@appsmith/utils/airgapHelpers";
 
-type NavigationLogoProps = {
+interface NavigationLogoProps {
   logoConfiguration: NavigationSetting["logoConfiguration"];
-};
+}
 
 const StyledImage = styled.img`
   max-width: 10rem;
diff --git a/app/client/src/ce/pages/Applications/ApplicationCardList.tsx b/app/client/src/ce/pages/Applications/ApplicationCardList.tsx
index c0a0deb043..9d03ab288d 100644
--- a/app/client/src/ce/pages/Applications/ApplicationCardList.tsx
+++ b/app/client/src/ce/pages/Applications/ApplicationCardList.tsx
@@ -13,12 +13,16 @@ import { NoAppsFound } from "@appsmith/pages/Applications";
 import ApplicationCard from "pages/Applications/ApplicationCard";
 import type { ApplicationPayload } from "@appsmith/constants/ReduxActionConstants";
 import type { UpdateApplicationPayload } from "@appsmith/api/ApplicationApi";
+import {
+  APPLICATION_CARD_LIST_ZERO_STATE,
+  createMessage,
+} from "@appsmith/constants/messages";
 
 const NoAppsFoundIcon = importSvg(
   async () => import("assets/svg/no-apps-icon.svg"),
 );
 
-type ApplicationCardListProps = {
+interface ApplicationCardListProps {
   applications: ApplicationPayload[];
   canInviteToWorkspace: boolean;
   enableImportExport: boolean;
@@ -32,7 +36,7 @@ type ApplicationCardListProps = {
     id: string,
     data: UpdateApplicationPayload,
   ) => void;
-};
+}
 
 function ApplicationCardList({
   applications,
@@ -81,7 +85,7 @@ function ApplicationCardList({
       {applications.length === 0 && (
         <NoAppsFound>
           <NoAppsFoundIcon />
-          <span>There’s nothing inside this workspace</span>
+          <span>{createMessage(APPLICATION_CARD_LIST_ZERO_STATE)}</span>
           {/* below component is duplicate. This is because of cypress test were failing */}
           {hasCreateNewApplicationPermission && (
             <Button
diff --git a/app/client/src/ce/pages/Applications/PackageCardList.tsx b/app/client/src/ce/pages/Applications/PackageCardList.tsx
index 258fb820b4..1696216d47 100644
--- a/app/client/src/ce/pages/Applications/PackageCardList.tsx
+++ b/app/client/src/ce/pages/Applications/PackageCardList.tsx
@@ -1,10 +1,10 @@
 import type { Package } from "@appsmith/constants/PackageConstants";
 
-export type PackageCardListProps = {
+export interface PackageCardListProps {
   isMobile: boolean;
   workspaceId: string;
   packages?: Package[];
-};
+}
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 function PackageCardList(props: PackageCardListProps) {
diff --git a/app/client/src/ce/pages/Applications/ResourceListLoader.tsx b/app/client/src/ce/pages/Applications/ResourceListLoader.tsx
index 86462f596f..5135864016 100644
--- a/app/client/src/ce/pages/Applications/ResourceListLoader.tsx
+++ b/app/client/src/ce/pages/Applications/ResourceListLoader.tsx
@@ -7,10 +7,10 @@ import { Button } from "design-system";
 import { PaddingWrapper } from "pages/Applications/CommonElements";
 import type { ApplicationPayload } from "@appsmith/constants/ReduxActionConstants";
 
-type ResourcesLoaderProps = {
+interface ResourcesLoaderProps {
   isMobile: boolean;
   resources: ApplicationPayload[];
-};
+}
 
 const DEFAULT_BACKGROUND_COLOR = "#9747FF1A";
 const DEFAULT_ICON = "book";
diff --git a/app/client/src/ce/pages/Applications/WorkspaceAction.tsx b/app/client/src/ce/pages/Applications/WorkspaceAction.tsx
index e0f309b5e1..30b0045603 100644
--- a/app/client/src/ce/pages/Applications/WorkspaceAction.tsx
+++ b/app/client/src/ce/pages/Applications/WorkspaceAction.tsx
@@ -9,11 +9,11 @@ import {
 } from "@appsmith/selectors/applicationSelectors";
 import { hasCreateNewAppPermission } from "@appsmith/utils/permissionHelpers";
 
-export type WorkspaceActionProps = {
+export interface WorkspaceActionProps {
   workspaceId: string;
   isMobile: boolean;
   onCreateNewApplication: (workspaceId: string) => void;
-};
+}
 
 function WorkspaceAction({
   isMobile,
diff --git a/app/client/src/ce/pages/Applications/WorkspaceMenu.tsx b/app/client/src/ce/pages/Applications/WorkspaceMenu.tsx
index 3e46d27190..45962dc772 100644
--- a/app/client/src/ce/pages/Applications/WorkspaceMenu.tsx
+++ b/app/client/src/ce/pages/Applications/WorkspaceMenu.tsx
@@ -19,7 +19,7 @@ import {
   getOnSelectAction,
 } from "pages/common/CustomizedDropdown/dropdownHelpers";
 
-type WorkspaceMenuProps = {
+interface WorkspaceMenuProps {
   canDeleteWorkspace: boolean;
   canInviteToWorkspace: boolean;
   enableImportExport: boolean;
@@ -40,7 +40,7 @@ type WorkspaceMenuProps = {
   workspace: Workspace;
   workspaceNameChange: (newName: string, workspaceId: string) => void;
   workspaceToOpenMenu: string | null;
-};
+}
 
 const WorkspaceRename = styled(EditableText)`
   padding: 0 2px;
diff --git a/app/client/src/ce/pages/Applications/index.tsx b/app/client/src/ce/pages/Applications/index.tsx
index a77e4d37fc..cabe8225d0 100644
--- a/app/client/src/ce/pages/Applications/index.tsx
+++ b/app/client/src/ce/pages/Applications/index.tsx
@@ -81,7 +81,7 @@ import DisconnectGitModal from "pages/Editor/gitSync/DisconnectGitModal";
 import ReconnectDatasourceModal from "pages/Editor/gitSync/ReconnectDatasourceModal";
 import LeftPaneBottomSection from "pages/Home/LeftPaneBottomSection";
 import { MOBILE_MAX_WIDTH } from "constants/AppConstants";
-import urlBuilder from "entities/URLRedirect/URLAssembly";
+import urlBuilder from "@appsmith/entities/URLRedirect/URLAssembly";
 import RepoLimitExceededErrorModal from "pages/Editor/gitSync/RepoLimitExceededErrorModal";
 import { resetEditorRequest } from "actions/initActions";
 import {
@@ -306,9 +306,9 @@ export const submitCreateWorkspaceForm = async (data: any, dispatch: any) => {
   return result;
 };
 
-export type LeftPaneProps = {
+export interface LeftPaneProps {
   isBannerVisible?: boolean;
-};
+}
 
 export function LeftPane(props: LeftPaneProps) {
   const { isBannerVisible = false } = props;
diff --git a/app/client/src/ce/pages/Editor/Explorer/helpers.tsx b/app/client/src/ce/pages/Editor/Explorer/helpers.tsx
index 7c89fac378..a31c673c6b 100644
--- a/app/client/src/ce/pages/Editor/Explorer/helpers.tsx
+++ b/app/client/src/ce/pages/Editor/Explorer/helpers.tsx
@@ -37,15 +37,15 @@ export const ContextMenuPopoverModifiers: IPopoverSharedProps["modifiers"] = {
   },
 };
 
-export type ExplorerURLParams = {
+export interface ExplorerURLParams {
   pageId: string;
-};
+}
 
-export type ExplorerFileEntity = {
+export interface ExplorerFileEntity {
   type: PluginType | "group";
   group?: string;
   entity: ActionData | JSCollectionData;
-};
+}
 
 export const matchBasePath = (pathname: string) => {
   const basePathMatch = matchPath(pathname, {
@@ -154,18 +154,19 @@ export const useDatasourceIdFromURL = () => {
 
 const EXPLORER_STORAGE_PREFIX = "explorerState_";
 
-export type ExplorerStateType = {
+export interface ExplorerStateType {
   pages: boolean;
   widgets: boolean;
   queriesAndJs: boolean;
   datasource: boolean;
-};
+  packages: boolean;
+}
 
 export const getExplorerStatus = (
-  appId: string,
+  resourceId: string,
   entityName: keyof ExplorerStateType,
 ): boolean | null => {
-  const storageItemName = EXPLORER_STORAGE_PREFIX + appId;
+  const storageItemName = EXPLORER_STORAGE_PREFIX + resourceId;
   const data = localStorage.getItem(storageItemName);
   if (data === null) return null;
   const parsedData: ExplorerStateType = JSON.parse(data);
diff --git a/app/client/src/ce/pages/Upgrade/Carousel.tsx b/app/client/src/ce/pages/Upgrade/Carousel.tsx
index 3a57a41f59..0cfae1f499 100644
--- a/app/client/src/ce/pages/Upgrade/Carousel.tsx
+++ b/app/client/src/ce/pages/Upgrade/Carousel.tsx
@@ -65,7 +65,8 @@ const CarouselContainer = styled.div`
 
       &.active {
         height: max-content;
-        box-shadow: 0 2px 4px -2px rgba(0, 0, 0, 0.06),
+        box-shadow:
+          0 2px 4px -2px rgba(0, 0, 0, 0.06),
           0 4px 8px -2px rgba(0, 0, 0, 0.1);
 
         background-color: var(--ads-v2-color-bg);
diff --git a/app/client/src/ce/pages/Upgrade/businessEdition/UpgradeToBEPage.tsx b/app/client/src/ce/pages/Upgrade/businessEdition/UpgradeToBEPage.tsx
index 1a9da5b11f..3e51e3e05e 100644
--- a/app/client/src/ce/pages/Upgrade/businessEdition/UpgradeToBEPage.tsx
+++ b/app/client/src/ce/pages/Upgrade/businessEdition/UpgradeToBEPage.tsx
@@ -13,8 +13,10 @@ import { getAssetUrl } from "@appsmith/utils/airgapHelpers";
 export const UpgradeToBEPageWrapper = styled.div`
   width: 100%;
   height: 100%;
-  background: linear-gradient(90deg, #fff 20px, transparent 1%) center,
-    linear-gradient(#fff 20px, transparent 1%) center, #d2ddec;
+  background:
+    linear-gradient(90deg, #fff 20px, transparent 1%) center,
+    linear-gradient(#fff 20px, transparent 1%) center,
+    #d2ddec;
   background-size: 22px 22px;
   position: relative;
 
diff --git a/app/client/src/ce/pages/Upgrade/types.ts b/app/client/src/ce/pages/Upgrade/types.ts
index 50368e07b5..19411d51a1 100644
--- a/app/client/src/ce/pages/Upgrade/types.ts
+++ b/app/client/src/ce/pages/Upgrade/types.ts
@@ -1,17 +1,17 @@
 import type React from "react";
 
-export type Header = {
+export interface Header {
   heading: string;
   subHeadings: string[];
-};
+}
 
-export type CarouselTrigger = {
+export interface CarouselTrigger {
   icon: string;
   heading: string;
   details: string[];
-};
+}
 
-export type Carousel = {
+export interface Carousel {
   triggers: CarouselTrigger[];
   targets: any[];
   design:
@@ -19,19 +19,19 @@ export type Carousel = {
     | "split-right-trigger"
     | "trigger-contains-target"
     | "no-target";
-};
+}
 
-export type Footer = {
+export interface Footer {
   onClick: ((event: React.MouseEvent<HTMLElement>) => void) | undefined;
   message: string;
   showHeading?: boolean;
   isEnterprise?: boolean;
-};
-export type UpgradePageProps = {
+}
+export interface UpgradePageProps {
   header: Header;
   carousel: Carousel;
   footer: Footer;
-};
+}
 
 export type HeaderProps = Header;
 
diff --git a/app/client/src/ce/pages/common/AppHeader.tsx b/app/client/src/ce/pages/common/AppHeader.tsx
new file mode 100644
index 0000000000..bdb09ddbd5
--- /dev/null
+++ b/app/client/src/ce/pages/common/AppHeader.tsx
@@ -0,0 +1,41 @@
+import React from "react";
+import PageHeader from "pages/common/PageHeader";
+import { Route, Switch } from "react-router";
+import {
+  VIEWER_PATH,
+  BUILDER_PATH,
+  SETUP,
+  SIGNUP_SUCCESS_URL,
+  USER_AUTH_URL,
+  BUILDER_PATH_DEPRECATED,
+  VIEWER_PATH_DEPRECATED,
+  ADMIN_SETTINGS_CATEGORY_PATH,
+  VIEWER_CUSTOM_PATH,
+  BUILDER_CUSTOM_PATH,
+  BASE_URL,
+} from "constants/routes";
+import Navigation from "pages/AppViewer/Navigation";
+import type { RouteComponentProps } from "react-router";
+import AppEditorHeader from "pages/Editor/EditorHeader";
+
+export type Props = RouteComponentProps;
+
+export const headerRoot = document.getElementById("header-root");
+
+export const Routes = () => {
+  return (
+    <Switch>
+      <Route component={PageHeader} path={ADMIN_SETTINGS_CATEGORY_PATH} />
+      <Route component={undefined} path={USER_AUTH_URL} />
+      <Route path={SETUP} />
+      <Route path={SIGNUP_SUCCESS_URL} />
+      <Route component={AppEditorHeader} path={BUILDER_PATH_DEPRECATED} />
+      <Route component={Navigation} path={VIEWER_PATH_DEPRECATED} />
+      <Route component={AppEditorHeader} path={BUILDER_PATH} />
+      <Route component={AppEditorHeader} path={BUILDER_CUSTOM_PATH} />
+      <Route component={Navigation} path={VIEWER_PATH} />
+      <Route component={Navigation} path={VIEWER_CUSTOM_PATH} />
+      <Route component={PageHeader} path={BASE_URL} />
+    </Switch>
+  );
+};
diff --git a/app/client/src/ce/pages/workspace/helpers.ts b/app/client/src/ce/pages/workspace/helpers.ts
index 4f6ad34933..edae0a76df 100644
--- a/app/client/src/ce/pages/workspace/helpers.ts
+++ b/app/client/src/ce/pages/workspace/helpers.ts
@@ -2,18 +2,18 @@ import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 import { SubmissionError } from "redux-form";
 import type { RouteChildrenProps, RouteComponentProps } from "react-router-dom";
 import type { DefaultOptionType } from "rc-select/lib/Select";
-export type InviteUsersToWorkspaceByRoleValues = {
+export interface InviteUsersToWorkspaceByRoleValues {
   id: string;
   users?: string;
   permissionGroupId?: string;
   permissionGroupName?: string;
   roles?: any[];
-};
-export type InviteUsersToWorkspaceFormValues = {
+}
+export interface InviteUsersToWorkspaceFormValues {
   usersByRole: InviteUsersToWorkspaceByRoleValues[];
-};
+}
 
-export type InviteUsersProps = {
+export interface InviteUsersProps {
   roles?: DefaultOptionType[];
   applicationId?: string;
   workspaceId?: string;
@@ -24,11 +24,11 @@ export type InviteUsersProps = {
   options?: any;
   isMultiSelectDropdown?: boolean;
   checkIfInvitedUsersFromDifferentDomain?: () => void;
-};
+}
 
-export type CreateWorkspaceFormValues = {
+export interface CreateWorkspaceFormValues {
   name: string;
-};
+}
 
 export const createWorkspaceSubmitHandler = async (
   values: CreateWorkspaceFormValues,
diff --git a/app/client/src/ce/reducers/uiReducers/applicationsReducer.tsx b/app/client/src/ce/reducers/uiReducers/applicationsReducer.tsx
index f96cff7052..88978b7a38 100644
--- a/app/client/src/ce/reducers/uiReducers/applicationsReducer.tsx
+++ b/app/client/src/ce/reducers/uiReducers/applicationsReducer.tsx
@@ -822,10 +822,10 @@ const applicationsReducer = createReducer(initialState, handlers);
 
 export type creatingApplicationMap = Record<string, boolean>;
 
-export type DeletingMultipleApps = {
+export interface DeletingMultipleApps {
   list?: string[];
   isDeleting?: boolean;
-};
+}
 
 export interface ApplicationsReduxState {
   applicationList: ApplicationPayload[];
diff --git a/app/client/src/ce/reducers/uiReducers/editorContextReducer.ts b/app/client/src/ce/reducers/uiReducers/editorContextReducer.ts
index 8b309e71ed..60a246d636 100644
--- a/app/client/src/ce/reducers/uiReducers/editorContextReducer.ts
+++ b/app/client/src/ce/reducers/uiReducers/editorContextReducer.ts
@@ -7,35 +7,35 @@ export enum CursorPositionOrigin {
   LastFocus = "LastFocus",
 }
 
-export type CursorPosition = {
+export interface CursorPosition {
   line: number;
   ch: number;
   origin: CursorPositionOrigin;
-};
+}
 
-export type EvaluatedPopupState = {
+export interface EvaluatedPopupState {
   type: boolean;
   example: boolean;
   value: boolean;
-};
+}
 
-export type CodeEditorContext = {
+export interface CodeEditorContext {
   cursorPosition?: CursorPosition;
   evalPopupState?: EvaluatedPopupState;
-};
+}
 
-export type PropertyPanelContext = {
+export interface PropertyPanelContext {
   propertySectionState: Record<string, boolean>;
   selectedPropertyTabIndex: number;
-};
+}
 
-export type PropertyPanelState = {
+export interface PropertyPanelState {
   [key: string]: PropertyPanelContext;
-};
+}
 
 export type CodeEditorHistory = Record<string, CodeEditorContext>;
 
-export type EditorContextState = {
+export interface EditorContextState {
   entityCollapsibleFields: Record<string, boolean>;
   subEntityCollapsibleFields: Record<string, boolean>;
   explorerSwitchIndex: number;
@@ -44,7 +44,7 @@ export type EditorContextState = {
   propertySectionState: Record<string, boolean>;
   selectedPropertyTabIndex: number;
   propertyPanelState: PropertyPanelState;
-};
+}
 
 export const initialState: EditorContextState = {
   codeEditorHistory: {},
diff --git a/app/client/src/ce/sagas/ActionExecution/ActionExecutionSagas.ts b/app/client/src/ce/sagas/ActionExecution/ActionExecutionSagas.ts
index 1e2fd6ad96..c2541d9720 100644
--- a/app/client/src/ce/sagas/ActionExecution/ActionExecutionSagas.ts
+++ b/app/client/src/ce/sagas/ActionExecution/ActionExecutionSagas.ts
@@ -45,11 +45,11 @@ import type { ActionDescription } from "@appsmith/workers/Evaluation/fns";
 import { getActionById } from "selectors/editorSelectors";
 import type { AppState } from "@appsmith/reducers";
 
-export type TriggerMeta = {
+export interface TriggerMeta {
   source?: TriggerSource;
   triggerPropertyName?: string;
   triggerKind?: TriggerKind;
-};
+}
 
 /**
  * The controller saga that routes different trigger effects to its executor sagas
diff --git a/app/client/src/ce/sagas/ApplicationSagas.tsx b/app/client/src/ce/sagas/ApplicationSagas.tsx
index 0f49425f24..cf02903b54 100644
--- a/app/client/src/ce/sagas/ApplicationSagas.tsx
+++ b/app/client/src/ce/sagas/ApplicationSagas.tsx
@@ -103,7 +103,7 @@ import {
 import { failFastApiCalls } from "sagas/InitSagas";
 import type { Datasource } from "entities/Datasource";
 import { GUIDED_TOUR_STEPS } from "pages/Editor/GuidedTour/constants";
-import { builderURL, viewerURL } from "RouteBuilder";
+import { builderURL, viewerURL } from "@appsmith/RouteBuilder";
 import { getDefaultPageId as selectDefaultPageId } from "sagas/selectors";
 import PageApi from "api/PageApi";
 import { identity, isEmpty, merge, pickBy } from "lodash";
@@ -260,10 +260,13 @@ export function* fetchAppAndPagesSaga(
     const isValidResponse: boolean = yield call(validateResponse, response);
     if (isValidResponse) {
       const prevPagesState: Page[] = yield select(getPageList);
-      const pagePermissionsMap = prevPagesState.reduce((acc, page) => {
-        acc[page.pageId] = page.userPermissions ?? [];
-        return acc;
-      }, {} as Record<string, string[]>);
+      const pagePermissionsMap = prevPagesState.reduce(
+        (acc, page) => {
+          acc[page.pageId] = page.userPermissions ?? [];
+          return acc;
+        },
+        {} as Record<string, string[]>,
+      );
       yield put({
         type: ReduxActionTypes.FETCH_APPLICATION_SUCCESS,
         payload: { ...response.data.application, pages: response.data.pages },
@@ -693,8 +696,10 @@ export function* forkApplicationSaga(
           workspaceId: action.payload.workspaceId,
         },
       });
+
       const pageURL = builderURL({
         pageId: application.defaultPageId as string,
+        params: { branch: null },
       });
 
       if (action.payload.editMode) {
@@ -921,9 +926,8 @@ export function* initializeDatasourceWithDefaultValues(datasource: Datasource) {
       datasource.datasourceStorages[currentEnvironment],
     );
     payload.isConfigured = false; // imported datasource as not configured yet
-    const response: ApiResponse = yield DatasourcesApi.updateDatasourceStorage(
-      payload,
-    );
+    const response: ApiResponse =
+      yield DatasourcesApi.updateDatasourceStorage(payload);
     const isValidResponse: boolean = yield validateResponse(response);
     if (isValidResponse) {
       yield put({
diff --git a/app/client/src/ce/sagas/SuperUserSagas.tsx b/app/client/src/ce/sagas/SuperUserSagas.tsx
index ad907d313c..0ef6294012 100644
--- a/app/client/src/ce/sagas/SuperUserSagas.tsx
+++ b/app/client/src/ce/sagas/SuperUserSagas.tsx
@@ -5,10 +5,7 @@ import {
   ReduxActionErrorTypes,
   ReduxActionTypes,
 } from "@appsmith/constants/ReduxActionConstants";
-import {
-  APPLICATIONS_URL,
-  WORKSPACE_SETTINGS_BILLING_PAGE_URL,
-} from "constants/routes";
+import { APPLICATIONS_URL } from "constants/routes";
 import type { User } from "constants/userConstants";
 import { call, put, delay, select } from "redux-saga/effects";
 import history from "utils/history";
@@ -41,7 +38,7 @@ export function* FetchAdminSettingsSaga() {
   const isValidResponse: boolean = yield validateResponse(response);
 
   if (isValidResponse) {
-    const { appVersion, cloudHosting } = getAppsmithConfigs();
+    const { appVersion } = getAppsmithConfigs();
     const settings = {
       //@ts-expect-error: response is of type unknown
       ...response.data,
@@ -49,7 +46,6 @@ export function* FetchAdminSettingsSaga() {
         APPSMITH_DISPLAY_VERSION,
         appVersion.edition,
         appVersion.id,
-        cloudHosting,
       ),
     };
 
@@ -150,7 +146,7 @@ export function* RestartServerPoll() {
   yield call(RestryRestartServerPoll);
 }
 
-export function* RestryRestartServerPoll(isMigration = false) {
+export function* RestryRestartServerPoll() {
   let pollCount = 0;
   const maxPollCount = RESTART_POLL_TIMEOUT / RESTART_POLL_INTERVAL;
   while (pollCount < maxPollCount) {
@@ -165,8 +161,7 @@ export function* RestryRestartServerPoll(isMigration = false) {
         response.data?.tenantConfiguration?.migrationStatus ===
           MIGRATION_STATUS.COMPLETED
       ) {
-        if (!isMigration) window.location.reload();
-        else location.href = WORKSPACE_SETTINGS_BILLING_PAGE_URL;
+        window.location.reload();
       }
     } catch (e) {}
   }
diff --git a/app/client/src/ce/sagas/WorkspaceSagas.ts b/app/client/src/ce/sagas/WorkspaceSagas.ts
index 12efda80a1..097b5e4904 100644
--- a/app/client/src/ce/sagas/WorkspaceSagas.ts
+++ b/app/client/src/ce/sagas/WorkspaceSagas.ts
@@ -273,9 +273,8 @@ export function* createWorkspaceSaga(
     );
     const isValidResponse: boolean = yield validateResponse(response);
     if (!isValidResponse) {
-      const errorMessage: string | undefined = yield getResponseErrorMessage(
-        response,
-      );
+      const errorMessage: string | undefined =
+        yield getResponseErrorMessage(response);
       yield call(reject, { _error: errorMessage });
     } else {
       yield put({
diff --git a/app/client/src/ce/sagas/analyticsSaga.ts b/app/client/src/ce/sagas/analyticsSaga.ts
index e6460ee5dc..769ef7d71c 100644
--- a/app/client/src/ce/sagas/analyticsSaga.ts
+++ b/app/client/src/ce/sagas/analyticsSaga.ts
@@ -44,12 +44,10 @@ export function* getUserAndAppDetails() {
     getCurrentApplication,
   );
   const user: ReturnType<typeof getCurrentUser> = yield select(getCurrentUser);
-  const instanceId: ReturnType<typeof getInstanceId> = yield select(
-    getInstanceId,
-  );
-  const pageId: ReturnType<typeof getCurrentPageId> = yield select(
-    getCurrentPageId,
-  );
+  const instanceId: ReturnType<typeof getInstanceId> =
+    yield select(getInstanceId);
+  const pageId: ReturnType<typeof getCurrentPageId> =
+    yield select(getCurrentPageId);
   const userAndAppDetails: UserAndAppDetails = {
     pageId,
     appId: currentApp?.id || "",
diff --git a/app/client/src/ce/sagas/userSagas.tsx b/app/client/src/ce/sagas/userSagas.tsx
index 957fc49a9e..a9baf0d892 100644
--- a/app/client/src/ce/sagas/userSagas.tsx
+++ b/app/client/src/ce/sagas/userSagas.tsx
@@ -38,6 +38,7 @@ import {
   fetchFeatureFlagsError,
   fetchProductAlertSuccess,
   fetchProductAlertFailure,
+  fetchFeatureFlagsInit,
 } from "actions/userActions";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import { INVITE_USERS_TO_WORKSPACE_FORM } from "@appsmith/constants/forms";
@@ -53,7 +54,10 @@ import {
 import localStorage from "utils/localStorage";
 import log from "loglevel";
 
-import { getCurrentUser } from "selectors/usersSelectors";
+import {
+  getCurrentUser,
+  getFeatureFlagsFetched,
+} from "selectors/usersSelectors";
 import {
   initAppLevelSocketConnection,
   initPageLevelSocketConnection,
@@ -85,6 +89,7 @@ import type {
   ProductAlert,
   ProductAlertConfig,
 } from "reducers/uiReducers/usersReducer";
+import { selectFeatureFlags } from "@appsmith/selectors/featureFlagsSelectors";
 
 export function* createUserSaga(
   action: ReduxActionWithPromise<CreateUserRequest>,
@@ -196,12 +201,25 @@ export function* runUserSideEffectsSaga() {
     enableTelemetry && AnalyticsUtil.identifyUser(currentUser);
   }
 
+  const isFFFetched: boolean = yield select(getFeatureFlagsFetched);
+  if (!isFFFetched) {
+    yield call(fetchFeatureFlagsInit);
+    yield take(ReduxActionTypes.FETCH_FEATURE_FLAGS_SUCCESS);
+  }
+
+  const featureFlags: FeatureFlags = yield select(selectFeatureFlags);
+
+  const isGACEnabled = featureFlags?.license_gac_enabled;
+
+  const isFreeLicense = !isGACEnabled;
+
   if (!isAirgappedInstance) {
     // We need to stop and start tracking activity to ensure that the tracking from previous session is not carried forward
     UsagePulse.stopTrackingActivity();
     UsagePulse.startTrackingActivity(
       enableTelemetry && getAppsmithConfigs().segment.enabled,
       currentUser?.isAnonymous ?? false,
+      isFreeLicense,
     );
   }
 
@@ -228,9 +246,8 @@ export function* forgotPasswordSaga(
     );
     const isValidResponse: boolean = yield validateResponse(response);
     if (!isValidResponse) {
-      const errorMessage: string | undefined = yield getResponseErrorMessage(
-        response,
-      );
+      const errorMessage: string | undefined =
+        yield getResponseErrorMessage(response);
       yield call(reject, { _error: errorMessage });
     } else {
       yield put({
@@ -260,9 +277,8 @@ export function* resetPasswordSaga(
     const response: ApiResponse = yield callAPI(UserApi.resetPassword, request);
     const isValidResponse: boolean = yield validateResponse(response);
     if (!isValidResponse) {
-      const errorMessage: string | undefined = yield getResponseErrorMessage(
-        response,
-      );
+      const errorMessage: string | undefined =
+        yield getResponseErrorMessage(response);
       yield call(reject, { _error: errorMessage });
     } else {
       yield put({
@@ -294,9 +310,8 @@ export function* invitedUserSignupSaga(
     );
     const isValidResponse: boolean = yield validateResponse(response);
     if (!isValidResponse) {
-      const errorMessage: string | undefined = yield getResponseErrorMessage(
-        response,
-      );
+      const errorMessage: string | undefined =
+        yield getResponseErrorMessage(response);
       yield call(reject, { _error: errorMessage });
     } else {
       yield put(invitedUserSignupSuccess());
@@ -309,10 +324,10 @@ export function* invitedUserSignupSaga(
   }
 }
 
-type InviteUserPayload = {
+interface InviteUserPayload {
   email: string;
   permissionGroupId: string;
-};
+}
 
 export function* inviteUser(payload: InviteUserPayload, reject: any) {
   const response: ApiResponse = yield callAPI(UserApi.inviteUser, payload);
diff --git a/app/client/src/ce/selectors/entitiesSelector.ts b/app/client/src/ce/selectors/entitiesSelector.ts
index e7c414f902..35aa61a050 100644
--- a/app/client/src/ce/selectors/entitiesSelector.ts
+++ b/app/client/src/ce/selectors/entitiesSelector.ts
@@ -860,10 +860,13 @@ export const getPageActions = (pageId = "") => {
 export const selectDatasourceIdToNameMap = createSelector(
   getDatasources,
   (datasources) => {
-    return datasources.reduce((acc, datasource) => {
-      acc[datasource.id] = datasource.name;
-      return acc;
-    }, {} as Record<string, string>);
+    return datasources.reduce(
+      (acc, datasource) => {
+        acc[datasource.id] = datasource.name;
+        return acc;
+      },
+      {} as Record<string, string>,
+    );
   },
 );
 
@@ -1185,9 +1188,8 @@ export const getDatasourceScopeValue = (
   const options = formConfig[0]?.children?.find(
     (child: any) => child?.configProperty === configProperty,
   )?.options;
-  const label = options?.find(
-    (option: any) => option.value === scopeValue,
-  )?.label;
+  const label = options?.find((option: any) => option.value === scopeValue)
+    ?.label;
   return label;
 };
 
diff --git a/app/client/src/ce/selectors/tenantSelectors.tsx b/app/client/src/ce/selectors/tenantSelectors.tsx
index 429d91d99e..d74c446251 100644
--- a/app/client/src/ce/selectors/tenantSelectors.tsx
+++ b/app/client/src/ce/selectors/tenantSelectors.tsx
@@ -48,3 +48,9 @@ export const getIsFormLoginEnabled = (state: AppState): boolean =>
 
 export const getInstanceId = (state: AppState): string =>
   state.tenant?.instanceId;
+
+// eslint-disable-next-line
+export const shouldShowLicenseBanner = (state: AppState) => false;
+
+export const getHideWatermark = (state: AppState): boolean =>
+  state.tenant?.tenantConfiguration?.hideWatermark;
diff --git a/app/client/src/ce/workers/Evaluation/Actions.ts b/app/client/src/ce/workers/Evaluation/Actions.ts
index 03d4d128a4..3dc9b0d46b 100644
--- a/app/client/src/ce/workers/Evaluation/Actions.ts
+++ b/app/client/src/ce/workers/Evaluation/Actions.ts
@@ -1,12 +1,12 @@
 /* eslint-disable @typescript-eslint/ban-types */
 
 import set from "lodash/set";
+import type { DataTreeEntityConfig } from "@appsmith/entities/DataTree/types";
 import type {
   ConfigTree,
   DataTree,
   DataTreeEntity,
-  DataTreeEntityConfig,
-} from "@appsmith/entities/DataTree/types";
+} from "entities/DataTree/dataTreeTypes";
 import type { EvalContext } from "workers/Evaluation/evaluate";
 import type { EvaluationVersion } from "@appsmith/api/ApplicationApi";
 import { addFn } from "workers/Evaluation/fns/utils/fnGuard";
@@ -113,7 +113,7 @@ export const addDataTreeToContext = (args: {
 };
 
 export const addPlatformFunctionsToEvalContext = (context: any) => {
-  for (const fnDef of getPlatformFunctions(self.$cloudHosting)) {
+  for (const fnDef of getPlatformFunctions()) {
     addFn(context, fnDef.name, fnDef.fn.bind(context));
   }
 };
@@ -174,7 +174,7 @@ export const getAllAsyncFunctions = (
   }
   const setterMethods = getAllSetterFunctions(dataTree, configTree);
   allAsyncFunctions = { ...allAsyncFunctions, ...setterMethods };
-  for (const platformFn of getPlatformFunctions(self.$cloudHosting)) {
+  for (const platformFn of getPlatformFunctions()) {
     allAsyncFunctions[platformFn.name] = true;
   }
   return allAsyncFunctions;
diff --git a/app/client/src/ce/workers/Evaluation/__tests__/dataTreeUtils.test.ts b/app/client/src/ce/workers/Evaluation/__tests__/dataTreeUtils.test.ts
index 08742a7a71..4d0af2cc54 100644
--- a/app/client/src/ce/workers/Evaluation/__tests__/dataTreeUtils.test.ts
+++ b/app/client/src/ce/workers/Evaluation/__tests__/dataTreeUtils.test.ts
@@ -1,4 +1,4 @@
-import type { DataTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { makeEntityConfigsAsObjProperties } from "@appsmith/workers/Evaluation/dataTreeUtils";
 import { smallDataSet } from "workers/Evaluation/__tests__/generateOpimisedUpdates.test";
 import produce from "immer";
diff --git a/app/client/src/ce/workers/Evaluation/dataTreeUtils.ts b/app/client/src/ce/workers/Evaluation/dataTreeUtils.ts
index f5ea3b6fe5..814aaf2be2 100644
--- a/app/client/src/ce/workers/Evaluation/dataTreeUtils.ts
+++ b/app/client/src/ce/workers/Evaluation/dataTreeUtils.ts
@@ -1,4 +1,4 @@
-import type { DataTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { get, isObject, set, unset } from "lodash";
 import { klona } from "klona/json";
 import type { EvalProps } from "workers/common/DataTreeEvaluator";
diff --git a/app/client/src/ce/workers/Evaluation/evaluationUtils.test.ts b/app/client/src/ce/workers/Evaluation/evaluationUtils.test.ts
index 543dca900c..538663cf19 100644
--- a/app/client/src/ce/workers/Evaluation/evaluationUtils.test.ts
+++ b/app/client/src/ce/workers/Evaluation/evaluationUtils.test.ts
@@ -4,19 +4,20 @@ import { RenderModes } from "constants/WidgetConstants";
 import { ValidationTypes } from "constants/WidgetValidation";
 
 import type {
-  ConfigTree,
-  DataTreeEntity,
   WidgetEntity,
   WidgetEntityConfig,
+  PrivateWidgets,
+  JSActionEntity,
 } from "@appsmith/entities/DataTree/types";
 import {
   ENTITY_TYPE_VALUE,
   EvaluationSubstitutionType,
 } from "entities/DataTree/dataTreeFactory";
 import type {
-  PrivateWidgets,
-  JSActionEntity,
-} from "@appsmith/entities/DataTree/types";
+  ConfigTree,
+  DataTreeEntity,
+  DataTree,
+} from "entities/DataTree/dataTreeTypes";
 import type { DataTreeDiff } from "@appsmith/workers/Evaluation/evaluationUtils";
 import {
   addErrorToEntityProperty,
@@ -36,7 +37,6 @@ import {
   overrideWidgetProperties,
   findDatatype,
 } from "@appsmith/workers/Evaluation/evaluationUtils";
-import type { DataTree } from "@appsmith/entities/DataTree/types";
 import type { EvalMetaUpdates } from "@appsmith/workers/common/DataTreeEvaluator/types";
 import { generateDataTreeWidget } from "entities/DataTree/dataTreeWidget";
 import TableWidget from "widgets/TableWidget";
diff --git a/app/client/src/ce/workers/Evaluation/evaluationUtils.ts b/app/client/src/ce/workers/Evaluation/evaluationUtils.ts
index 409511eac7..c48595c2b8 100644
--- a/app/client/src/ce/workers/Evaluation/evaluationUtils.ts
+++ b/app/client/src/ce/workers/Evaluation/evaluationUtils.ts
@@ -9,28 +9,28 @@ import {
 } from "utils/DynamicBindingUtils";
 import type { Diff } from "deep-diff";
 import type {
-  DataTree,
-  AppsmithEntity,
   DataTreeEntity,
-  WidgetEntity,
-  DataTreeEntityConfig,
+  DataTree,
   ConfigTree,
-  WidgetEntityConfig,
-} from "@appsmith/entities/DataTree/types";
+} from "entities/DataTree/dataTreeTypes";
 import { ENTITY_TYPE_VALUE } from "@appsmith/entities/DataTree/types";
-import _, { difference, find, get, has, isNil, set } from "lodash";
+import _, { difference, find, get, has, isEmpty, isNil, set } from "lodash";
 import type { WidgetTypeConfigMap } from "WidgetProvider/factory";
 import { PluginType } from "entities/Action";
 import { klona } from "klona/full";
 import { warn as logWarn } from "loglevel";
 import type { EvalMetaUpdates } from "@appsmith/workers/common/DataTreeEvaluator/types";
 import { isObject } from "lodash";
-import type { DataTreeEntityObject } from "@appsmith/entities/DataTree/types";
 import type {
   JSActionEntityConfig,
   PrivateWidgets,
   JSActionEntity,
   ActionEntity,
+  AppsmithEntity,
+  WidgetEntity,
+  DataTreeEntityConfig,
+  WidgetEntityConfig,
+  DataTreeEntityObject,
 } from "@appsmith/entities/DataTree/types";
 import type { EvalProps } from "workers/common/DataTreeEvaluator";
 import { validateWidgetProperty } from "workers/common/DataTreeEvaluator/validationUtils";
@@ -47,13 +47,13 @@ export enum DataTreeDiffEvent {
   NOOP = "NOOP", // No Operation (don’t do anything)
 }
 
-export type DataTreeDiff = {
+export interface DataTreeDiff {
   payload: {
     propertyPath: string;
     value?: string;
   };
   event: DataTreeDiffEvent;
-};
+}
 
 export class CrashingError extends Error {}
 
@@ -656,7 +656,8 @@ export const isDynamicLeaf = (
     return false;
   const relativePropertyPath = convertPathToString(propPathEls);
   return (
-    relativePropertyPath in entityConfig.reactivePaths ||
+    (!isEmpty(entityConfig.reactivePaths) &&
+      relativePropertyPath in entityConfig.reactivePaths) ||
     (isWidget(entityConfig) &&
       relativePropertyPath in entityConfig?.triggerPaths)
   );
@@ -782,6 +783,7 @@ export const overrideWidgetProperties = (params: {
   isNewWidget: boolean;
   shouldUpdateGlobalContext?: boolean;
   overriddenProperties?: string[];
+  safeTree?: DataTree;
 }) => {
   const {
     configTree,
@@ -792,14 +794,15 @@ export const overrideWidgetProperties = (params: {
     isNewWidget,
     overriddenProperties,
     propertyPath,
+    safeTree,
     shouldUpdateGlobalContext,
     value,
   } = params;
-  const clonedValue = klona(value);
   const { entityName } = getEntityNameAndPropertyPath(fullPropertyPath);
 
   const configEntity = configTree[entityName] as WidgetEntityConfig;
   if (propertyPath in configEntity.overridingPropertyPaths) {
+    const clonedValue = klona(value);
     const overridingPropertyPaths =
       configEntity.overridingPropertyPaths[propertyPath];
 
@@ -812,14 +815,12 @@ export const overrideWidgetProperties = (params: {
     overridingPropertyPaths.forEach((overriddenPropertyPath) => {
       const overriddenPropertyPathArray = overriddenPropertyPath.split(".");
       if (pathsNotToOverride.includes(overriddenPropertyPath)) return;
-      _.set(
-        currentTree,
-        [entityName, ...overriddenPropertyPathArray],
-        clonedValue,
-      );
+      const fullPath = [entityName, ...overriddenPropertyPathArray];
+      _.set(currentTree, fullPath, clonedValue);
+      if (safeTree) _.set(safeTree, fullPath, klona(value));
 
       if (shouldUpdateGlobalContext) {
-        _.set(self, [entityName, ...overriddenPropertyPathArray], clonedValue);
+        _.set(self, fullPath, clonedValue);
       }
       overriddenProperties?.push(overriddenPropertyPath);
       // evalMetaUpdates has all updates from property which overrides meta values.
@@ -837,7 +838,7 @@ export const overrideWidgetProperties = (params: {
     });
   } else if (
     propertyPath in configEntity.propertyOverrideDependency &&
-    clonedValue === undefined
+    value === undefined
   ) {
     // When a reset a widget its meta value becomes undefined, ideally they should reset to default value.
     // below we handle logic to reset meta values to default values.
@@ -845,17 +846,14 @@ export const overrideWidgetProperties = (params: {
       configEntity.propertyOverrideDependency[propertyPath];
     if (propertyOverridingKeyMap.DEFAULT) {
       const defaultValue = entity[propertyOverridingKeyMap.DEFAULT];
-      const clonedDefaultValue = klona(defaultValue);
       if (defaultValue !== undefined) {
-        const propertyPathArray = propertyPath.split(".");
-        _.set(
-          currentTree,
-          [entityName, ...propertyPathArray],
-          clonedDefaultValue,
-        );
+        const clonedDefaultValue = klona(defaultValue);
+        const fullPath = [entityName, ...propertyPath.split(".")];
+        _.set(currentTree, fullPath, clonedDefaultValue);
+        if (safeTree) _.set(safeTree, fullPath, klona(defaultValue));
 
         if (shouldUpdateGlobalContext) {
-          _.set(self, [entityName, ...propertyPathArray], clonedDefaultValue);
+          _.set(self, fullPath, clonedDefaultValue);
         }
 
         return {
@@ -866,14 +864,16 @@ export const overrideWidgetProperties = (params: {
     }
   }
 };
+
 export function isValidEntity(
   entity: DataTreeEntity,
 ): entity is DataTreeEntityObject {
   if (!isObject(entity)) {
     return false;
   }
-  return "ENTITY_TYPE" in entity;
+  return true;
 }
+
 export const isATriggerPath = (
   entityConfig: DataTreeEntityConfig,
   propertyPath: string,
diff --git a/app/client/src/components/BottomBar/components.ts b/app/client/src/components/BottomBar/components.ts
new file mode 100644
index 0000000000..26d1bc7150
--- /dev/null
+++ b/app/client/src/components/BottomBar/components.ts
@@ -0,0 +1,19 @@
+import styled from "styled-components";
+import { Layers } from "constants/Layers";
+
+export const Container = styled.div`
+  width: 100%;
+  height: ${(props) => props.theme.bottomBarHeight};
+  display: flex;
+  position: fixed;
+  justify-content: space-between;
+  background-color: ${(props) => props.theme.colors.editorBottomBar.background};
+  z-index: ${Layers.bottomBar};
+  border-top: solid 1px var(--ads-v2-color-border);
+`;
+
+export const Wrapper = styled.div`
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+`;
diff --git a/app/client/src/components/BottomBar/index.tsx b/app/client/src/components/BottomBar/index.tsx
index 742733dbe3..26eca910ad 100644
--- a/app/client/src/components/BottomBar/index.tsx
+++ b/app/client/src/components/BottomBar/index.tsx
@@ -1,29 +1,11 @@
 import React from "react";
-import styled from "styled-components";
 import QuickGitActions from "pages/Editor/gitSync/QuickGitActions";
-import { Layers } from "constants/Layers";
 import { DebuggerTrigger } from "components/editorComponents/Debugger";
 import HelpButton from "pages/Editor/HelpButton";
 import ManualUpgrades from "./ManualUpgrades";
 import { Button } from "design-system";
 import SwitchEnvironment from "@appsmith/components/SwitchEnvironment";
-
-const Container = styled.div`
-  width: 100%;
-  height: ${(props) => props.theme.bottomBarHeight};
-  display: flex;
-  position: fixed;
-  justify-content: space-between;
-  background-color: ${(props) => props.theme.colors.editorBottomBar.background};
-  z-index: ${Layers.bottomBar};
-  border-top: solid 1px var(--ads-v2-color-border);
-`;
-
-const Wrapper = styled.div`
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-`;
+import { Container, Wrapper } from "./components";
 
 export default function BottomBar({ viewMode }: { viewMode: boolean }) {
   return (
diff --git a/app/client/src/components/Sidebar/SidebarButton.tsx b/app/client/src/components/Sidebar/SidebarButton.tsx
new file mode 100644
index 0000000000..91f90b8438
--- /dev/null
+++ b/app/client/src/components/Sidebar/SidebarButton.tsx
@@ -0,0 +1,42 @@
+import React from "react";
+import { Icon, Text } from "design-system";
+import styled from "styled-components";
+
+interface Props {
+  title: string;
+  selected: boolean;
+  icon: string;
+}
+
+const Container = styled.div`
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  height: 64px;
+  width: 50px;
+  text-align: center;
+  align-items: center;
+  gap: 5px;
+`;
+
+const IconContainer = styled.div<{ selected: boolean }>`
+  padding: 2px;
+  background-color: ${(props) =>
+    props.selected ? "var(--ads-v2-color-bg-muted)" : "white"};
+  border-radius: 3px;
+  width: 28px;
+  cursor: pointer;
+`;
+
+function SidebarButton(props: Props) {
+  return (
+    <Container>
+      <IconContainer selected={props.selected}>
+        <Icon name={props.icon} size="lg" />
+      </IconContainer>
+      <Text kind="body-s">{props.title}</Text>
+    </Container>
+  );
+}
+
+export default SidebarButton;
diff --git a/app/client/src/components/Sidebar/index.tsx b/app/client/src/components/Sidebar/index.tsx
new file mode 100644
index 0000000000..0552130249
--- /dev/null
+++ b/app/client/src/components/Sidebar/index.tsx
@@ -0,0 +1,26 @@
+import React from "react";
+import { getIsAppSidebarEnabled } from "selectors/ideSelectors";
+import { useSelector } from "react-redux";
+import styled from "styled-components";
+import SidebarButton from "./SidebarButton";
+
+const Container = styled.div`
+  width: 50px;
+  border-right: 1px solid var(--ads-v2-color-border);
+  height: 100%;
+`;
+
+function Sidebar() {
+  const isAppSidebarEnabled = useSelector(getIsAppSidebarEnabled);
+  if (!isAppSidebarEnabled) {
+    return null;
+  }
+  return (
+    <Container className="z-[3]">
+      <SidebarButton icon="database-2-line" selected={false} title="Data" />
+      <SidebarButton icon="file-copy-2-line" selected title="Pages" />
+    </Container>
+  );
+}
+
+export default Sidebar;
diff --git a/app/client/src/components/TabItemBackgroundFill.tsx b/app/client/src/components/TabItemBackgroundFill.tsx
index c4d559be66..deb4e08220 100644
--- a/app/client/src/components/TabItemBackgroundFill.tsx
+++ b/app/client/src/components/TabItemBackgroundFill.tsx
@@ -4,11 +4,11 @@ import type { TabProp } from "design-system-old";
 import { getTypographyByKey } from "design-system-old";
 import type { Theme } from "constants/DefaultTheme";
 
-type WrapperProps = {
+interface WrapperProps {
   selected: boolean;
   vertical: boolean;
   theme: Theme;
-};
+}
 
 const getFocusedStyles = (props: WrapperProps) => `
   background-color: ${props.theme.colors.tabItemBackgroundFill.highlightBackground};
diff --git a/app/client/src/components/common/Card.tsx b/app/client/src/components/common/Card.tsx
index 663c29aaa0..22f8e253ab 100644
--- a/app/client/src/components/common/Card.tsx
+++ b/app/client/src/components/common/Card.tsx
@@ -29,12 +29,12 @@ type CardProps = PropsWithChildren<{
   isSelected?: boolean;
 }>;
 
-type NameWrapperProps = {
+interface NameWrapperProps {
   hasReadPermission: boolean;
   showOverlay: boolean;
   isContextMenuOpen: boolean;
   testId: string;
-};
+}
 
 type ModifiedMenuItemProps = MenuItemProps & {
   key?: string;
diff --git a/app/client/src/components/designSystems/appsmith/BaseButton.tsx b/app/client/src/components/designSystems/appsmith/BaseButton.tsx
index 1f235ec5be..3b5cbbc63d 100644
--- a/app/client/src/components/designSystems/appsmith/BaseButton.tsx
+++ b/app/client/src/components/designSystems/appsmith/BaseButton.tsx
@@ -274,7 +274,7 @@ const StyledButton = styled((props) => (
       : "none"} !important;
 `;
 
-type ButtonStyleProps = {
+interface ButtonStyleProps {
   buttonColor?: string;
   buttonStyle?: ButtonStyleType;
   prevButtonStyle?: ButtonStyleType;
@@ -283,7 +283,7 @@ type ButtonStyleProps = {
   borderRadius?: ButtonBorderRadius;
   iconName?: IconName;
   iconAlign?: Alignment;
-};
+}
 
 // To be used in any other part of the app
 export function BaseButton(props: IButtonProps & ButtonStyleProps) {
diff --git a/app/client/src/components/designSystems/appsmith/CloseButton.tsx b/app/client/src/components/designSystems/appsmith/CloseButton.tsx
index 93de5c88dd..e46fa63531 100644
--- a/app/client/src/components/designSystems/appsmith/CloseButton.tsx
+++ b/app/client/src/components/designSystems/appsmith/CloseButton.tsx
@@ -3,12 +3,12 @@ import styled from "styled-components";
 import type { Color } from "constants/Colors";
 import { Button } from "@blueprintjs/core";
 
-type CloseButtonProps = {
+interface CloseButtonProps {
   color: Color;
   size: number;
   onClick: React.MouseEventHandler;
   className?: string;
-};
+}
 
 const StyledButton = styled(Button)<CloseButtonProps>`
   position: absolute;
diff --git a/app/client/src/components/designSystems/appsmith/CreatableDropdown.tsx b/app/client/src/components/designSystems/appsmith/CreatableDropdown.tsx
index 6888ff3cd7..3e20d9c5c7 100644
--- a/app/client/src/components/designSystems/appsmith/CreatableDropdown.tsx
+++ b/app/client/src/components/designSystems/appsmith/CreatableDropdown.tsx
@@ -6,7 +6,7 @@ import type { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form";
 import { theme } from "constants/DefaultTheme";
 import type { SelectComponents } from "react-select/src/components";
 
-type DropdownProps = {
+interface DropdownProps {
   options: Array<{
     value: string;
     label: string;
@@ -21,7 +21,7 @@ type DropdownProps = {
   noOptionsMessage?: (obj: { inputValue: string }) => string;
   inputValue?: string;
   onInputChange: (value: string, actionMeta: InputActionMeta) => void;
-};
+}
 
 const selectStyles = {
   placeholder: (provided: any) => ({
diff --git a/app/client/src/components/designSystems/appsmith/DraggableListComponent.tsx b/app/client/src/components/designSystems/appsmith/DraggableListComponent.tsx
index 7f0a19a1b9..ed0f8341ca 100644
--- a/app/client/src/components/designSystems/appsmith/DraggableListComponent.tsx
+++ b/app/client/src/components/designSystems/appsmith/DraggableListComponent.tsx
@@ -11,7 +11,7 @@ const DroppableWrapper = styled.div`
   width: 250px;
 `;
 
-type RenderComponentProps = {
+interface RenderComponentProps {
   index: number;
   item: {
     label: string;
@@ -22,7 +22,7 @@ type RenderComponentProps = {
   updateOption: (index: number, value: string) => void;
   toggleVisibility?: (index: number) => void;
   onEdit?: (index: number) => void;
-};
+}
 
 interface DroppableComponentProps {
   items: Array<Record<string, unknown>>;
diff --git a/app/client/src/components/designSystems/appsmith/Dropdown.tsx b/app/client/src/components/designSystems/appsmith/Dropdown.tsx
index 1472cd8501..1906a41b9f 100644
--- a/app/client/src/components/designSystems/appsmith/Dropdown.tsx
+++ b/app/client/src/components/designSystems/appsmith/Dropdown.tsx
@@ -6,7 +6,7 @@ import type { SelectComponentsConfig } from "react-select/src/components";
 import { LayersContext } from "constants/Layers";
 import { Colors } from "constants/Colors";
 
-export type DropdownProps = {
+export interface DropdownProps {
   options: Array<{
     value: string;
     label?: string;
@@ -19,7 +19,7 @@ export type DropdownProps = {
   customSelectStyles?: any;
   maxMenuHeight: number;
   components?: SelectComponentsConfig<any>;
-};
+}
 
 const selectStyles = {
   placeholder: (provided: any) => ({
diff --git a/app/client/src/components/designSystems/appsmith/ModalComponent.tsx b/app/client/src/components/designSystems/appsmith/ModalComponent.tsx
index 3d56415e43..f3521ae895 100644
--- a/app/client/src/components/designSystems/appsmith/ModalComponent.tsx
+++ b/app/client/src/components/designSystems/appsmith/ModalComponent.tsx
@@ -58,7 +58,7 @@ const Content = styled.div<{
   height: ${(props) => (props.height ? `${props.height}px` : "auto")};
 `;
 
-export type ModalComponentProps = {
+export interface ModalComponentProps {
   isOpen: boolean;
   onClose: (e: any) => void;
   onModalClose?: () => void;
@@ -77,7 +77,7 @@ export type ModalComponentProps = {
   hasBackDrop?: boolean;
   zIndex?: number;
   portalClassName?: string;
-};
+}
 
 /* eslint-disable react/display-name */
 export function ModalComponent(props: ModalComponentProps) {
diff --git a/app/client/src/components/designSystems/appsmith/PositionedContainer.tsx b/app/client/src/components/designSystems/appsmith/PositionedContainer.tsx
index 631bcca3b3..2578241646 100644
--- a/app/client/src/components/designSystems/appsmith/PositionedContainer.tsx
+++ b/app/client/src/components/designSystems/appsmith/PositionedContainer.tsx
@@ -30,7 +30,7 @@ const PositionedWidget = styled.div<{
     z-index: ${(props) => props.zIndexOnHover} !important;
   }
 `;
-export type PositionedContainerProps = {
+export interface PositionedContainerProps {
   componentWidth: number;
   componentHeight: number;
   children: ReactNode;
@@ -48,7 +48,7 @@ export type PositionedContainerProps = {
   isDisabled?: boolean;
   isVisible?: boolean;
   widgetName: string;
-};
+}
 
 export function PositionedContainer(
   props: PositionedContainerProps,
diff --git a/app/client/src/components/designSystems/appsmith/SignPostingBanner.tsx b/app/client/src/components/designSystems/appsmith/SignPostingBanner.tsx
index 3bb836c4ba..258a04a9d5 100644
--- a/app/client/src/components/designSystems/appsmith/SignPostingBanner.tsx
+++ b/app/client/src/components/designSystems/appsmith/SignPostingBanner.tsx
@@ -3,10 +3,10 @@ import type { ReactNode } from "react";
 import styled from "styled-components";
 import { Icon } from "design-system";
 
-export type SignPostingBannerProps = {
+export interface SignPostingBannerProps {
   iconName: string;
   content: ReactNode;
-};
+}
 
 export const Container = styled.div`
   background-color: var(--ads-v2-color-blue-100);
diff --git a/app/client/src/components/designSystems/appsmith/TabbedView.tsx b/app/client/src/components/designSystems/appsmith/TabbedView.tsx
index 450d748144..7e3ccf26c9 100644
--- a/app/client/src/components/designSystems/appsmith/TabbedView.tsx
+++ b/app/client/src/components/designSystems/appsmith/TabbedView.tsx
@@ -38,7 +38,7 @@ const TabsWrapper = styled.div<{ shouldOverflow?: boolean }>`
   }
 `;
 
-type TabbedViewComponentType = {
+interface TabbedViewComponentType {
   tabs: Array<{
     key: string;
     title: string;
@@ -47,7 +47,7 @@ type TabbedViewComponentType = {
   selectedIndex?: number;
   setSelectedIndex?: (selectedIndex: number) => void;
   overflow?: boolean;
-};
+}
 
 export function BaseTabbedView(props: TabbedViewComponentType) {
   return (
diff --git a/app/client/src/components/designSystems/appsmith/header/DeployLinkButton.tsx b/app/client/src/components/designSystems/appsmith/header/DeployLinkButton.tsx
index d2113a283f..8853985a15 100644
--- a/app/client/src/components/designSystems/appsmith/header/DeployLinkButton.tsx
+++ b/app/client/src/components/designSystems/appsmith/header/DeployLinkButton.tsx
@@ -13,10 +13,10 @@ import {
 import { Button } from "design-system";
 import { KBEditorMenuItem } from "@appsmith/pages/Editor/KnowledgeBase/KBEditorMenuItem";
 
-type Props = {
+interface Props {
   trigger: ReactNode;
   link: string;
-};
+}
 
 export const DeployLinkButton = (props: Props) => {
   const dispatch = useDispatch();
diff --git a/app/client/src/components/designSystems/appsmith/header/ThreeDotsLoading.tsx b/app/client/src/components/designSystems/appsmith/header/ThreeDotsLoading.tsx
index 354e67999a..dea0d2ab7c 100644
--- a/app/client/src/components/designSystems/appsmith/header/ThreeDotsLoading.tsx
+++ b/app/client/src/components/designSystems/appsmith/header/ThreeDotsLoading.tsx
@@ -52,9 +52,9 @@ const Spinner = styled.div`
   }
 `;
 
-type Props = {
+interface Props {
   className?: string;
-};
+}
 
 function ThreeDotLoading(props: Props) {
   return (
diff --git a/app/client/src/components/editorComponents/ActionCreator/helpers.tsx b/app/client/src/components/editorComponents/ActionCreator/helpers.tsx
index d5de020d2f..c534fe3f04 100644
--- a/app/client/src/components/editorComponents/ActionCreator/helpers.tsx
+++ b/app/client/src/components/editorComponents/ActionCreator/helpers.tsx
@@ -60,7 +60,7 @@ import {
   isAction,
   isJSAction,
 } from "@appsmith/workers/Evaluation/evaluationUtils";
-import type { DataTreeEntity } from "@appsmith/entities/DataTree/types";
+import type { DataTreeEntity } from "entities/DataTree/dataTreeTypes";
 
 const actionList: {
   label: string;
diff --git a/app/client/src/components/editorComponents/ActionCreator/types.ts b/app/client/src/components/editorComponents/ActionCreator/types.ts
index b3e9a1e6d3..cff39c8abb 100644
--- a/app/client/src/components/editorComponents/ActionCreator/types.ts
+++ b/app/client/src/components/editorComponents/ActionCreator/types.ts
@@ -12,11 +12,11 @@ import type { Variants } from "./constants";
 
 export type GenericFunction = (...args: any[]) => any;
 
-export type SwitchType = {
+export interface SwitchType {
   id: string;
   text: string;
   action: () => void;
-};
+}
 
 export type ActionIntegrationType =
   (typeof APPSMITH_INTEGRATIONS)[keyof typeof APPSMITH_INTEGRATIONS];
@@ -26,12 +26,12 @@ export type ActionType =
 
 export type ViewType = (typeof ViewTypes)[keyof typeof ViewTypes];
 
-export type ViewProps = {
+export interface ViewProps {
   label: string;
   get: GenericFunction;
   set: GenericFunction;
   value: string;
-};
+}
 
 export type SelectorViewProps = ViewProps & {
   options: TreeDropdownOption[];
@@ -61,15 +61,15 @@ export type ButtonViewProps = Omit<ViewProps, "get" | "set"> & {
   onClick: () => void;
 };
 
-export type FieldConfig = {
+export interface FieldConfig {
   getter: GenericFunction;
   setter: GenericFunction;
   view: ViewType;
-};
+}
 
 export type FieldConfigs = Partial<Record<FieldType, FieldConfig>>;
 
-export type ActionCreatorProps = {
+export interface ActionCreatorProps {
   value: string;
   action: string;
   onValueChange: (newValue: string, isUpdatedViaKeyboard: boolean) => void;
@@ -79,9 +79,9 @@ export type ActionCreatorProps = {
   widgetType: string;
   widgetName: string;
   dataTreePath: string | undefined;
-};
+}
 
-export type Field = {
+export interface Field {
   field: FieldType;
   value?: string;
   label?: string;
@@ -89,16 +89,16 @@ export type Field = {
   position?: number;
   getter?: (value: string) => string;
   setter?: (value: string, newValue: string) => string;
-};
+}
 
-export type SelectorField = {
+export interface SelectorField {
   field: FieldType;
   getParentValue?: (value: string) => string;
   value: string | undefined;
   label?: string;
-};
+}
 
-export type FieldProps = {
+export interface FieldProps {
   onValueChange: (
     newValue: string,
     isUpdatedViaKeyboard: boolean,
@@ -117,7 +117,7 @@ export type FieldProps = {
   activeTabApiAndQueryCallback: SwitchType;
   apiAndQueryCallbackTabSwitches: SwitchType[];
   dataTreePath?: string | undefined;
-};
+}
 
 export type FieldGroupProps = Omit<
   FieldProps,
@@ -130,9 +130,13 @@ export type FieldGroupProps = Omit<
   isChainedAction?: boolean;
 };
 
-export type OptionListType = { label: string; value: string; id: string };
+export interface OptionListType {
+  label: string;
+  value: string;
+  id: string;
+}
 
-export type AppsmithFunctionConfigValues = {
+export interface AppsmithFunctionConfigValues {
   label: (args: FieldProps) => string;
   defaultText: string;
   options: (args: FieldProps) => null | TreeDropdownOption[] | OptionListType;
@@ -145,49 +149,49 @@ export type AppsmithFunctionConfigValues = {
   view: ViewType;
   exampleText: string;
   toolTip?: string;
-};
+}
 
-export type AppsmithFunctionConfigType = {
+export interface AppsmithFunctionConfigType {
   [key: string]: AppsmithFunctionConfigValues;
-};
+}
 
-export type DataTreeForActionCreator = {
+export interface DataTreeForActionCreator {
   [key: string]: {
     ENTITY_TYPE?: ENTITY_TYPE;
     meta?: Record<string, MetaArgs>;
   };
-};
+}
 
-export type FieldGroupValueType = {
+export interface FieldGroupValueType {
   label: string;
   fields: string[];
   defaultParams: string;
   value?: string;
   children?: TreeDropdownOption[];
   icon?: IconName;
-};
+}
 
-export type FieldGroupConfig = {
+export interface FieldGroupConfig {
   [key: string]: FieldGroupValueType;
-};
+}
 
 export interface CallbackBlock extends ActionTree {
   type: "success" | "failure" | "then" | "catch";
 }
 
-export type ActionTree = {
+export interface ActionTree {
   code: string;
   actionType: (typeof AppsmithFunction)[keyof typeof AppsmithFunction];
   successBlocks: CallbackBlock[];
   errorBlocks: CallbackBlock[];
-};
+}
 
-export type SelectedActionBlock = {
+export interface SelectedActionBlock {
   type: "success" | "failure";
   index: number;
-};
+}
 
-export type TActionBlock = {
+export interface TActionBlock {
   code: string;
   actionType: (typeof AppsmithFunction)[keyof typeof AppsmithFunction];
   success: {
@@ -199,6 +203,6 @@ export type TActionBlock = {
     blocks: TActionBlock[];
   };
   type?: "success" | "failure" | "then" | "catch";
-};
+}
 
 export type VariantType = keyof typeof Variants;
diff --git a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionCard.tsx b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionCard.tsx
index 931272a2e9..43390754eb 100644
--- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionCard.tsx
+++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionCard.tsx
@@ -6,7 +6,7 @@ import { AppsmithFunction } from "../../constants";
 import type { TActionBlock, VariantType } from "../../types";
 import { getActionInfo } from "../ActionBlockTree/utils";
 
-type TActionCardProps = {
+interface TActionCardProps {
   onSelect: () => void;
   selected: boolean;
   actionBlock: TActionBlock;
@@ -15,7 +15,7 @@ type TActionCardProps = {
   showCallbacks?: boolean;
   id: string;
   level: number;
-};
+}
 
 function ActionCard(props: TActionCardProps) {
   const actionBlock = props.actionBlock;
diff --git a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionSelector.tsx b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionSelector.tsx
index bf512a44f0..45d39058e2 100644
--- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionSelector.tsx
+++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionSelector.tsx
@@ -63,12 +63,12 @@ export default function ActionSelector(props: {
   );
 }
 
-type TActionSelectorFormProps = {
+interface TActionSelectorFormProps {
   action: TActionBlock;
   onChange: (actionBlock: TActionBlock, del?: boolean) => void;
   additionalAutoComplete?: AdditionalDynamicDataTree;
   dataTreePath: string | undefined;
-};
+}
 
 const pathClassList = [
   "CodeMirror-hints",
diff --git a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/index.tsx b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/index.tsx
index 3db232e361..60e5cc7628 100644
--- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/index.tsx
+++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/index.tsx
@@ -4,7 +4,7 @@ import { useApisQueriesAndJsActionOptions } from "../../helpers";
 import type { TActionBlock } from "../../types";
 import { actionToCode, codeToAction } from "../../utils";
 
-type TRootActionProps = {
+interface TRootActionProps {
   code: string;
   id: string;
   onChange: (code: string) => void;
@@ -13,7 +13,7 @@ type TRootActionProps = {
   widgetName: string;
   widgetType: string;
   dataTreePath: string | undefined;
-};
+}
 
 export default function Action(props: TRootActionProps) {
   const { code, id, onChange } = props;
diff --git a/app/client/src/components/editorComponents/ActionCreator/viewComponents/TabView/index.tsx b/app/client/src/components/editorComponents/ActionCreator/viewComponents/TabView/index.tsx
index 8f0ebc163f..4cfa4373d2 100644
--- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/TabView/index.tsx
+++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/TabView/index.tsx
@@ -6,11 +6,11 @@ import {
 import { SegmentedControl } from "design-system";
 import React from "react";
 
-type Option = {
+interface Option {
   id: string;
   text: string;
   action: () => void;
-};
+}
 
 export function TabView(props: TabViewProps) {
   const onClick = (id: string) => {
diff --git a/app/client/src/components/editorComponents/ActionExecutionInProgressView.tsx b/app/client/src/components/editorComponents/ActionExecutionInProgressView.tsx
index 929a855add..0232dfe30c 100644
--- a/app/client/src/components/editorComponents/ActionExecutionInProgressView.tsx
+++ b/app/client/src/components/editorComponents/ActionExecutionInProgressView.tsx
@@ -36,10 +36,10 @@ const handleCancelActionExecution = () => {
   ActionAPI.abortActionExecutionTokenSource.cancel();
 };
 
-type ActionExecutionInProgressViewProps = {
+interface ActionExecutionInProgressViewProps {
   actionType: string;
   theme?: EditorTheme;
-};
+}
 
 const ActionExecutionInProgressView = ({
   actionType,
diff --git a/app/client/src/components/editorComponents/ActionNameEditor.tsx b/app/client/src/components/editorComponents/ActionNameEditor.tsx
index 66951c26fe..88e301911a 100644
--- a/app/client/src/components/editorComponents/ActionNameEditor.tsx
+++ b/app/client/src/components/editorComponents/ActionNameEditor.tsx
@@ -58,7 +58,7 @@ const ApiIconBox = styled.div`
   margin-right: 8px;
   flex-shrink: 0;
 `;
-type ActionNameEditorProps = {
+interface ActionNameEditorProps {
   /*
     This prop checks if page is API Pane or Query Pane or Curl Pane
     So, that we can toggle between ads editable-text component and existing editable-text component
@@ -67,7 +67,7 @@ type ActionNameEditorProps = {
   */
   page?: string;
   disabled?: boolean;
-};
+}
 
 function ActionNameEditor(props: ActionNameEditorProps) {
   const params = useParams<{ apiId?: string; queryId?: string }>();
diff --git a/app/client/src/components/editorComponents/ActionRightPane/Connections.tsx b/app/client/src/components/editorComponents/ActionRightPane/Connections.tsx
index 4d055259fd..0b9d9da15d 100644
--- a/app/client/src/components/editorComponents/ActionRightPane/Connections.tsx
+++ b/app/client/src/components/editorComponents/ActionRightPane/Connections.tsx
@@ -85,13 +85,13 @@ function Dependencies(props: any) {
   );
 }
 
-type ConnectionsProps = {
+interface ConnectionsProps {
   actionName: string;
   entityDependencies: {
     inverseDependencies: string[];
     directDependencies: string[];
   } | null;
-};
+}
 
 function Connections(props: ConnectionsProps) {
   return (
diff --git a/app/client/src/components/editorComponents/ActionRightPane/SuggestedWidgets.tsx b/app/client/src/components/editorComponents/ActionRightPane/SuggestedWidgets.tsx
index feb97b6099..367cd3e6f1 100644
--- a/app/client/src/components/editorComponents/ActionRightPane/SuggestedWidgets.tsx
+++ b/app/client/src/components/editorComponents/ActionRightPane/SuggestedWidgets.tsx
@@ -152,14 +152,14 @@ const SuggestedWidgetContainer = styled.div`
   overflow: hidden;
 `;
 
-type WidgetBindingInfo = {
+interface WidgetBindingInfo {
   label: string;
   propertyName: string;
   widgetName: string;
   image?: string;
   icon?: string;
   existingImage?: string;
-};
+}
 
 export const WIDGET_DATA_FIELD_MAP: Record<string, WidgetBindingInfo> = {
   LIST_WIDGET: {
@@ -305,11 +305,11 @@ function getWidgetProps(
   }
 }
 
-type SuggestedWidgetProps = {
+interface SuggestedWidgetProps {
   actionName: string;
   suggestedWidgets: SuggestedWidget[];
   hasWidgets: boolean;
-};
+}
 
 function renderHeading(heading: string, subHeading: string) {
   return (
@@ -491,7 +491,7 @@ function SuggestedWidgets(props: SuggestedWidgetProps) {
         eventParams: {
           [FEATURE_WALKTHROUGH_KEYS.ds_binding]: true,
         },
-        delay: 5000,
+        delay: 2500,
       });
   };
 
diff --git a/app/client/src/components/editorComponents/ActionRightPane/index.tsx b/app/client/src/components/editorComponents/ActionRightPane/index.tsx
index 177f3d81a2..948c4d0398 100644
--- a/app/client/src/components/editorComponents/ActionRightPane/index.tsx
+++ b/app/client/src/components/editorComponents/ActionRightPane/index.tsx
@@ -27,7 +27,7 @@ import {
   getCurrentPageId,
   getPagePermissions,
 } from "selectors/editorSelectors";
-import { builderURL } from "RouteBuilder";
+import { builderURL } from "@appsmith/RouteBuilder";
 import DatasourceStructureHeader from "pages/Editor/Explorer/Datasources/DatasourceStructureHeader";
 import {
   DatasourceStructureContainer as DataStructureList,
@@ -185,7 +185,7 @@ const CollapsibleSection = styled.div<{ height: string; marginTop?: number }>`
   }
 `;
 
-type CollapsibleProps = {
+interface CollapsibleProps {
   expand?: boolean;
   children: ReactNode;
   label: string;
@@ -193,12 +193,12 @@ type CollapsibleProps = {
   isDisabled?: boolean;
   datasourceId?: string;
   containerRef?: MutableRefObject<HTMLDivElement | null>;
-};
+}
 
-type DisabledCollapsibleProps = {
+interface DisabledCollapsibleProps {
   label: string;
   tooltipLabel?: string;
-};
+}
 
 export function Collapsible({
   children,
@@ -391,7 +391,7 @@ function ActionSidebar({
         eventParams: {
           [FEATURE_WALKTHROUGH_KEYS.ds_schema]: true,
         },
-        delay: 5000,
+        delay: 2500,
       });
   };
 
diff --git a/app/client/src/components/editorComponents/ApiResponseView.tsx b/app/client/src/components/editorComponents/ApiResponseView.tsx
index 38a62abb7c..d597c911f9 100644
--- a/app/client/src/components/editorComponents/ApiResponseView.tsx
+++ b/app/client/src/components/editorComponents/ApiResponseView.tsx
@@ -64,9 +64,9 @@ import ActionExecutionInProgressView from "./ActionExecutionInProgressView";
 import { CloseDebugger } from "./Debugger/DebuggerTabs";
 import { EMPTY_RESPONSE } from "./emptyResponse";
 
-type TextStyleProps = {
+interface TextStyleProps {
   accent: "primary" | "secondary" | "error";
-};
+}
 export const BaseText = styled(BlueprintText)<TextStyleProps>``;
 
 const ResponseContainer = styled.div`
diff --git a/app/client/src/components/editorComponents/Button.tsx b/app/client/src/components/editorComponents/Button.tsx
index f7d5842283..cdcd1a2229 100644
--- a/app/client/src/components/editorComponents/Button.tsx
+++ b/app/client/src/components/editorComponents/Button.tsx
@@ -81,7 +81,7 @@ const StyledAnchorButton = styled(
   ${buttonStyles}
 `;
 
-export type ButtonProps = {
+export interface ButtonProps {
   outline?: boolean;
   filled?: boolean;
   intent?: Intent;
@@ -101,7 +101,7 @@ export type ButtonProps = {
   borderRadius?: string;
   boxShadow?: string;
   boxShadowColor?: string;
-};
+}
 
 export const Button = (props: ButtonProps) => {
   const icon: IconName | undefined =
diff --git a/app/client/src/components/editorComponents/CloseEditor.tsx b/app/client/src/components/editorComponents/CloseEditor.tsx
index 9a1b33f719..2ed7edda42 100644
--- a/app/client/src/components/editorComponents/CloseEditor.tsx
+++ b/app/client/src/components/editorComponents/CloseEditor.tsx
@@ -9,7 +9,7 @@ import {
   builderURL,
   generateTemplateFormURL,
   integrationEditorURL,
-} from "RouteBuilder";
+} from "@appsmith/RouteBuilder";
 import { useSelector } from "react-redux";
 import { getCurrentPageId } from "selectors/editorSelectors";
 import AnalyticsUtil from "utils/AnalyticsUtil";
diff --git a/app/client/src/components/editorComponents/CodeEditor/EditorConfig.ts b/app/client/src/components/editorComponents/CodeEditor/EditorConfig.ts
index a6228afe78..e37c6ed700 100644
--- a/app/client/src/components/editorComponents/CodeEditor/EditorConfig.ts
+++ b/app/client/src/components/editorComponents/CodeEditor/EditorConfig.ts
@@ -1,5 +1,6 @@
 import type CodeMirror from "codemirror";
-import type { DataTree, ENTITY_TYPE } from "@appsmith/entities/DataTree/types";
+import type { ENTITY_TYPE } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import type { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
 import type { EntityNavigationData } from "selectors/navigationSelectors";
 import type { ExpectedValueExample } from "utils/validation/common";
@@ -36,7 +37,7 @@ export enum EditorSize {
   COMPACT_RETAIN_FORMATTING = "COMPACT_RETAIN_FORMATTING",
 }
 
-export type EditorConfig = {
+export interface EditorConfig {
   theme: EditorTheme;
   mode: TEditorModes;
   tabBehaviour: TabBehaviour;
@@ -44,14 +45,14 @@ export type EditorConfig = {
   hinting?: Array<HintHelper>;
   marking?: Array<MarkHelper>;
   folding?: boolean;
-};
+}
 
 export const EditorThemes: Record<EditorTheme, string> = {
   [EditorTheme.LIGHT]: "duotone-light",
   [EditorTheme.DARK]: "duotone-dark",
 };
 
-export type FieldEntityInformation = {
+export interface FieldEntityInformation {
   entityName?: string;
   expectedType?: AutocompleteDataType;
   entityType?: ENTITY_TYPE;
@@ -62,13 +63,13 @@ export type FieldEntityInformation = {
   mode?: TEditorModes;
   token?: CodeMirror.Token;
   widgetType?: WidgetType;
-};
+}
 
 export type HintHelper = (
   editor: CodeMirror.Editor,
   entitiesForNavigation: EntityNavigationData,
 ) => Hinter;
-export type Hinter = {
+export interface Hinter {
   showHint: (
     editor: CodeMirror.Editor,
     entityInformation: FieldEntityInformation,
@@ -76,7 +77,7 @@ export type Hinter = {
   ) => boolean;
   update?: (data: DataTree) => void;
   fireOnFocus?: boolean;
-};
+}
 
 export type MarkHelper = (
   editor: CodeMirror.Editor,
diff --git a/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx b/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx
index 1e18442dde..4a353f4545 100644
--- a/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx
+++ b/app/client/src/components/editorComponents/CodeEditor/EvaluatedValuePopup.tsx
@@ -271,10 +271,10 @@ const PreparedStatementParameter = styled.span`
   color: #333;
 `;
 
-type PreparedStatementValue = {
+interface PreparedStatementValue {
   value: string;
   parameters: Record<string, number | string>;
-};
+}
 export function PreparedStatementViewer(props: {
   evaluatedValue: PreparedStatementValue;
 }) {
diff --git a/app/client/src/components/editorComponents/CodeEditor/PeekOverlayPopup/PeekOverlayPopup.tsx b/app/client/src/components/editorComponents/CodeEditor/PeekOverlayPopup/PeekOverlayPopup.tsx
index 9dd7fa1c32..117e77b6ad 100644
--- a/app/client/src/components/editorComponents/CodeEditor/PeekOverlayPopup/PeekOverlayPopup.tsx
+++ b/app/client/src/components/editorComponents/CodeEditor/PeekOverlayPopup/PeekOverlayPopup.tsx
@@ -13,12 +13,12 @@ import { getConfigTree, getDataTree } from "selectors/dataTreeSelectors";
 import { filterInternalProperties } from "utils/FilterInternalProperties";
 import { getJSCollections } from "@appsmith/selectors/entitiesSelector";
 
-export type PeekOverlayStateProps = {
+export interface PeekOverlayStateProps {
   objectName: string;
   propertyPath: string[];
   position: DOMRect;
   textWidth: number;
-};
+}
 
 /*
  * using `componentWillAppendToBody` to work with variable height for peek overlay
diff --git a/app/client/src/components/editorComponents/CodeEditor/assistiveBindingHinter.ts b/app/client/src/components/editorComponents/CodeEditor/assistiveBindingHinter.ts
index 515a278cc5..86ace15717 100644
--- a/app/client/src/components/editorComponents/CodeEditor/assistiveBindingHinter.ts
+++ b/app/client/src/components/editorComponents/CodeEditor/assistiveBindingHinter.ts
@@ -33,6 +33,7 @@ export const assistiveBindingHinter: HintHelper = (
         enableAIAssistance,
         executeCommand,
         featureFlags,
+        focusEditor,
         pluginIdToImageLocation,
         recentEntities,
       }: {
@@ -44,6 +45,7 @@ export const assistiveBindingHinter: HintHelper = (
         entityId: string;
         featureFlags: FeatureFlags;
         enableAIAssistance: boolean;
+        focusEditor: (focusOnLine?: number, chOffset?: number) => void;
       },
     ): boolean => {
       // @ts-expect-error: Types are not available
@@ -135,15 +137,7 @@ export const assistiveBindingHinter: HintHelper = (
             }
             const cursor = editor.getCursor();
             const currentLine = cursor.line;
-            const currentCursorPosition = cursor.ch;
-            const newCursorPosition = currentCursorPosition - 2; //offset cursor before the ending moustache braces '}}'
-            setTimeout(() => {
-              editor.focus();
-              editor.setCursor({
-                line: currentLine,
-                ch: newCursorPosition,
-              });
-            });
+            focusEditor(currentLine, 2);
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
             const { data } = selected;
             const { name, type } = data as NavigationData;
diff --git a/app/client/src/components/editorComponents/CodeEditor/commandsHelper.ts b/app/client/src/components/editorComponents/CodeEditor/commandsHelper.ts
index e0a4821c78..801306adb0 100644
--- a/app/client/src/components/editorComponents/CodeEditor/commandsHelper.ts
+++ b/app/client/src/components/editorComponents/CodeEditor/commandsHelper.ts
@@ -16,6 +16,7 @@ import type {
   EntityNavigationData,
   NavigationData,
 } from "selectors/navigationSelectors";
+import { getAIContext } from "@appsmith/components/editorComponents/GPT/trigger";
 
 export const slashCommandHintHelper: HintHelper = (
   _,
@@ -33,18 +34,18 @@ export const slashCommandHintHelper: HintHelper = (
         enableAIAssistance,
         executeCommand,
         featureFlags,
+        focusEditor,
         pluginIdToImageLocation,
         recentEntities,
-        update,
       }: {
         datasources: Datasource[];
         executeCommand: (payload: SlashCommandPayload) => void;
         pluginIdToImageLocation: Record<string, string>;
         recentEntities: string[];
-        update: (value: string) => void;
         entityId: string;
         featureFlags: FeatureFlags;
         enableAIAssistance: boolean;
+        focusEditor: (focusOnLine?: number, chOffset?: number) => void;
       },
     ): boolean => {
       // @ts-expect-error: Types are not available
@@ -57,16 +58,30 @@ export const slashCommandHintHelper: HintHelper = (
         },
       );
       const cursorBetweenBinding = checkIfCursorInsideBinding(editor);
-      const value = editor.getValue();
-      const slashIndex = value.lastIndexOf("/");
+      const cursorPosition = editor.getCursor();
+      const currentLineValue = editor.getLine(cursorPosition.line);
+      const slashIndex = currentLineValue.lastIndexOf("/");
       const shouldShowBinding = !cursorBetweenBinding && slashIndex > -1;
+      const searchText = currentLineValue.substring(slashIndex + 1);
+
       if (!shouldShowBinding) return false;
-      const searchText = value.substring(slashIndex + 1);
+
+      const aiContext = getAIContext({
+        currentLineValue,
+        cursorPosition,
+        editor,
+        slashIndex,
+        entityType,
+      });
+
+      if (!aiContext) return false;
+
       const list = generateQuickCommands(
         filteredEntitiesForSuggestions,
         currentEntityType,
         searchText,
         {
+          aiContext,
           datasources,
           executeCommand,
           pluginIdToImageLocation,
@@ -96,20 +111,21 @@ export const slashCommandHintHelper: HintHelper = (
             currentSelection = selected;
           }
           function handlePick(selected: CommandsCompletion) {
-            update(value.slice(0, slashIndex) + selected.text);
-            setTimeout(() => {
-              editor.focus();
-              editor.setCursor({
-                line: editor.lineCount() - 1,
-                ch: editor.getLine(editor.lineCount() - 1).length - 2,
-              });
-              if (selected.action && typeof selected.action === "function") {
-                selected.action();
-              } else {
-                selected.triggerCompletionsPostPick &&
-                  CodeMirror.signal(editor, "postPick", selected.displayText);
-              }
-            });
+            if (selected.action && typeof selected.action === "function") {
+              const callback = (completion: string) => {
+                editor.replaceRange(completion, cursor);
+              };
+              selected.action(callback);
+            }
+
+            // Focus on the editor if the selected command has text
+            if (selected.text) {
+              focusEditor(cursorPosition.line, 2);
+            }
+
+            selected.triggerCompletionsPostPick &&
+              CodeMirror.signal(editor, "postPick", selected.displayText);
+
             try {
               // eslint-disable-next-line @typescript-eslint/no-unused-vars
               const { data, render, ...rest } = selected;
diff --git a/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx b/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx
index 3ed530035b..85cde062f5 100644
--- a/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx
+++ b/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx
@@ -14,6 +14,7 @@ import { DatasourceCreateEntryPoints } from "constants/Datasource";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import BetaCard from "../BetaCard";
 import type { NavigationData } from "selectors/navigationSelectors";
+import type { AIEditorContext } from "@appsmith/components/editorComponents/GPT";
 import type { ENTITY_TYPE } from "@appsmith/entities/DataTree/types";
 
 export enum Shortcuts {
@@ -118,11 +119,13 @@ export const generateQuickCommands = (
   currentEntityType: ENTITY_TYPE,
   searchText: string,
   {
+    aiContext,
     datasources,
     enableAIAssistance,
     executeCommand,
     pluginIdToImageLocation,
   }: {
+    aiContext: AIEditorContext;
     datasources: Datasource[];
     executeCommand: (payload: SlashCommandPayload) => void;
     pluginIdToImageLocation: Record<string, string>;
@@ -198,10 +201,11 @@ export const generateQuickCommands = (
       displayText: `${action.name}`,
       className: "CodeMirror-commands",
       data: action,
-      action: () =>
+      action: (callback?: (completion: string) => void) =>
         executeCommand({
           actionType: SlashCommand.NEW_QUERY,
           args: { datasource: action },
+          callback,
         }),
       render: (element: HTMLElement, self: any, data: CommandsCompletion) => {
         const completionData = data.data as Datasource;
@@ -221,12 +225,9 @@ export const generateQuickCommands = (
       },
     };
   });
-  const suggestionsMatchingSearchText = matchingCommands(
-    suggestions,
-    searchText,
-    5,
-  );
-  const actionCommands = [newBinding];
+
+  const filteredCommands: CommandsCompletion[] = [];
+  const commonCommands: CommandsCompletion[] = [];
 
   if (enableAIAssistance) {
     const askGPT: CommandsCompletion = generateCreateNewCommand({
@@ -236,36 +237,72 @@ export const generateQuickCommands = (
       triggerCompletionsPostPick: true,
       description: "Generate code using AI",
       isBeta: true,
+      action: () => {
+        executeCommand({
+          actionType: SlashCommand.ASK_AI,
+          args: aiContext,
+        });
+      },
     });
-    actionCommands.unshift(askGPT);
+    commonCommands.unshift(askGPT);
   }
-  const createNewCommands: CommandsCompletion[] = [];
 
-  if (currentEntityType === ENTITY_TYPE_VALUE.WIDGET)
-    createNewCommands.push(...datasourceCommands);
+  if (currentEntityType !== ENTITY_TYPE_VALUE.JSACTION) {
+    // New binding command is not applicable in JS Objects
+    commonCommands.push(newBinding);
+  }
 
-  const createNewCommandsMatchingSearchText = matchingCommands(
-    createNewCommands,
-    searchText,
-    3,
-  );
-  const actionCommandsMatchingSearchText = matchingCommands(
-    actionCommands,
+  // Filter common commands based on search text
+  const commonCommandsMatchingSearchText = matchingCommands(
+    commonCommands,
     searchText,
   );
-  if (currentEntityType === ENTITY_TYPE_VALUE.WIDGET) {
-    createNewCommandsMatchingSearchText.push(
-      ...matchingCommands([newIntegration], searchText),
+
+  filteredCommands.push(...commonCommandsMatchingSearchText);
+
+  if (currentEntityType !== ENTITY_TYPE_VALUE.JSACTION) {
+    // Binding suggestions and create query commands are not applicable in JS Objects
+
+    // Get top 5 matching suggestions
+    const suggestionsMatchingSearchText = matchingCommands(
+      suggestions,
+      searchText,
+      5,
     );
+
+    if (suggestionsMatchingSearchText.length) {
+      // Add header only if there are suggestions
+      filteredCommands.push(
+        commandsHeader("Bind data", "", filteredCommands.length > 0),
+      );
+      filteredCommands.push(...suggestionsMatchingSearchText);
+    }
+
+    if (currentEntityType === ENTITY_TYPE_VALUE.WIDGET) {
+      const createNewCommands: CommandsCompletion[] = [];
+      createNewCommands.push(...datasourceCommands);
+
+      // Get top 3 matching create new commands
+      const createNewCommandsMatchingSearchText = matchingCommands(
+        createNewCommands,
+        searchText,
+        3,
+      );
+
+      // Check if new integration command matches search text
+      createNewCommandsMatchingSearchText.push(
+        ...matchingCommands([newIntegration], searchText),
+      );
+
+      if (createNewCommandsMatchingSearchText.length) {
+        // Add header only if there are create new commands
+        filteredCommands.push(
+          commandsHeader("Create a query", "", filteredCommands.length > 0),
+        );
+        filteredCommands.push(...createNewCommandsMatchingSearchText);
+      }
+    }
   }
-  const list: CommandsCompletion[] = actionCommandsMatchingSearchText;
-  if (suggestionsMatchingSearchText.length) {
-    list.push(commandsHeader("Bind data", "", list.length > 0));
-  }
-  list.push(...suggestionsMatchingSearchText);
-  if (createNewCommandsMatchingSearchText.length) {
-    list.push(commandsHeader("Create a query", "", list.length > 0));
-  }
-  list.push(...createNewCommandsMatchingSearchText);
-  return list;
+
+  return filteredCommands;
 };
diff --git a/app/client/src/components/editorComponents/CodeEditor/hintHelpers.test.ts b/app/client/src/components/editorComponents/CodeEditor/hintHelpers.test.ts
index b40d7cdeff..a1961e5664 100644
--- a/app/client/src/components/editorComponents/CodeEditor/hintHelpers.test.ts
+++ b/app/client/src/components/editorComponents/CodeEditor/hintHelpers.test.ts
@@ -12,12 +12,12 @@ describe("hint helpers", () => {
 
     it("opens hint correctly", () => {
       // Setup
-      type Case = {
+      interface Case {
         value: string;
         cursor: { ch: number; line: number };
         toCall: "closeHint" | "showHint";
         getLine?: string[];
-      };
+      }
       const cases: Case[] = [
         { value: "ABC", cursor: { ch: 3, line: 0 }, toCall: "closeHint" },
         { value: "{{ }}", cursor: { ch: 3, line: 0 }, toCall: "showHint" },
diff --git a/app/client/src/components/editorComponents/CodeEditor/hintHelpers.ts b/app/client/src/components/editorComponents/CodeEditor/hintHelpers.ts
index d9fe5171c8..3e5714b8eb 100644
--- a/app/client/src/components/editorComponents/CodeEditor/hintHelpers.ts
+++ b/app/client/src/components/editorComponents/CodeEditor/hintHelpers.ts
@@ -15,8 +15,9 @@ import {
   filterCompletions,
   getHintDetailsFromClassName,
 } from "./utils/sqlHint";
+import { isAISlashCommand } from "@appsmith/components/editorComponents/GPT/trigger";
 
-export const bindingHintHelper: HintHelper = (editor) => {
+export const bindingHintHelper: HintHelper = (editor: CodeMirror.Editor) => {
   editor.setOption("extraKeys", {
     // @ts-expect-error: Types are not available
     ...editor.options.extraKeys,
@@ -46,11 +47,17 @@ export const bindingHintHelper: HintHelper = (editor) => {
 
       const entityType = entityInformation?.entityType;
       let shouldShow = false;
+
       if (entityType === ENTITY_TYPE_VALUE.JSACTION) {
-        shouldShow = true;
+        if (additionalData?.enableAIAssistance) {
+          shouldShow = !isAISlashCommand(editor);
+        } else {
+          shouldShow = true;
+        }
       } else {
         shouldShow = checkIfCursorInsideBinding(editor);
       }
+
       if (shouldShow) {
         CodemirrorTernService.complete(editor);
 
diff --git a/app/client/src/components/editorComponents/CodeEditor/index.tsx b/app/client/src/components/editorComponents/CodeEditor/index.tsx
index 46b40f5181..a1c5598d04 100644
--- a/app/client/src/components/editorComponents/CodeEditor/index.tsx
+++ b/app/client/src/components/editorComponents/CodeEditor/index.tsx
@@ -27,14 +27,12 @@ import "codemirror/addon/hint/sql-hint";
 import { getDataTreeForAutocomplete } from "selectors/dataTreeSelectors";
 import EvaluatedValuePopup from "components/editorComponents/CodeEditor/EvaluatedValuePopup";
 import type { WrappedFieldInputProps } from "redux-form";
-import _, { debounce, isEqual } from "lodash";
+import _, { debounce, isEqual, isNumber } from "lodash";
 import scrollIntoView from "scroll-into-view-if-needed";
 
 import { ENTITY_TYPE_VALUE } from "entities/DataTree/dataTreeFactory";
-import type {
-  DataTree,
-  EvaluationSubstitutionType,
-} from "@appsmith/entities/DataTree/types";
+import type { EvaluationSubstitutionType } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { Skin } from "constants/DefaultTheme";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import "components/editorComponents/CodeEditor/sql/customMimes";
@@ -102,7 +100,6 @@ import { getLintAnnotations, getLintTooltipDirection } from "./lintHelpers";
 import { executeCommandAction } from "actions/apiPaneActions";
 import { startingEntityUpdate } from "actions/editorActions";
 import type { SlashCommandPayload } from "entities/Action";
-import { SlashCommand } from "entities/Action";
 import type { Indices } from "constants/Layers";
 import { replayHighlightClass } from "globalStyles/portals";
 import {
@@ -146,10 +143,7 @@ import { selectFeatureFlags } from "@appsmith/selectors/featureFlagsSelectors";
 import { AIWindow } from "@appsmith/components/editorComponents/GPT";
 import { AskAIButton } from "@appsmith/components/editorComponents/GPT/AskAIButton";
 import classNames from "classnames";
-import {
-  APPSMITH_AI,
-  isAIEnabled,
-} from "@appsmith/components/editorComponents/GPT/trigger";
+import { isAIEnabled } from "@appsmith/components/editorComponents/GPT/trigger";
 import {
   getAllDatasourceTableKeys,
   selectInstalledLibraries,
@@ -167,14 +161,14 @@ import { EMPTY_BINDING } from "../ActionCreator/constants";
 type ReduxStateProps = ReturnType<typeof mapStateToProps>;
 type ReduxDispatchProps = ReturnType<typeof mapDispatchToProps>;
 
-export type CodeEditorExpected = {
+export interface CodeEditorExpected {
   type: string;
   example: ExpectedValueExample;
   autocompleteDataType: AutocompleteDataType;
   openExampleTextByDefault?: boolean;
-};
+}
 
-export type EditorStyleProps = {
+export interface EditorStyleProps {
   placeholder?: string;
   leftIcon?: React.ReactNode;
   rightIcon?: React.ReactNode;
@@ -198,7 +192,7 @@ export type EditorStyleProps = {
   popperPlacement?: Placement;
   popperZIndex?: Indices;
   blockCompletions?: FieldEntityInformation["blockCompletions"];
-};
+}
 /**
  *  line => Line to which the gutter is added
  *
@@ -206,18 +200,18 @@ export type EditorStyleProps = {
  *
  * isFocusedAction => function called when focused
  */
-export type GutterConfig = {
+export interface GutterConfig {
   line: number;
   element: HTMLElement;
   isFocusedAction: () => void;
-};
+}
 
-export type CodeEditorGutter = {
+export interface CodeEditorGutter {
   getGutterConfig:
     | ((editorValue: string, cursorLineNumber: number) => GutterConfig | null)
     | null;
   gutterId: string;
-};
+}
 
 export type EditorProps = EditorStyleProps &
   EditorConfig & {
@@ -253,7 +247,7 @@ export type EditorProps = EditorStyleProps &
 
 interface Props extends ReduxStateProps, EditorProps, ReduxDispatchProps {}
 
-type State = {
+interface State {
   isFocused: boolean;
   isOpened: boolean;
   autoCompleteVisible: boolean;
@@ -268,7 +262,7 @@ type State = {
     | undefined;
   isDynamic: boolean;
   showAIWindow: boolean;
-};
+}
 
 const getEditorIdentifier = (props: EditorProps): string => {
   return props.dataTreePath || props.focusElementName || "";
@@ -308,6 +302,7 @@ class CodeEditor extends Component<Props, State> {
       showAIWindow: false,
     };
     this.updatePropertyValue = this.updatePropertyValue.bind(this);
+    this.focusEditor = this.focusEditor.bind(this);
     this.peekOverlayExpressionIdentifier = new PeekOverlayExpressionIdentifier(
       props.isJSObject
         ? {
@@ -442,7 +437,6 @@ class CodeEditor extends Component<Props, State> {
         editor.on("focus", this.handleEditorFocus);
         editor.on("cursorActivity", this.handleCursorMovement);
         editor.on("blur", this.handleEditorBlur);
-        editor.on("postPick", this.handleSlashCommandSelection);
         editor.on("mousedown", this.handleClick);
         editor.on("scrollCursorIntoView", this.handleScrollCursorIntoView);
         CodeMirror.on(
@@ -507,21 +501,6 @@ class CodeEditor extends Component<Props, State> {
     }
   }
 
-  handleSlashCommandSelection = (...args: any) => {
-    const [command] = args;
-
-    if (command === APPSMITH_AI) {
-      this.props.executeCommand({
-        actionType: SlashCommand.ASK_AI,
-        args: {
-          mode: this.props.mode,
-        },
-      });
-      this.setState({ showAIWindow: true });
-    }
-    this.handleAutocompleteVisibility(this.editor);
-  };
-
   shouldComponentUpdate(nextProps: Props, nextState: State) {
     if (this.props.dynamicData !== nextProps.dynamicData) {
       // check if isFocused as the other components that are not focused don't need a rerender (perf)
@@ -894,7 +873,6 @@ class CodeEditor extends Component<Props, State> {
     this.editor.off("focus", this.handleEditorFocus);
     this.editor.off("cursorActivity", this.handleCursorMovement);
     this.editor.off("blur", this.handleEditorBlur);
-    this.editor.off("postPick", this.handleSlashCommandSelection);
     CodeMirror.off(
       this.editor.getWrapperElement(),
       "mousemove",
@@ -1324,16 +1302,8 @@ class CodeEditor extends Component<Props, State> {
         recentEntities: this.props.recentEntities,
         featureFlags: this.props.featureFlags,
         enableAIAssistance: this.AIEnabled,
-        update: this.props.input.onChange?.bind(this),
-        executeCommand: (payload: any) => {
-          this.props.executeCommand({
-            ...payload,
-            callback: (binding: string) => {
-              const value = this.editor.getValue() + binding;
-              this.updatePropertyValue(value, value.length);
-            },
-          });
-        },
+        focusEditor: this.focusEditor,
+        executeCommand: this.props.executeCommand,
       });
       if (hinterOpen) break;
     }
@@ -1342,7 +1312,6 @@ class CodeEditor extends Component<Props, State> {
 
   handleAutocompleteKeydown = (cm: CodeMirror.Editor, event: KeyboardEvent) => {
     const key = event.key;
-
     // Since selection from AutoComplete list is also done using the Enter keydown event
     // we need to return from here so that autocomplete selection works fine
     if (key === "Enter") return;
@@ -1437,18 +1406,29 @@ class CodeEditor extends Component<Props, State> {
     marking.forEach((helper) => helper(editor, entityNavigationData, from, to));
   };
 
-  updatePropertyValue(value: string, cursor?: number) {
+  focusEditor(focusOnline?: number, chOffset = 0) {
+    const lineToFocus = isNumber(focusOnline)
+      ? focusOnline
+      : this.editor.lineCount() - 1;
+    const focusedLineContent = this.editor.getLine(lineToFocus);
+
+    this.editor.setCursor({
+      line: lineToFocus,
+      ch: focusedLineContent.length - chOffset,
+    });
+
+    this.setState({ isFocused: true }, () => {
+      this.handleAutocompleteVisibility(this.editor);
+    });
+  }
+
+  updatePropertyValue(value: string, focusOnline?: number, chOffset = 0) {
     this.editor.focus();
     if (value) {
       this.editor.setValue(value);
     }
-    this.editor.setCursor({
-      line: cursor || this.editor.lineCount() - 1,
-      ch: this.editor.getLine(this.editor.lineCount() - 1).length - 2,
-    });
-    this.setState({ isFocused: true }, () => {
-      this.handleAutocompleteVisibility(this.editor);
-    });
+
+    this.focusEditor(focusOnline, chOffset);
   }
 
   getErrors(dynamicData: DataTree, dataTreePath: string) {
@@ -1585,7 +1565,7 @@ class CodeEditor extends Component<Props, State> {
                 typeof this.props.input.value === "string"
                   ? this.props.input.value + "/"
                   : "/";
-              this.updatePropertyValue(newValue, newValue.length);
+              this.updatePropertyValue(newValue);
             }}
             size="sm"
             tabIndex={-1}
@@ -1622,16 +1602,17 @@ class CodeEditor extends Component<Props, State> {
           useValidationMessage={useValidationMessage}
         >
           <AIWindow
-            close={() => {
-              this.setState({ showAIWindow: false });
-            }}
             currentValue={this.props.input.value}
             dataTreePath={dataTreePath}
+            editor={this.editor}
             enableAIAssistance={this.AIEnabled}
             entitiesForNavigation={this.props.entitiesForNavigation}
             entity={entityInformation}
             isOpen={this.state.showAIWindow}
             mode={this.props.mode}
+            onOpenChanged={(showAIWindow: boolean) => {
+              this.setState({ showAIWindow });
+            }}
             triggerContext={this.props.expected}
             update={this.updateValueWithAIResponse}
           >
diff --git a/app/client/src/components/editorComponents/CodeEditor/modes.ts b/app/client/src/components/editorComponents/CodeEditor/modes.ts
index ab3d6bb07a..65c0a3a690 100644
--- a/app/client/src/components/editorComponents/CodeEditor/modes.ts
+++ b/app/client/src/components/editorComponents/CodeEditor/modes.ts
@@ -59,18 +59,21 @@ export const MULTIPLEXING_MODE_CONFIGS: MultiplexingModeConfigs = {
   },
   ...Object.values(sqlModesConfig)
     .filter((config) => config.isMultiplex)
-    .reduce((prev, current) => {
-      prev[current.mode] = {
-        outerMode: current.mime,
-        innerModes: [
-          {
-            open: BINDING_OPEN,
-            close: BINDING_CLOSE,
-          },
-        ],
-      };
-      return prev;
-    }, {} as Record<TEditorSqlModes, MultiplexingModeConfig | undefined>),
+    .reduce(
+      (prev, current) => {
+        prev[current.mode] = {
+          outerMode: current.mime,
+          innerModes: [
+            {
+              open: BINDING_OPEN,
+              close: BINDING_CLOSE,
+            },
+          ],
+        };
+        return prev;
+      },
+      {} as Record<TEditorSqlModes, MultiplexingModeConfig | undefined>,
+    ),
   "text/plain": undefined,
   "application/json": undefined,
   javascript: undefined,
diff --git a/app/client/src/components/editorComponents/ContextDropdown.tsx b/app/client/src/components/editorComponents/ContextDropdown.tsx
index 33f02e0e2d..28e20d2b8f 100644
--- a/app/client/src/components/editorComponents/ContextDropdown.tsx
+++ b/app/client/src/components/editorComponents/ContextDropdown.tsx
@@ -32,7 +32,7 @@ const StyledMenuItem = styled(MenuItem)`
   }
 `;
 
-type ContextDropdownProps = {
+interface ContextDropdownProps {
   options: ContextDropdownOption[];
   className: string;
   toggle: {
@@ -43,7 +43,7 @@ type ContextDropdownProps = {
     placeholder?: string;
     color?: string;
   };
-};
+}
 
 function DropdownItem(option: ContextDropdownOption) {
   return (
diff --git a/app/client/src/components/editorComponents/Debugger/ContextualMenu.tsx b/app/client/src/components/editorComponents/Debugger/ContextualMenu.tsx
index 2384be8dd8..373df1ba1d 100644
--- a/app/client/src/components/editorComponents/Debugger/ContextualMenu.tsx
+++ b/app/client/src/components/editorComponents/Debugger/ContextualMenu.tsx
@@ -69,12 +69,12 @@ const getOptions = (type?: string, subType?: string) => {
   }
 };
 
-type ContextualMenuProps = {
+interface ContextualMenuProps {
   error: Message;
   children: JSX.Element;
   entity?: FieldEntityInformation | SourceEntity;
   enableTooltip?: boolean;
-};
+}
 
 const searchAction: Record<
   CONTEXT_MENU_ACTIONS,
diff --git a/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx b/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx
index 1e1ab9cd55..2a6448a727 100644
--- a/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx
+++ b/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx
@@ -55,11 +55,11 @@ const StyledButton = styled(Button)`
   }
 `;
 
-type DebugCTAProps = {
+interface DebugCTAProps {
   className?: string;
   // For Analytics
   source?: string;
-};
+}
 
 function DebugCTA(props: DebugCTAProps) {
   const dispatch = useDispatch();
@@ -79,10 +79,10 @@ function DebugCTA(props: DebugCTAProps) {
   return <DebugButton className={props.className} onClick={onClick} />;
 }
 
-type DebugButtonProps = {
+interface DebugButtonProps {
   className?: string;
   onClick: () => void;
-};
+}
 
 export function DebugButton(props: DebugButtonProps) {
   return (
diff --git a/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx b/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx
index c0d9730f9a..4179757d80 100644
--- a/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx
+++ b/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx
@@ -40,10 +40,10 @@ export const ListWrapper = styled.div`
   padding-bottom: 37px;
 `;
 
-type Props = {
+interface Props {
   searchQuery: string;
   hasShortCut?: boolean;
-};
+}
 
 const LOGS_FILTER_OPTIONS = (theme: DefaultTheme) => [
   {
diff --git a/app/client/src/components/editorComponents/Debugger/DebuggerMessage.tsx b/app/client/src/components/editorComponents/Debugger/DebuggerMessage.tsx
index 6a66663961..ed3480901d 100644
--- a/app/client/src/components/editorComponents/Debugger/DebuggerMessage.tsx
+++ b/app/client/src/components/editorComponents/Debugger/DebuggerMessage.tsx
@@ -12,10 +12,10 @@ const Container = styled.div`
   color: ${(props) => props.theme.colors.debugger.messageTextColor};
 `;
 
-type DebuggerMessageProps = {
+interface DebuggerMessageProps {
   onClick: () => void;
   secondHalfText: string;
-};
+}
 
 function DebuggerMessage(props: DebuggerMessageProps) {
   return (
diff --git a/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx b/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx
index b9eefee9ca..8ad58d23ee 100644
--- a/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx
+++ b/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx
@@ -124,18 +124,18 @@ const ConnectionContainer = styled.div`
   width: 100%;
 `;
 
-type ConnectionsProps = {
+interface ConnectionsProps {
   entityName: string;
   entityDependencies: {
     inverseDependencies: string[];
     directDependencies: string[];
   } | null;
-};
+}
 
-type ConnectionProps = {
+interface ConnectionProps {
   entityName: string;
   onClick: (entityName: string, entityType: string) => void;
-};
+}
 
 const getEntityDescription = (entityType?: ENTITY_TYPE) => {
   if (entityType === ENTITY_TYPE.WIDGET) {
diff --git a/app/client/src/components/editorComponents/Debugger/EntityLink.tsx b/app/client/src/components/editorComponents/Debugger/EntityLink.tsx
index d0f3893f27..b82b226418 100644
--- a/app/client/src/components/editorComponents/Debugger/EntityLink.tsx
+++ b/app/client/src/components/editorComponents/Debugger/EntityLink.tsx
@@ -9,7 +9,7 @@ import { getAction, getDatasource } from "@appsmith/selectors/entitiesSelector";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import history from "utils/history";
 import { getQueryParams } from "utils/URLUtils";
-import { datasourcesEditorIdURL } from "RouteBuilder";
+import { datasourcesEditorIdURL } from "@appsmith/RouteBuilder";
 import type LOG_TYPE from "entities/AppsmithConsole/logtype";
 import { Link } from "design-system";
 import type { Plugin } from "api/PluginApi";
diff --git a/app/client/src/components/editorComponents/Debugger/ErrorLogs/ErrorLogItem.tsx b/app/client/src/components/editorComponents/Debugger/ErrorLogs/ErrorLogItem.tsx
index 8253706681..aa592b728e 100644
--- a/app/client/src/components/editorComponents/Debugger/ErrorLogs/ErrorLogItem.tsx
+++ b/app/client/src/components/editorComponents/Debugger/ErrorLogs/ErrorLogItem.tsx
@@ -163,7 +163,7 @@ export const getLogItemProps = (e: Log) => {
   };
 };
 
-export type LogItemProps = {
+export interface LogItemProps {
   collapsable?: boolean;
   icon: string;
   timestamp: string;
@@ -182,7 +182,7 @@ export type LogItemProps = {
   pluginErrorDetails?: PluginErrorDetails;
   isExpanded: boolean;
   environmentName?: string;
-};
+}
 
 // Log item component
 const ErrorLogItem = (props: LogItemProps) => {
diff --git a/app/client/src/components/editorComponents/Debugger/FilterHeader.tsx b/app/client/src/components/editorComponents/Debugger/FilterHeader.tsx
index 5d68cd8d0d..8d0d78f783 100644
--- a/app/client/src/components/editorComponents/Debugger/FilterHeader.tsx
+++ b/app/client/src/components/editorComponents/Debugger/FilterHeader.tsx
@@ -42,7 +42,7 @@ const OptionLabel = styled(Text)`
   margin-top: 2px;
 `;
 
-type FilterHeaderProps = {
+interface FilterHeaderProps {
   options: DropdownOption[];
   selected: DropdownOption;
   onChange: (value: string) => void;
@@ -50,7 +50,7 @@ type FilterHeaderProps = {
   defaultValue: string;
   value: string;
   searchQuery: string;
-};
+}
 
 function FilterHeader(props: FilterHeaderProps) {
   const dispatch = useDispatch();
diff --git a/app/client/src/components/editorComponents/Debugger/LogItem.tsx b/app/client/src/components/editorComponents/Debugger/LogItem.tsx
index 66075e3896..d718de1b7e 100644
--- a/app/client/src/components/editorComponents/Debugger/LogItem.tsx
+++ b/app/client/src/components/editorComponents/Debugger/LogItem.tsx
@@ -210,7 +210,7 @@ export const getLogItemProps = (e: Log) => {
   };
 };
 
-type LogItemProps = {
+interface LogItemProps {
   collapsible?: boolean;
   icon: string;
   timestamp: string;
@@ -226,7 +226,7 @@ type LogItemProps = {
   expand?: boolean;
   messages?: Message[];
   occurences: number;
-};
+}
 
 function LogItem(props: LogItemProps) {
   const [isOpen, setIsOpen] = useState(!!props.expand);
diff --git a/app/client/src/components/editorComponents/Debugger/Resizer/index.tsx b/app/client/src/components/editorComponents/Debugger/Resizer/index.tsx
index 9d506e73a3..6bb3e10254 100644
--- a/app/client/src/components/editorComponents/Debugger/Resizer/index.tsx
+++ b/app/client/src/components/editorComponents/Debugger/Resizer/index.tsx
@@ -17,14 +17,14 @@ const Top = styled.div`
   margin-bottom: -2px;
 `;
 
-type ResizerProps = {
+interface ResizerProps {
   panelRef: RefObject<HTMLDivElement>;
   setContainerDimensions?: (height: number) => void;
   onResizeComplete?: (height: number) => void;
   snapToHeight?: number;
   openResizer?: boolean;
   initialHeight?: number;
-};
+}
 
 function Resizer(props: ResizerProps) {
   const [mouseDown, setMouseDown] = useState(false);
diff --git a/app/client/src/components/editorComponents/Debugger/hooks/debuggerHooks.ts b/app/client/src/components/editorComponents/Debugger/hooks/debuggerHooks.ts
index 3533599a53..94cc34b3ab 100644
--- a/app/client/src/components/editorComponents/Debugger/hooks/debuggerHooks.ts
+++ b/app/client/src/components/editorComponents/Debugger/hooks/debuggerHooks.ts
@@ -21,7 +21,7 @@ import {
   isWidget,
 } from "@appsmith/workers/Evaluation/evaluationUtils";
 import history, { NavigationMethod } from "utils/history";
-import { jsCollectionIdURL } from "RouteBuilder";
+import { jsCollectionIdURL } from "@appsmith/RouteBuilder";
 import store from "store";
 import { PluginType } from "entities/Action";
 
diff --git a/app/client/src/components/editorComponents/EditableText.tsx b/app/client/src/components/editorComponents/EditableText.tsx
index a53c7217ae..c58e76f4ea 100644
--- a/app/client/src/components/editorComponents/EditableText.tsx
+++ b/app/client/src/components/editorComponents/EditableText.tsx
@@ -12,7 +12,7 @@ export enum EditInteractionKind {
   DOUBLE,
 }
 
-type EditableTextProps = {
+interface EditableTextProps {
   type: "text" | "password" | "email" | "phone" | "date";
   defaultValue: string;
   onTextChanged: (value: string) => void;
@@ -37,7 +37,7 @@ type EditableTextProps = {
   minLines?: number;
   customErrorTooltip?: string;
   useFullWidth?: boolean;
-};
+}
 
 // using the !important keyword here is mandatory because a style is being applied to that element using the style attribute
 // which has higher specificity than other css selectors. It seems the overriding style is being applied by the package itself.
diff --git a/app/client/src/components/editorComponents/EditorContextProvider.test.tsx b/app/client/src/components/editorComponents/EditorContextProvider.test.tsx
index 5bf03f3c0c..0171e5b6b0 100644
--- a/app/client/src/components/editorComponents/EditorContextProvider.test.tsx
+++ b/app/client/src/components/editorComponents/EditorContextProvider.test.tsx
@@ -6,9 +6,9 @@ import { Provider } from "react-redux";
 import type { EditorContextType } from "./EditorContextProvider";
 import EditorContextProvider, { EditorContext } from "./EditorContextProvider";
 
-type TestChildProps = {
+interface TestChildProps {
   editorContext: EditorContextType;
-};
+}
 
 const TestChild = (props: TestChildProps) => {
   return <div>{Object.keys(props)}</div>;
diff --git a/app/client/src/components/editorComponents/EditorContextProvider.tsx b/app/client/src/components/editorComponents/EditorContextProvider.tsx
index 01591ea968..35d946f629 100644
--- a/app/client/src/components/editorComponents/EditorContextProvider.tsx
+++ b/app/client/src/components/editorComponents/EditorContextProvider.tsx
@@ -49,7 +49,7 @@ import {
 } from "actions/autoLayoutActions";
 import { updateOneClickBindingOptionsVisibility } from "actions/oneClickBindingActions";
 
-export type EditorContextType<TCache = unknown> = {
+export interface EditorContextType<TCache = unknown> {
   executeAction?: (triggerPayload: ExecuteTriggerPayload) => void;
   updateWidget?: (
     operation: WidgetOperation,
@@ -99,7 +99,7 @@ export type EditorContextType<TCache = unknown> = {
   selectWidgetRequest?: WidgetSelectionRequest;
   updatePositionsOnTabChange?: (widgetId: string, selectedTab: string) => void;
   updateOneClickBindingOptionsVisibility?: (visibility: boolean) => void;
-};
+}
 export const EditorContext: Context<EditorContextType> = createContext({});
 
 type EditorContextProviderProps = EditorContextType & {
@@ -152,12 +152,15 @@ function extractFromObj<T, K extends keyof T>(
   keys: K[],
 ): [Pick<T, K>, T[K][]] {
   const deps = [] as T[K][];
-  const newObj = keys.reduce((newObj, curr) => {
-    newObj[curr] = obj[curr];
-    deps.push(obj[curr]);
+  const newObj = keys.reduce(
+    (newObj, curr) => {
+      newObj[curr] = obj[curr];
+      deps.push(obj[curr]);
 
-    return newObj;
-  }, {} as Pick<T, K>);
+      return newObj;
+    },
+    {} as Pick<T, K>,
+  );
 
   return [newObj, deps];
 }
diff --git a/app/client/src/components/editorComponents/EntityBottomTabs.tsx b/app/client/src/components/editorComponents/EntityBottomTabs.tsx
index 25043a5730..0506ae66ef 100644
--- a/app/client/src/components/editorComponents/EntityBottomTabs.tsx
+++ b/app/client/src/components/editorComponents/EntityBottomTabs.tsx
@@ -23,7 +23,7 @@ const TabsListWrapper = styled(TabsList)`
     var(--ads-v2-spaces-1);
 `;
 
-type EntityBottomTabsProps = {
+interface EntityBottomTabsProps {
   className?: string;
   tabs: any;
   onSelect?: (tab: any) => void;
@@ -33,7 +33,7 @@ type EntityBottomTabsProps = {
   containerRef?: RefObject<HTMLElement>;
   // height of container when expanded
   expandedHeight?: string;
-};
+}
 
 type CollapsibleEntityBottomTabsProps = EntityBottomTabsProps &
   CollapsibleTabProps;
diff --git a/app/client/src/components/editorComponents/ErrorBoundry.tsx b/app/client/src/components/editorComponents/ErrorBoundry.tsx
index 0be202320d..99acb2bff2 100644
--- a/app/client/src/components/editorComponents/ErrorBoundry.tsx
+++ b/app/client/src/components/editorComponents/ErrorBoundry.tsx
@@ -4,8 +4,12 @@ import styled from "styled-components";
 import * as Sentry from "@sentry/react";
 import * as log from "loglevel";
 
-type Props = { children: ReactNode };
-type State = { hasError: boolean };
+interface Props {
+  children: ReactNode;
+}
+interface State {
+  hasError: boolean;
+}
 
 const ErrorBoundaryContainer = styled.div`
   height: 100%;
diff --git a/app/client/src/components/editorComponents/GlobalSearch/Description.tsx b/app/client/src/components/editorComponents/GlobalSearch/Description.tsx
index 2323d3a731..1945b3976b 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/Description.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/Description.tsx
@@ -6,12 +6,12 @@ import { getItemTitle, SEARCH_ITEM_TYPES } from "./utils";
 import { getTypographyByKey } from "design-system-old";
 import type { SearchItem } from "./utils";
 
-type Props = {
+interface Props {
   activeItem: SearchItem;
   activeItemType?: SEARCH_ITEM_TYPES;
   query: string;
   scrollPositionRef: React.MutableRefObject<number>;
-};
+}
 
 const Container = styled.div`
   flex: 2;
diff --git a/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchContext.tsx b/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchContext.tsx
index c7a3ace513..3103cb4a86 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchContext.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchContext.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import type { SearchItem, SelectEvent } from "./utils";
 
-type SearchContextType = {
+interface SearchContextType {
   handleItemLinkClick: (
     event: SelectEvent,
     item?: SearchItem,
@@ -9,7 +9,7 @@ type SearchContextType = {
   ) => void;
   setActiveItemIndex: (index: number) => void;
   activeItemIndex: number;
-};
+}
 
 const SearchContext = React.createContext<SearchContextType | undefined>(
   undefined,
diff --git a/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHooks.tsx b/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHooks.tsx
index 296a4f9f60..5adb9d3ef6 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHooks.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHooks.tsx
@@ -23,7 +23,7 @@ import {
   SEARCH_ITEM_TYPES,
 } from "./utils";
 import { PluginType } from "entities/Action";
-import { integrationEditorURL } from "RouteBuilder";
+import { integrationEditorURL } from "@appsmith/RouteBuilder";
 import { EntityIcon } from "pages/Editor/Explorer/ExplorerIcons";
 import { createNewQueryAction } from "actions/apiPaneActions";
 import type { AppState } from "@appsmith/reducers";
diff --git a/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHotKeys.tsx b/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHotKeys.tsx
index ed0ddd14b4..d478fad841 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHotKeys.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHotKeys.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import { Hotkey, Hotkeys, HotkeysTarget } from "@blueprintjs/core";
 import type { SearchItem, SelectEvent } from "./utils";
 
-type Props = {
+interface Props {
   modalOpen: boolean;
   toggleShow: () => void;
   handleUpKey: () => void;
@@ -13,7 +13,7 @@ type Props = {
     source?: string,
   ) => void;
   children: React.ReactNode;
-};
+}
 @HotkeysTarget
 class GlobalSearchHotKeys extends React.Component<Props> {
   get hotKeysConfig() {
diff --git a/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx b/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx
index fa5e4a0e84..7a942c9250 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx
@@ -31,9 +31,9 @@ const StyledHelpBar = styled.div`
   }
 `;
 
-type Props = {
+interface Props {
   toggleShowModal: () => void;
-};
+}
 
 function HelpBar({ toggleShowModal }: Props) {
   return (
diff --git a/app/client/src/components/editorComponents/GlobalSearch/SearchBox.tsx b/app/client/src/components/editorComponents/GlobalSearch/SearchBox.tsx
index d09e3842bb..b80f001a43 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/SearchBox.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/SearchBox.tsx
@@ -83,12 +83,12 @@ const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
   }
 };
 
-type SearchBoxProps = {
+interface SearchBoxProps {
   query: string;
   setQuery: (query: string) => void;
   category: SearchCategory;
   setCategory: (category: any) => void;
-};
+}
 
 const useListenToChange = (modalOpen: boolean) => {
   const [listenToChange, setListenToChange] = useState(false);
diff --git a/app/client/src/components/editorComponents/GlobalSearch/SearchModal.tsx b/app/client/src/components/editorComponents/GlobalSearch/SearchModal.tsx
index 2e1a93c43e..829f118fbf 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/SearchModal.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/SearchModal.tsx
@@ -30,12 +30,12 @@ const StyledDocsSearchModal = styled(ModalContent)`
   }
 `;
 
-type Props = {
+interface Props {
   modalOpen: boolean;
   toggleShow: () => void;
   children: React.ReactNode;
   className?: string;
-};
+}
 
 function DocsSearchModal({
   children,
diff --git a/app/client/src/components/editorComponents/GlobalSearch/SearchResults.tsx b/app/client/src/components/editorComponents/GlobalSearch/SearchResults.tsx
index ee2eb7fa70..c0579045b3 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/SearchResults.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/SearchResults.tsx
@@ -395,11 +395,11 @@ const SearchItemByType = {
   [SEARCH_ITEM_TYPES.actionOperation]: ActionOperationItem,
 };
 
-type ItemProps = {
+interface ItemProps {
   item: IHit | SearchItem;
   index: number;
   query: string;
-};
+}
 
 function SearchItemComponent(props: ItemProps) {
   const { index, item, query } = props;
diff --git a/app/client/src/components/editorComponents/GlobalSearch/index.tsx b/app/client/src/components/editorComponents/GlobalSearch/index.tsx
index 45455f0523..9b96a47742 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/index.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/index.tsx
@@ -59,7 +59,7 @@ import {
   builderURL,
   datasourcesEditorIdURL,
   jsCollectionIdURL,
-} from "RouteBuilder";
+} from "@appsmith/RouteBuilder";
 import { getPlugins } from "@appsmith/selectors/entitiesSelector";
 import {
   DatasourceCreateEntryPoints,
@@ -68,7 +68,9 @@ import {
 
 const StyledContainer = styled.div<{ category: SearchCategory; query: string }>`
   max-height: 530px;
-  transition: height 0.1s ease, width 0.1s ease;
+  transition:
+    height 0.1s ease,
+    width 0.1s ease;
   height: ${(props) =>
     isMenu(props.category) ||
     isActionOperation(props.category) ||
diff --git a/app/client/src/components/editorComponents/GlobalSearch/utils.tsx b/app/client/src/components/editorComponents/GlobalSearch/utils.tsx
index 71a2417bd9..0568b38a3d 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/utils.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/utils.tsx
@@ -22,7 +22,7 @@ import { createNewJSCollection } from "actions/jsPaneActions";
 import type { EventLocation } from "@appsmith/utils/analyticsUtilTypes";
 import { getQueryParams } from "utils/URLUtils";
 import history from "utils/history";
-import { curlImportPageURL } from "RouteBuilder";
+import { curlImportPageURL } from "@appsmith/RouteBuilder";
 import { isMacOrIOS, modText, shiftText } from "utils/helpers";
 import { FocusEntity } from "navigation/FocusEntity";
 
@@ -32,11 +32,11 @@ export type SelectEvent =
   | KeyboardEvent
   | null;
 
-export type RecentEntity = {
+export interface RecentEntity {
   type: FocusEntity;
   id: string;
   pageId: string;
-};
+}
 
 export enum SEARCH_CATEGORY_ID {
   NAVIGATION = "Navigate",
@@ -66,15 +66,15 @@ export const comboHelpText = {
   ),
 };
 
-export type Snippet = {
+export interface Snippet {
   entities?: [string];
   fields?: [string];
   dataType?: string;
   language: string;
   body: SnippetBody;
-};
+}
 
-export type SnippetBody = {
+export interface SnippetBody {
   title: string;
   snippet: string;
   isTrigger?: boolean;
@@ -83,7 +83,7 @@ export type SnippetBody = {
   template: string;
   snippetMeta?: string;
   shortTitle?: string;
-};
+}
 
 export type FilterEntity = WidgetType | ENTITY_TYPE;
 
@@ -102,20 +102,20 @@ export const getSnippetFilterLabel = (state: AppState, label: string) => {
   );
 };
 
-export type SnippetArgument = {
+export interface SnippetArgument {
   identifier: string;
   name: string;
   type: ValidationTypes;
   placeholder?: boolean;
-};
+}
 
-export type SearchCategory = {
+export interface SearchCategory {
   id: SEARCH_CATEGORY_ID;
   kind?: SEARCH_ITEM_TYPES;
   title?: string;
   desc?: string;
   show?: () => boolean;
-};
+}
 
 export function getOptionalFilters(optionalFilterMeta: any) {
   return Object.entries(optionalFilterMeta || {}).reduce(
@@ -247,7 +247,7 @@ export const getEntityId = (entity: {
   }
 };
 
-export type ActionOperation = {
+export interface ActionOperation {
   title: string;
   desc: string;
   icon?: any;
@@ -255,7 +255,7 @@ export type ActionOperation = {
   action?: (pageId: string, location: EventLocation) => any;
   redirect?: (pageId: string, from: EventLocation) => any;
   pluginId?: string;
-};
+}
 
 export const actionOperations: ActionOperation[] = [
   {
diff --git a/app/client/src/components/editorComponents/HighlightedCode/index.tsx b/app/client/src/components/editorComponents/HighlightedCode/index.tsx
index 0aabec9de1..7161b284a9 100644
--- a/app/client/src/components/editorComponents/HighlightedCode/index.tsx
+++ b/app/client/src/components/editorComponents/HighlightedCode/index.tsx
@@ -28,14 +28,14 @@ export enum SYNTAX_HIGHLIGHTING_SUPPORTED_LANGUAGES {
   APPSMITH = "language-appsmith-binding", // Please note that we're using the CSS class name required by prismjs.
 }
 
-type HighlightedCodeProps = {
+interface HighlightedCodeProps {
   codeText: string;
   language?: SYNTAX_HIGHLIGHTING_SUPPORTED_LANGUAGES;
   skin: Skin;
   multiline?: boolean;
   onClick?: () => void;
   className?: string;
-};
+}
 /* eslint-disable react/display-name */
 export const HighlightedCode = forwardRef(
   (props: HighlightedCodeProps, ref: Ref<HTMLDivElement>) => {
diff --git a/app/client/src/components/editorComponents/InputComponent.tsx b/app/client/src/components/editorComponents/InputComponent.tsx
index acfb15eddd..60f7b168c4 100644
--- a/app/client/src/components/editorComponents/InputComponent.tsx
+++ b/app/client/src/components/editorComponents/InputComponent.tsx
@@ -14,14 +14,14 @@ const StyledInputGroup = styled(InputGroup)`
 
 export type InputType = "text" | "password" | "number" | "email" | "tel";
 
-type InputComponentProps = {
+interface InputComponentProps {
   placeholder: string;
   input: Partial<WrappedFieldInputProps>;
   type?: InputType;
   intent?: Intent;
   disabled?: boolean;
   autoFocus?: boolean;
-};
+}
 
 function InputComponent(props: InputComponentProps) {
   return (
diff --git a/app/client/src/components/editorComponents/LightningMenu/index.tsx b/app/client/src/components/editorComponents/LightningMenu/index.tsx
index a752c2ff3d..ce355a84dd 100644
--- a/app/client/src/components/editorComponents/LightningMenu/index.tsx
+++ b/app/client/src/components/editorComponents/LightningMenu/index.tsx
@@ -55,7 +55,7 @@ const lightningMenuOptions = (
   };
 };
 
-type LightningMenuProps = {
+interface LightningMenuProps {
   isFocused: boolean;
   isOpened: boolean;
   onSelect?: (value: string) => void;
@@ -63,7 +63,7 @@ type LightningMenuProps = {
   onCloseLightningMenu?: () => void;
   updateDynamicInputValue: (value: string, cursor?: number) => void;
   skin: Skin;
-};
+}
 
 export function LightningMenu(props: LightningMenuProps) {
   const widgets = useWidgets();
diff --git a/app/client/src/components/editorComponents/NavBarItem.tsx b/app/client/src/components/editorComponents/NavBarItem.tsx
index 6dcb8f7747..02923c931b 100644
--- a/app/client/src/components/editorComponents/NavBarItem.tsx
+++ b/app/client/src/components/editorComponents/NavBarItem.tsx
@@ -6,7 +6,7 @@ import { NavLink } from "react-router-dom";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import { Colors } from "constants/Colors";
 
-type MenuBarItemProps = {
+interface MenuBarItemProps {
   icon: Function;
   path: string;
   title: string;
@@ -18,7 +18,7 @@ type MenuBarItemProps = {
   highlight?: boolean;
   onClick?: Function;
   isActive: (currentPath: string, expectedPath: string) => boolean;
-};
+}
 
 type Props = MenuBarItemProps;
 
diff --git a/app/client/src/components/editorComponents/PageLoader.tsx b/app/client/src/components/editorComponents/PageLoader.tsx
index 12596c18cb..005263f88f 100644
--- a/app/client/src/components/editorComponents/PageLoader.tsx
+++ b/app/client/src/components/editorComponents/PageLoader.tsx
@@ -19,9 +19,9 @@ const PageLoaderWrapper = styled.div`
   }
 `;
 
-type PageLoaderProps = {
+interface PageLoaderProps {
   value?: number;
-};
+}
 
 export function PageLoader(props: PageLoaderProps) {
   return (
diff --git a/app/client/src/components/editorComponents/PaneWrapper.tsx b/app/client/src/components/editorComponents/PaneWrapper.tsx
index a82fdbebf0..ad2dd63d65 100644
--- a/app/client/src/components/editorComponents/PaneWrapper.tsx
+++ b/app/client/src/components/editorComponents/PaneWrapper.tsx
@@ -4,7 +4,9 @@ import { Colors } from "constants/Colors";
 export default styled.div`
   background-color: ${Colors.GREY_1};
   border-radius: ${(props) => props.theme.radii[0]}px;
-  box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.2), 0px 2px 10px rgba(0, 0, 0, 0.1);
+  box-shadow:
+    0px 0px 2px rgba(0, 0, 0, 0.2),
+    0px 2px 10px rgba(0, 0, 0, 0.1);
   color: ${(props) => props.theme.colors.textOnDarkBG};
   text-transform: capitalize;
 `;
diff --git a/app/client/src/components/editorComponents/PropertyPaneSidebar.tsx b/app/client/src/components/editorComponents/PropertyPaneSidebar.tsx
index 3f85e44cfb..9f8f68a4b3 100644
--- a/app/client/src/components/editorComponents/PropertyPaneSidebar.tsx
+++ b/app/client/src/components/editorComponents/PropertyPaneSidebar.tsx
@@ -39,11 +39,11 @@ const StyledResizer = styled.div<{ resizing: boolean }>`
   }
 `;
 
-type Props = {
+interface Props {
   width: number;
   onDragEnd?: () => void;
   onWidthChange: (width: number) => void;
-};
+}
 
 export const PropertyPaneSidebar = memo((props: Props) => {
   const sidebarRef = useRef<HTMLDivElement>(null);
diff --git a/app/client/src/components/editorComponents/RadioButtonGroup.tsx b/app/client/src/components/editorComponents/RadioButtonGroup.tsx
index 241f52ba0b..30f0736a58 100644
--- a/app/client/src/components/editorComponents/RadioButtonGroup.tsx
+++ b/app/client/src/components/editorComponents/RadioButtonGroup.tsx
@@ -3,18 +3,18 @@ import styled from "styled-components";
 import { Text, Button } from "design-system";
 import type { WrappedFieldMetaProps, WrappedFieldInputProps } from "redux-form";
 
-type RadioButtonGroupProps = {
+interface RadioButtonGroupProps {
   options: RadioButtonProps[];
   label: string;
   initialValue: string;
   meta?: Partial<WrappedFieldMetaProps>;
   input?: Partial<WrappedFieldInputProps>;
-};
+}
 
-type RadioButtonProps = {
+interface RadioButtonProps {
   label: string;
   value: string;
-};
+}
 
 const StyledButton = styled(Button)`
   &[aria-checked="true"] {
diff --git a/app/client/src/components/editorComponents/SelectComponent.tsx b/app/client/src/components/editorComponents/SelectComponent.tsx
index 457d9200f8..7911845183 100644
--- a/app/client/src/components/editorComponents/SelectComponent.tsx
+++ b/app/client/src/components/editorComponents/SelectComponent.tsx
@@ -3,7 +3,7 @@ import React from "react";
 import type { CustomizedDropdownProps } from "pages/common/CustomizedDropdown/index";
 import CustomizedDropdown from "pages/common/CustomizedDropdown/index";
 
-type SelectComponentProps = {
+interface SelectComponentProps {
   input: {
     value?: string;
     onChange?: (value: string) => void;
@@ -12,7 +12,7 @@ type SelectComponentProps = {
   placeholder?: string;
   size?: "large" | "small";
   outline?: boolean;
-};
+}
 
 export function SelectComponent(props: SelectComponentProps) {
   const dropdownProps: CustomizedDropdownProps = {
diff --git a/app/client/src/components/editorComponents/Sidebar.tsx b/app/client/src/components/editorComponents/Sidebar.tsx
index 4ee998ae2a..00b3ca39f4 100644
--- a/app/client/src/components/editorComponents/Sidebar.tsx
+++ b/app/client/src/components/editorComponents/Sidebar.tsx
@@ -50,9 +50,9 @@ const StyledResizer = styled.div<{ resizing: boolean }>`
   }
 `;
 
-type Props = {
+interface Props {
   children: React.ReactNode;
-};
+}
 
 export const EntityExplorerSidebar = memo(({ children }: Props) => {
   let tooltipTimeout: ReturnType<typeof setTimeout>;
diff --git a/app/client/src/components/editorComponents/StoreAsDatasource.tsx b/app/client/src/components/editorComponents/StoreAsDatasource.tsx
index 1fa4d2b5e1..bde1ca6acb 100644
--- a/app/client/src/components/editorComponents/StoreAsDatasource.tsx
+++ b/app/client/src/components/editorComponents/StoreAsDatasource.tsx
@@ -5,7 +5,7 @@ import {
 } from "actions/datasourceActions";
 import { connect, useDispatch, useSelector } from "react-redux";
 import history from "utils/history";
-import { datasourcesEditorIdURL } from "RouteBuilder";
+import { datasourcesEditorIdURL } from "@appsmith/RouteBuilder";
 import { getQueryParams } from "utils/URLUtils";
 import { getCurrentPageId } from "selectors/editorSelectors";
 import {
@@ -15,7 +15,7 @@ import {
 } from "@appsmith/constants/messages";
 import { Button } from "design-system";
 
-type storeDataSourceProps = {
+interface storeDataSourceProps {
   datasourceId?: string;
   enable: boolean;
   shouldSave: boolean;
@@ -23,7 +23,7 @@ type storeDataSourceProps = {
     datasourceId: string;
     viewMode: boolean;
   }) => void;
-};
+}
 
 interface ReduxDispatchProps {
   setDatasourceViewMode: (payload: {
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/DropdownOption.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/DropdownOption.tsx
index 315506c290..9732bd31e9 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/DropdownOption.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/DropdownOption.tsx
@@ -28,12 +28,12 @@ const Label = styled.div`
   text-overflow: ellipsis;
 `;
 
-type Props = {
+interface Props {
   label?: JSX.Element | string;
   leftIcon?: JSX.Element;
   rightIcon?: JSX.Element;
   className?: string;
-};
+}
 
 export function DropdownOption(props: Props) {
   const { className, label, leftIcon, rightIcon } = props;
@@ -49,10 +49,10 @@ export function DropdownOption(props: Props) {
   );
 }
 
-type LoadmoreProps = {
+interface LoadmoreProps {
   count: number;
   onLoadMore: () => void;
-};
+}
 
 export function LoadMoreOptions(props: LoadmoreProps) {
   if (props.count > DEFAULT_QUERY_OPTIONS_COUNTS_TO_SHOW) {
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useOtherOptions.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useOtherOptions.tsx
index fb1d1ebb96..28c4615b24 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useOtherOptions.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useOtherOptions.tsx
@@ -1,7 +1,7 @@
 import React, { useContext, useMemo } from "react";
 import { Icon } from "design-system";
 import history from "utils/history";
-import { integrationEditorURL } from "RouteBuilder";
+import { integrationEditorURL } from "@appsmith/RouteBuilder";
 import { INTEGRATION_TABS } from "constants/routes";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import { DatasourceCreateEntryPoints } from "constants/Datasource";
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/index.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/index.tsx
index 66d91919de..d4493fd3c5 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/index.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/index.tsx
@@ -5,13 +5,13 @@ import { DropdownOption } from "../../CommonControls/DatasourceDropdown/Dropdown
 import { ErrorMessage, Label, SelectWrapper } from "../../styles";
 import { useColumns } from "./useColumns";
 
-type Props = {
+interface Props {
   id: string;
   alias: string;
   label: string;
   onSelect: () => void;
   isSearcheable: boolean;
-};
+}
 
 function ColumnDropdown(props: Props) {
   const { alias, isSearcheable } = props;
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/useDropdown.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/useDropdown.tsx
index 9bde2c0546..9ed0b7be41 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/useDropdown.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/useDropdown.tsx
@@ -26,7 +26,7 @@ import type { AppState } from "@appsmith/reducers";
 import { getWidget } from "sagas/selectors";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 
-export type OneClickDropdownFieldProps = {
+export interface OneClickDropdownFieldProps {
   label: string;
   name: string;
   options: DropdownOptionType[];
@@ -35,7 +35,7 @@ export type OneClickDropdownFieldProps = {
   defaultValue?: string;
   isDataIdentifier?: boolean;
   allowClear?: boolean;
-};
+}
 
 /* useDropdown hook - this hook is specific to one click binding control and handles all the logic for the dropdown
  * This hook is used to get the options for the dropdown based on the optionType provided by the widget's control config
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/index.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/index.tsx
index 232ffda515..4f0eb842e9 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/index.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/index.tsx
@@ -5,11 +5,11 @@ import type { Alias, OtherField } from "../types";
 import { OtherFieldComponent } from "./OtherFields";
 import { useFormConfig } from "../common/useFormConfig";
 
-type Props = {
+interface Props {
   hasSearchableColumn?: boolean;
   aliases?: Alias[];
   otherFields?: OtherField[];
-};
+}
 
 export default function WidgetSpecificControls(props: Props) {
   let searchableColumn = null;
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/index.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/index.tsx
index 0ef8bba672..24702c7a19 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/index.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/index.tsx
@@ -22,7 +22,7 @@ import {
 
 import { DROPDOWN_VARIANT } from "./CommonControls/DatasourceDropdown/types";
 
-type WidgetQueryGeneratorFormContextType = {
+interface WidgetQueryGeneratorFormContextType {
   widgetId: string;
   propertyValue: string;
   propertyName: string;
@@ -56,7 +56,7 @@ type WidgetQueryGeneratorFormContextType = {
   datasourceDropdownVariant: DROPDOWN_VARIANT;
   alertMessage?: AlertMessage | null;
   showEditFieldsModal?: boolean;
-};
+}
 
 const DEFAULT_CONFIG_VALUE = {
   datasource: "",
@@ -96,7 +96,7 @@ export const WidgetQueryGeneratorFormContext =
     DEFAULT_CONTEXT_VALUE,
   );
 
-type Props = {
+interface Props {
   propertyPath: string;
   propertyValue: string;
   onUpdate: (snippet?: string, makeDynamicPropertyPath?: boolean) => void;
@@ -113,7 +113,7 @@ type Props = {
   datasourceDropdownVariant: DROPDOWN_VARIANT;
   actionButtonCtaText?: string;
   alertMessage?: AlertMessage;
-};
+}
 
 function WidgetQueryGeneratorForm(props: Props) {
   const dispatch = useDispatch();
@@ -121,22 +121,22 @@ function WidgetQueryGeneratorForm(props: Props) {
   const [pristine, setPristine] = useState(true);
 
   const {
-    aliases,
-    alertMessage,
-    showEditFieldsModal = false,
     actionButtonCtaText = createMessage(CONNECT_BUTTON_TEXT),
+    alertMessage,
+    aliases,
+    datasourceDropdownVariant,
     errorMsg,
     excludePrimaryColumnFromQueryGeneration,
     expectedType,
+    isConnectableToWidget,
     onUpdate,
+    otherFields = [],
     propertyPath,
     propertyValue,
     sampleData,
     searchableColumn,
+    showEditFieldsModal = false,
     widgetId,
-    otherFields = [],
-    isConnectableToWidget,
-    datasourceDropdownVariant,
   } = props;
 
   const isSourceOpen = useSelector(getIsOneClickBindingOptionsVisibility);
diff --git a/app/client/src/components/editorComponents/form/FieldError.tsx b/app/client/src/components/editorComponents/form/FieldError.tsx
index 5b5471d30c..4e617c3fb5 100644
--- a/app/client/src/components/editorComponents/form/FieldError.tsx
+++ b/app/client/src/components/editorComponents/form/FieldError.tsx
@@ -15,10 +15,10 @@ const StyledError = styled.span<{ show: boolean }>`
   margin-top: ${(props) => props.theme.spaces[1]}px;
 `;
 
-type FormFieldErrorProps = {
+interface FormFieldErrorProps {
   error?: string;
   className?: string;
-};
+}
 
 export function FormFieldError(props: FormFieldErrorProps) {
   return (
diff --git a/app/client/src/components/editorComponents/form/FormActionButton.tsx b/app/client/src/components/editorComponents/form/FormActionButton.tsx
index d2a7fa5f0d..e76b36ac39 100644
--- a/app/client/src/components/editorComponents/form/FormActionButton.tsx
+++ b/app/client/src/components/editorComponents/form/FormActionButton.tsx
@@ -3,10 +3,10 @@ import { Button } from "@blueprintjs/core";
 import type { Intent } from "constants/DefaultTheme";
 import { BlueprintButtonIntentsCSS } from "constants/DefaultTheme";
 
-type FormActionButtonProps = {
+interface FormActionButtonProps {
   intent?: Intent;
   large?: boolean;
-};
+}
 
 export default styled(Button)<FormActionButtonProps>`
   ${BlueprintButtonIntentsCSS}
diff --git a/app/client/src/components/editorComponents/form/FormDialogComponent.tsx b/app/client/src/components/editorComponents/form/FormDialogComponent.tsx
index a5d4874519..c4597694d6 100644
--- a/app/client/src/components/editorComponents/form/FormDialogComponent.tsx
+++ b/app/client/src/components/editorComponents/form/FormDialogComponent.tsx
@@ -7,7 +7,7 @@ import {
   ModalHeader,
 } from "design-system";
 
-type FormDialogComponentProps = {
+interface FormDialogComponentProps {
   isOpen?: boolean;
   workspace?: any;
   title?: string;
@@ -17,7 +17,7 @@ type FormDialogComponentProps = {
   applicationId?: string;
   placeholder?: string;
   hideDefaultTrigger?: boolean;
-};
+}
 
 export function FormDialogComponent(props: FormDialogComponentProps) {
   const [isModalOpen, setIsModalOpenState] = useState(!!props.isOpen);
diff --git a/app/client/src/components/editorComponents/form/FormFooter.tsx b/app/client/src/components/editorComponents/form/FormFooter.tsx
index 807af74bb9..062e120f8d 100644
--- a/app/client/src/components/editorComponents/form/FormFooter.tsx
+++ b/app/client/src/components/editorComponents/form/FormFooter.tsx
@@ -3,7 +3,7 @@ import styled from "styled-components";
 import Button from "components/editorComponents/Button";
 import Divider from "components/editorComponents/Divider";
 
-type FormFooterProps = {
+interface FormFooterProps {
   onCancel?: () => void;
   onSubmit?: () => void;
   divider?: boolean;
@@ -13,7 +13,7 @@ type FormFooterProps = {
   submitOnEnter?: boolean;
   canSubmit?: boolean;
   size?: "large" | "small";
-};
+}
 
 const FooterActions = styled.div`
   margin: 1em;
diff --git a/app/client/src/components/editorComponents/form/FormMessage.tsx b/app/client/src/components/editorComponents/form/FormMessage.tsx
index 1b077f9c31..5da430af88 100644
--- a/app/client/src/components/editorComponents/form/FormMessage.tsx
+++ b/app/client/src/components/editorComponents/form/FormMessage.tsx
@@ -10,12 +10,12 @@ import {
 } from "constants/DefaultTheme";
 import Button from "components/editorComponents/Button";
 
-export type MessageAction = {
+export interface MessageAction {
   url?: string;
   onClick?: () => void;
   text: string;
   intent: Intent;
-};
+}
 
 const StyledMessage = styled.div`
   & {
@@ -99,11 +99,11 @@ export function ActionButton(props: MessageAction) {
   return null;
 }
 
-export type FormMessageProps = {
+export interface FormMessageProps {
   intent: Intent;
   message: string;
   actions?: MessageAction[];
-};
+}
 
 export function FormMessage(props: FormMessageProps) {
   const actions =
diff --git a/app/client/src/components/editorComponents/form/FormTextField.tsx b/app/client/src/components/editorComponents/form/FormTextField.tsx
index ee6f62b4f7..a7947c0feb 100644
--- a/app/client/src/components/editorComponents/form/FormTextField.tsx
+++ b/app/client/src/components/editorComponents/form/FormTextField.tsx
@@ -21,7 +21,7 @@ const renderComponent = (
   );
 };
 
-type FormTextFieldProps = {
+interface FormTextFieldProps {
   name: string;
   placeholder: string;
   type?: InputType;
@@ -29,7 +29,7 @@ type FormTextFieldProps = {
   intent?: Intent;
   disabled?: boolean;
   autoFocus?: boolean;
-};
+}
 
 // trigger tests
 function FormTextField(props: FormTextFieldProps) {
diff --git a/app/client/src/components/editorComponents/form/ToggleComponentToJson.tsx b/app/client/src/components/editorComponents/form/ToggleComponentToJson.tsx
index fdcdd7a190..29391caffc 100644
--- a/app/client/src/components/editorComponents/form/ToggleComponentToJson.tsx
+++ b/app/client/src/components/editorComponents/form/ToggleComponentToJson.tsx
@@ -18,7 +18,7 @@ import { JS_TOGGLE_DISABLED_MESSAGE } from "@appsmith/constants/messages";
 import { ToggleButton, Tooltip } from "design-system";
 import styled from "styled-components";
 
-type Props = {
+interface Props {
   viewType: ViewTypes;
   customStyles: Record<string, any>;
   componentControlType: string;
@@ -27,13 +27,13 @@ type Props = {
   formName: string;
   disabled: boolean | undefined;
   renderCompFunction: (config?: ControlProps) => JSX.Element;
-};
+}
 
-type HandlerProps = {
+interface HandlerProps {
   configProperty: string;
   formName: string;
   change: (formName: string, id: string, value: any) => void;
-};
+}
 
 function ToggleComponentToJsonHandler(props: HandlerProps) {
   const formValues: Partial<Action> = useSelector((state: AppState) =>
diff --git a/app/client/src/components/editorComponents/form/fields/DropdownWrapper.tsx b/app/client/src/components/editorComponents/form/fields/DropdownWrapper.tsx
index 765518acbc..ea6c035fff 100644
--- a/app/client/src/components/editorComponents/form/fields/DropdownWrapper.tsx
+++ b/app/client/src/components/editorComponents/form/fields/DropdownWrapper.tsx
@@ -3,7 +3,7 @@ import { Text, Option, Select } from "design-system";
 import React, { useEffect, useState } from "react";
 import type { DropdownOnSelect } from "./SelectField";
 
-type DropdownWrapperProps = {
+interface DropdownWrapperProps {
   allowDeselection?: boolean;
   placeholder: string;
   input?: {
@@ -24,7 +24,7 @@ type DropdownWrapperProps = {
   disabled?: boolean;
   dropdownMaxHeight?: string;
   enableSearch?: boolean;
-};
+}
 
 function DropdownWrapper(props: DropdownWrapperProps) {
   const [selectedOption, setSelectedOption] = useState<any>([
diff --git a/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx b/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx
index 2d5002db86..bb49c11bf8 100644
--- a/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx
+++ b/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx
@@ -34,7 +34,7 @@ import { getCurrentApplicationId } from "selectors/editorSelectors";
 import { Indices } from "constants/Layers";
 import { getExpectedValue } from "utils/validation/common";
 import { ValidationTypes } from "constants/WidgetValidation";
-import type { DataTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { ENTITY_TYPE_VALUE } from "entities/DataTree/dataTreeFactory";
 import { getDataTree } from "selectors/dataTreeSelectors";
 import type { KeyValuePair } from "entities/Action";
@@ -61,7 +61,7 @@ import {
 import { isGACEnabled } from "@appsmith/utils/planHelpers";
 import { selectFeatureFlags } from "@appsmith/selectors/featureFlagsSelectors";
 
-type ReduxStateProps = {
+interface ReduxStateProps {
   workspaceId: string;
   currentEnvironment: string;
   datasource: EmbeddedRestDatasource;
@@ -73,11 +73,11 @@ type ReduxStateProps = {
   formName: string;
   userWorkspacePermissions: string[];
   isFeatureEnabled: boolean;
-};
+}
 
-type ReduxDispatchProps = {
+interface ReduxDispatchProps {
   updateDatasource: (datasource: EmbeddedRestDatasource) => void;
-};
+}
 
 type Props = EditorProps &
   ReduxStateProps &
@@ -147,7 +147,8 @@ const StyledTooltip = styled.span<{ width?: number }>`
   text-align: left;
   background-color: var(--ads-v2-color-bg-emphasis-max);
   border-radius: var(--ads-v2-border-radius);
-  box-shadow: 0 2px 4px -2px rgba(0, 0, 0, 0.06),
+  box-shadow:
+    0 2px 4px -2px rgba(0, 0, 0, 0.06),
     0 4px 8px -2px rgba(0, 0, 0, 0.1);
   color: var(--ads-v2-color-fg-on-emphasis-max);
   font-family: var(--ads-v2-font-family);
diff --git a/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx b/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx
index f085ce875b..670ec522d4 100644
--- a/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx
+++ b/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx
@@ -21,9 +21,9 @@ import {
 import { Button, Text } from "design-system";
 import RequestDropdownField from "./RequestDropdownField";
 
-type CustomStack = {
+interface CustomStack {
   removeTopPadding?: boolean;
-};
+}
 
 const KeyValueStackContainer = styled.div<CustomStack>`
   padding: 0 0 var(--ads-v2-spaces-7) 0;
@@ -269,7 +269,7 @@ function KeyValueRow(props: Props & WrappedFieldArrayProps) {
   );
 }
 
-type Props = {
+interface Props {
   name: string;
   label: string;
   rightIcon?: React.ReactNode;
@@ -285,7 +285,7 @@ type Props = {
   theme?: EditorTheme;
   hasType?: boolean;
   removeTopPadding?: boolean;
-};
+}
 
 function KeyValueFieldArray(props: Props) {
   return (
diff --git a/app/client/src/components/editorComponents/form/fields/RadioGroupWrapper.tsx b/app/client/src/components/editorComponents/form/fields/RadioGroupWrapper.tsx
index 9b2a96d757..34a34dc087 100644
--- a/app/client/src/components/editorComponents/form/fields/RadioGroupWrapper.tsx
+++ b/app/client/src/components/editorComponents/form/fields/RadioGroupWrapper.tsx
@@ -3,7 +3,7 @@ import React, { useEffect, useState } from "react";
 import type { WrappedFieldInputProps } from "redux-form";
 import styled from "styled-components";
 
-export type RadioGroupWrapperProps = {
+export interface RadioGroupWrapperProps {
   placeholder: string;
   input: WrappedFieldInputProps;
   options: Array<{ value: string; label: string }>;
@@ -11,7 +11,7 @@ export type RadioGroupWrapperProps = {
   className?: string;
   columns?: number;
   rows?: number;
-};
+}
 
 const RadioContainer = styled.div`
   display: flex;
diff --git a/app/client/src/components/editorComponents/form/fields/SelectField.tsx b/app/client/src/components/editorComponents/form/fields/SelectField.tsx
index 50fc0ae4af..56a2f26502 100644
--- a/app/client/src/components/editorComponents/form/fields/SelectField.tsx
+++ b/app/client/src/components/editorComponents/form/fields/SelectField.tsx
@@ -15,7 +15,7 @@ const renderComponent = (
 
 export type DropdownOnSelect = (value?: string, dropdownOption?: any) => void;
 
-type SelectFieldProps = {
+interface SelectFieldProps {
   allowDeselection?: boolean;
   isMultiSelect?: boolean;
   name: string;
@@ -32,7 +32,7 @@ type SelectFieldProps = {
   disabled?: boolean;
   dropdownMaxHeight?: string;
   enableSearch?: boolean;
-};
+}
 
 export function SelectField(props: SelectFieldProps) {
   return (
diff --git a/app/client/src/components/editorComponents/form/fields/TagListField.tsx b/app/client/src/components/editorComponents/form/fields/TagListField.tsx
index 3ae36bd710..1146863fbb 100644
--- a/app/client/src/components/editorComponents/form/fields/TagListField.tsx
+++ b/app/client/src/components/editorComponents/form/fields/TagListField.tsx
@@ -14,7 +14,7 @@ const renderComponent = (
   return <TagInput {...componentProps} />;
 };
 
-type TagListFieldProps = {
+interface TagListFieldProps {
   autofocus?: boolean;
   className?: string;
   name: string;
@@ -25,7 +25,7 @@ type TagListFieldProps = {
   customError: (err: string, values?: string[]) => void;
   suggestions?: { id: string; name: string; icon?: string }[];
   suggestionLeftIcon?: ReactElement;
-};
+}
 
 function TagListField(props: TagListFieldProps) {
   return <Field component={renderComponent} {...props} />;
diff --git a/app/client/src/components/editorComponents/form/fields/TextField.tsx b/app/client/src/components/editorComponents/form/fields/TextField.tsx
index bc5d85cf00..04802b7f70 100644
--- a/app/client/src/components/editorComponents/form/fields/TextField.tsx
+++ b/app/client/src/components/editorComponents/form/fields/TextField.tsx
@@ -4,9 +4,9 @@ import { Field } from "redux-form";
 import type { InputProps } from "design-system";
 import { Input } from "design-system";
 
-type FieldProps = {
+interface FieldProps {
   type?: string;
-};
+}
 
 class TextField extends React.Component<
   BaseFieldProps & InputProps & FieldProps
diff --git a/app/client/src/components/featureWalkthrough/utils.ts b/app/client/src/components/featureWalkthrough/utils.ts
index d46280a28f..3ada8245f5 100644
--- a/app/client/src/components/featureWalkthrough/utils.ts
+++ b/app/client/src/components/featureWalkthrough/utils.ts
@@ -3,10 +3,10 @@ import type { OffsetType, PositionType } from "./walkthroughContext";
 const DEFAULT_POSITION: PositionType = "top";
 export const PADDING_HIGHLIGHT = 10;
 
-type PositionCalculator = {
+interface PositionCalculator {
   offset?: OffsetType;
   targetId: string;
-};
+}
 
 export function getPosition({ offset, targetId }: PositionCalculator) {
   const target = document.querySelector(targetId);
diff --git a/app/client/src/components/featureWalkthrough/walkthroughContext.tsx b/app/client/src/components/featureWalkthrough/walkthroughContext.tsx
index 4e3a85046f..74978f9d2a 100644
--- a/app/client/src/components/featureWalkthrough/walkthroughContext.tsx
+++ b/app/client/src/components/featureWalkthrough/walkthroughContext.tsx
@@ -4,7 +4,7 @@ export type PositionType = "top" | "bottom" | "left" | "right";
 
 export const DEFAULT_DELAY = 0;
 
-export type OffsetType = {
+export interface OffsetType {
   // Position for the instructions and indicator
   position?: PositionType;
   // Adds an offset to top or bottom properties (of Instruction div) depending upon the position
@@ -18,18 +18,18 @@ export type OffsetType = {
   indicatorLeft?: number;
   // container offset for highlight
   highlightPad?: number;
-};
+}
 
-export type FeatureDetails = {
+export interface FeatureDetails {
   // Title to show on the instruction screen
   title: string;
   // Description to show on the instruction screen
   description: string;
   // Gif or Image to give a walkthrough
   imageURL?: string;
-};
+}
 
-export type FeatureParams = {
+export interface FeatureParams {
   // To execute a function on dismissing the tutorial walkthrough.
   onDismiss?: () => void;
   // Target Id without # to highlight the feature
@@ -50,14 +50,14 @@ export type FeatureParams = {
   dismissOnOverlayClick?: boolean;
   // execute function just before showing walkthrough highlight
   runBeforeWalkthrough?: () => void;
-};
+}
 
-type WalkthroughContextType = {
+interface WalkthroughContextType {
   pushFeature: (feature: FeatureParams, prioritize?: boolean) => void;
   popFeature: (triggeredFrom?: string) => void;
   feature: FeatureParams[];
   isOpened: boolean;
-};
+}
 
 const WalkthroughContext = React.createContext<
   WalkthroughContextType | undefined
diff --git a/app/client/src/components/featureWalkthrough/walkthroughRenderer.tsx b/app/client/src/components/featureWalkthrough/walkthroughRenderer.tsx
index 89f7d6c6f0..9948e1c06c 100644
--- a/app/client/src/components/featureWalkthrough/walkthroughRenderer.tsx
+++ b/app/client/src/components/featureWalkthrough/walkthroughRenderer.tsx
@@ -70,7 +70,7 @@ const InstructionsHeaderWrapper = styled.div`
   }
 `;
 
-type RefRectParams = {
+interface RefRectParams {
   // body params
   bh: number;
   bw: number;
@@ -79,7 +79,7 @@ type RefRectParams = {
   tw: number;
   tx: number;
   ty: number;
-};
+}
 
 /*
  * Clip Path Polygon for single target with bounding rect :
@@ -122,12 +122,12 @@ type BoundingRectTargets = Record<string, RefRectParams>;
 
 const WalkthroughRenderer = ({
   details,
-  offset,
-  targetId,
+  dismissOnOverlayClick,
   eventParams = {},
   multipleHighlights,
+  offset,
   overlayColor,
-  dismissOnOverlayClick,
+  targetId,
 }: FeatureParams) => {
   const [boundingRects, setBoundingRects] =
     useState<BoundingRectTargets | null>(null);
diff --git a/app/client/src/components/formControls/BaseControl.tsx b/app/client/src/components/formControls/BaseControl.tsx
index 114cac275c..3a3d4e8a7d 100644
--- a/app/client/src/components/formControls/BaseControl.tsx
+++ b/app/client/src/components/formControls/BaseControl.tsx
@@ -29,14 +29,17 @@ export enum ComparisonOperationsEnum {
 
 export type HiddenType = boolean | Condition | ConditionObject;
 
-export type ConditionObject = { conditionType: string; conditions: Conditions };
+export interface ConditionObject {
+  conditionType: string;
+  conditions: Conditions;
+}
 
-export type Condition = {
+export interface Condition {
   path: string;
   comparison: ComparisonOperations;
   value: any;
   flagValue: FeatureFlag;
-};
+}
 
 export type Conditions = Array<Condition> | ConditionObject;
 export interface ControlBuilder<T extends ControlProps> {
diff --git a/app/client/src/components/formControls/DropDownControl.tsx b/app/client/src/components/formControls/DropDownControl.tsx
index 21c583ffd5..c32ca384d3 100644
--- a/app/client/src/components/formControls/DropDownControl.tsx
+++ b/app/client/src/components/formControls/DropDownControl.tsx
@@ -269,13 +269,13 @@ export interface DropDownControlProps extends ControlProps {
   formValues: Partial<Action>;
 }
 
-type ReduxDispatchProps = {
+interface ReduxDispatchProps {
   updateConfigPropertyValue: (
     formName: string,
     field: string,
     value: any,
   ) => void;
-};
+}
 
 type Props = DropDownControlProps & ReduxDispatchProps;
 
diff --git a/app/client/src/components/formControls/SegmentedControl.tsx b/app/client/src/components/formControls/SegmentedControl.tsx
index bcfda91994..b3bca23c6b 100644
--- a/app/client/src/components/formControls/SegmentedControl.tsx
+++ b/app/client/src/components/formControls/SegmentedControl.tsx
@@ -105,13 +105,13 @@ export interface SegmentedControlProps extends ControlProps {
   formValues: Partial<Action>;
 }
 
-type ReduxDispatchProps = {
+interface ReduxDispatchProps {
   updateConfigPropertyValue: (
     formName: string,
     field: string,
     value: any,
   ) => void;
-};
+}
 
 type Props = SegmentedControlProps & ReduxDispatchProps;
 
diff --git a/app/client/src/components/formControls/StyledControls.tsx b/app/client/src/components/formControls/StyledControls.tsx
index ffd1bfb4dc..58dd3e6c69 100644
--- a/app/client/src/components/formControls/StyledControls.tsx
+++ b/app/client/src/components/formControls/StyledControls.tsx
@@ -13,9 +13,9 @@ import type { ContainerOrientation } from "constants/WidgetConstants";
 import { DateInput } from "@blueprintjs/datetime";
 import { Colors } from "constants/Colors";
 
-type ControlWrapperProps = {
+interface ControlWrapperProps {
   orientation?: ContainerOrientation;
-};
+}
 
 export const ControlWrapper = styled.div<ControlWrapperProps>`
   display: ${(props) =>
diff --git a/app/client/src/components/formControls/WhereClauseControl.tsx b/app/client/src/components/formControls/WhereClauseControl.tsx
index 9e5f622fdc..12f6f92d6d 100644
--- a/app/client/src/components/formControls/WhereClauseControl.tsx
+++ b/app/client/src/components/formControls/WhereClauseControl.tsx
@@ -16,12 +16,12 @@ const OperatorDropdownWidth = 100; // operators should have longer dropdown widt
 const Margin = 8;
 
 // Type of the value for each condition
-export type whereClauseValueType = {
+export interface whereClauseValueType {
   condition?: string;
   children?: [whereClauseValueType];
   key?: string;
   value?: string;
-};
+}
 
 // Form config for the value field
 const valueFieldConfig: any = {
diff --git a/app/client/src/components/propertyControls/ButtonControl.tsx b/app/client/src/components/propertyControls/ButtonControl.tsx
index 425e92927a..656ce0d206 100644
--- a/app/client/src/components/propertyControls/ButtonControl.tsx
+++ b/app/client/src/components/propertyControls/ButtonControl.tsx
@@ -4,12 +4,12 @@ import type { ControlProps } from "./BaseControl";
 import BaseControl from "./BaseControl";
 import { Button } from "design-system";
 
-export type OnButtonClickProps = {
+export interface OnButtonClickProps {
   props: ControlProps;
   updateProperty: (propertyName: string, propertyValue: any) => void;
   deleteProperties: (propertyPaths: string[]) => void;
   batchUpdateProperties: (updates: Record<string, unknown>) => void;
-};
+}
 
 export type ButtonControlProps = ControlProps & {
   onClick: (props: OnButtonClickProps) => void;
@@ -17,9 +17,9 @@ export type ButtonControlProps = ControlProps & {
   isDisabled?: (widgetProperties: any) => boolean;
 };
 
-type ButtonControlState = {
+interface ButtonControlState {
   isLoading: boolean;
-};
+}
 
 class ButtonControl extends BaseControl<
   ButtonControlProps,
diff --git a/app/client/src/components/propertyControls/ButtonListControl.tsx b/app/client/src/components/propertyControls/ButtonListControl.tsx
index f738f540c2..bd9d258eee 100644
--- a/app/client/src/components/propertyControls/ButtonListControl.tsx
+++ b/app/client/src/components/propertyControls/ButtonListControl.tsx
@@ -11,9 +11,9 @@ import { ButtonPlacementTypes } from "components/constants";
 import { DraggableListControl } from "pages/Editor/PropertyPane/DraggableListControl";
 import { DraggableListCard } from "components/propertyControls/DraggableListCard";
 
-type State = {
+interface State {
   focusedIndex: number | null;
-};
+}
 
 class ButtonListControl extends BaseControl<ControlProps, State> {
   constructor(props: ControlProps) {
diff --git a/app/client/src/components/propertyControls/ChartDataControl.tsx b/app/client/src/components/propertyControls/ChartDataControl.tsx
index d189b92f40..762ff5c76d 100644
--- a/app/client/src/components/propertyControls/ChartDataControl.tsx
+++ b/app/client/src/components/propertyControls/ChartDataControl.tsx
@@ -81,7 +81,7 @@ const Box = styled.div`
   height: 16px;
 `;
 
-type RenderComponentProps = {
+interface RenderComponentProps {
   index: string;
   item: ChartData;
   length: number;
@@ -95,7 +95,7 @@ type RenderComponentProps = {
   };
   theme: EditorTheme;
   isPieChart?: boolean;
-};
+}
 
 const expectedSeriesName: CodeEditorExpected = {
   type: "string",
diff --git a/app/client/src/components/propertyControls/DraggableListCard.tsx b/app/client/src/components/propertyControls/DraggableListCard.tsx
index 8a409feb11..635aa5c374 100644
--- a/app/client/src/components/propertyControls/DraggableListCard.tsx
+++ b/app/client/src/components/propertyControls/DraggableListCard.tsx
@@ -17,7 +17,7 @@ const ItemWrapper = styled.div`
   }
 `;
 
-type RenderComponentProps = {
+interface RenderComponentProps {
   focusedIndex: number | null | undefined;
   index: number;
   item: {
@@ -40,7 +40,7 @@ type RenderComponentProps = {
   toggleVisibility?: (index: number) => void;
   toggleCheckbox?: (index: number, checked: boolean) => void;
   isAllColumnEditable?: boolean;
-};
+}
 
 const PADDING_WITHOUT_CHECKBOX = 60;
 const PADDING_WITH_CHECKBOX = 90;
diff --git a/app/client/src/components/propertyControls/DraggableListComponent.tsx b/app/client/src/components/propertyControls/DraggableListComponent.tsx
index 744356c651..3290f2973e 100644
--- a/app/client/src/components/propertyControls/DraggableListComponent.tsx
+++ b/app/client/src/components/propertyControls/DraggableListComponent.tsx
@@ -2,13 +2,16 @@ import equal from "fast-deep-equal/es6";
 import React from "react";
 import { DraggableList } from "design-system-old";
 
-export type BaseItemProps = {
+export interface BaseItemProps {
   id: string;
   isVisible?: boolean;
   label: string;
-};
+  isDuplicateLabel?: boolean;
+  isChecked?: boolean;
+  isDragDisabled?: boolean;
+}
 
-export type RenderComponentProps<TItem extends BaseItemProps> = {
+export interface RenderComponentProps<TItem extends BaseItemProps> {
   focusedIndex: number | null | undefined;
   index: number;
   item: TItem;
@@ -20,9 +23,9 @@ export type RenderComponentProps<TItem extends BaseItemProps> = {
   updateFocus?: (index: number, isFocused: boolean) => void;
   isDragging: boolean;
   isDelete?: boolean;
-};
+}
 
-export type DroppableComponentProps<TItem extends BaseItemProps> = {
+export interface DroppableComponentProps<TItem extends BaseItemProps> {
   className?: string;
   fixedHeight?: number | boolean;
   focusedIndex: number | null | undefined;
@@ -37,7 +40,7 @@ export type DroppableComponentProps<TItem extends BaseItemProps> = {
   onEdit?: (index: number) => void;
   updateFocus?: (index: number, isFocused: boolean) => void;
   keyAccessor?: string;
-};
+}
 
 export class DroppableComponent<
   TItem extends BaseItemProps,
@@ -63,7 +66,7 @@ export class DroppableComponent<
     );
   }
 
-  getVisibleObject(item: Record<string, unknown>) {
+  getVisibleObject(item: TItem) {
     if (!item) return {};
 
     return {
diff --git a/app/client/src/components/propertyControls/DropDownControl.tsx b/app/client/src/components/propertyControls/DropDownControl.tsx
index 430f839e29..9406f5296b 100644
--- a/app/client/src/components/propertyControls/DropDownControl.tsx
+++ b/app/client/src/components/propertyControls/DropDownControl.tsx
@@ -100,9 +100,8 @@ class DropDownControl extends BaseControl<DropDownControlProps> {
           ? this.props.evaluatedValue
           : this.props.propertyValue;
 
-      selected = options.find(
-        (option) => option.value === computedValue,
-      )?.value;
+      selected = options.find((option) => option.value === computedValue)
+        ?.value;
 
       if (this.props.alwaysShowSelected && !selected) {
         selected = computedValue;
diff --git a/app/client/src/components/propertyControls/FieldConfigurationControl.tsx b/app/client/src/components/propertyControls/FieldConfigurationControl.tsx
index c7f43c6f61..e7a6c0ec18 100644
--- a/app/client/src/components/propertyControls/FieldConfigurationControl.tsx
+++ b/app/client/src/components/propertyControls/FieldConfigurationControl.tsx
@@ -25,9 +25,9 @@ type DroppableItem = BaseItemProps & {
   isCustomField: boolean;
 };
 
-type State = {
+interface State {
   focusedIndex: number | null;
-};
+}
 
 const DEFAULT_FIELD_NAME = "customField";
 
@@ -113,7 +113,7 @@ class FieldConfigurationControl extends BaseControl<ControlProps, State> {
   addNewField = () => {
     if (this.isArrayItem()) return;
 
-    const { propertyValue = {}, propertyName, widgetProperties } = this.props;
+    const { propertyName, propertyValue = {}, widgetProperties } = this.props;
     const { childStylesheet, widgetName } =
       widgetProperties as JSONFormWidgetProps;
     const schema: Schema = propertyValue;
@@ -193,7 +193,7 @@ class FieldConfigurationControl extends BaseControl<ControlProps, State> {
   };
 
   render() {
-    const { propertyValue = {}, panelConfig } = this.props;
+    const { panelConfig, propertyValue = {} } = this.props;
     const schema: Schema = propertyValue;
     const schemaItems = Object.values(schema);
 
diff --git a/app/client/src/components/propertyControls/KeyValueComponent.tsx b/app/client/src/components/propertyControls/KeyValueComponent.tsx
index 98d2f22ab8..ab9ef69223 100644
--- a/app/client/src/components/propertyControls/KeyValueComponent.tsx
+++ b/app/client/src/components/propertyControls/KeyValueComponent.tsx
@@ -48,11 +48,11 @@ type UpdatePairFunction = (
   isUpdatedViaKeyboard?: boolean,
 ) => any;
 
-type KeyValueComponentProps = {
+interface KeyValueComponentProps {
   pairs: SegmentedControlOption[];
   updatePairs: UpdatePairFunction;
   addLabel?: string;
-};
+}
 
 type SegmentedControlOptionWithKey = SegmentedControlOption & {
   key: string;
diff --git a/app/client/src/components/propertyControls/MenuButtonDynamicItemsControl.tsx b/app/client/src/components/propertyControls/MenuButtonDynamicItemsControl.tsx
index c7870916f4..aa0e5a541c 100644
--- a/app/client/src/components/propertyControls/MenuButtonDynamicItemsControl.tsx
+++ b/app/client/src/components/propertyControls/MenuButtonDynamicItemsControl.tsx
@@ -43,7 +43,7 @@ const CurlyBraces = styled.span`
   font-weight: var(--ads-v2-font-weight-bold);
 `;
 
-type InputTextProp = {
+interface InputTextProp {
   label: string;
   value: string;
   onChange: (event: React.ChangeEvent<HTMLTextAreaElement> | string) => void;
@@ -53,7 +53,7 @@ type InputTextProp = {
   dataTreePath?: string;
   additionalDynamicData: AdditionalDynamicDataTree;
   theme: EditorTheme;
-};
+}
 
 function InputText(props: InputTextProp) {
   const {
diff --git a/app/client/src/components/propertyControls/MenuItemsControl.tsx b/app/client/src/components/propertyControls/MenuItemsControl.tsx
index b15f9b2840..a575e054f0 100644
--- a/app/client/src/components/propertyControls/MenuItemsControl.tsx
+++ b/app/client/src/components/propertyControls/MenuItemsControl.tsx
@@ -10,9 +10,9 @@ import { DraggableListControl } from "pages/Editor/PropertyPane/DraggableListCon
 import { DraggableListCard } from "components/propertyControls/DraggableListCard";
 import { Button } from "design-system";
 
-type State = {
+interface State {
   focusedIndex: number | null;
-};
+}
 
 class MenuItemsControl extends BaseControl<ControlProps, State> {
   constructor(props: ControlProps) {
diff --git a/app/client/src/components/propertyControls/PrimaryColumnsControl.tsx b/app/client/src/components/propertyControls/PrimaryColumnsControl.tsx
index 476bd671f7..faa9c8d4b4 100644
--- a/app/client/src/components/propertyControls/PrimaryColumnsControl.tsx
+++ b/app/client/src/components/propertyControls/PrimaryColumnsControl.tsx
@@ -17,7 +17,7 @@ import {
   getTableStyles,
 } from "widgets/TableWidget/component/TableUtilities";
 import { reorderColumns } from "widgets/TableWidget/component/TableHelpers";
-import type { DataTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { getDataTreeForAutocomplete } from "selectors/dataTreeSelectors";
 import type { EvaluationError } from "utils/DynamicBindingUtils";
 import { getEvalErrorPath, getEvalValuePath } from "utils/DynamicBindingUtils";
@@ -56,10 +56,10 @@ const getOriginalColumn = (
   return column;
 };
 
-type State = {
+interface State {
   focusedIndex: number | null;
   duplicateColumnIds: string[];
-};
+}
 
 class PrimaryColumnsControl extends BaseControl<ControlProps, State> {
   constructor(props: ControlProps) {
diff --git a/app/client/src/components/propertyControls/PrimaryColumnsControlV2.tsx b/app/client/src/components/propertyControls/PrimaryColumnsControlV2.tsx
index 484de803ed..814ba86463 100644
--- a/app/client/src/components/propertyControls/PrimaryColumnsControlV2.tsx
+++ b/app/client/src/components/propertyControls/PrimaryColumnsControlV2.tsx
@@ -18,7 +18,7 @@ import {
   isColumnTypeEditable,
   reorderColumns,
 } from "widgets/TableWidgetV2/widget/utilities";
-import type { DataTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import {
   getDataTreeForAutocomplete,
   getPathEvalErrors,
@@ -81,11 +81,11 @@ const getOriginalColumn = (
   return column;
 };
 
-type State = {
+interface State {
   focusedIndex: number | null;
   duplicateColumnIds: string[];
   hasScrollableList: boolean;
-};
+}
 
 const LIST_CLASSNAME = "tablewidgetv2-primarycolumn-list";
 class PrimaryColumnsControlV2 extends BaseControl<ControlProps, State> {
diff --git a/app/client/src/components/propertyControls/SelectDefaultValueControl.tsx b/app/client/src/components/propertyControls/SelectDefaultValueControl.tsx
index cbf5eee371..926164863a 100644
--- a/app/client/src/components/propertyControls/SelectDefaultValueControl.tsx
+++ b/app/client/src/components/propertyControls/SelectDefaultValueControl.tsx
@@ -48,7 +48,7 @@ export const JSToString = (js: string): string => {
     .join("");
 };
 
-type InputTextProp = {
+interface InputTextProp {
   label: string;
   value: string;
   onChange: (event: React.ChangeEvent<HTMLTextAreaElement> | string) => void;
@@ -57,7 +57,7 @@ type InputTextProp = {
   placeholder?: string;
   dataTreePath?: string;
   theme: EditorTheme;
-};
+}
 
 function InputText(props: InputTextProp) {
   const {
diff --git a/app/client/src/components/propertyControls/StyledControls.tsx b/app/client/src/components/propertyControls/StyledControls.tsx
index 943c93056a..7a13720d11 100644
--- a/app/client/src/components/propertyControls/StyledControls.tsx
+++ b/app/client/src/components/propertyControls/StyledControls.tsx
@@ -5,10 +5,10 @@ import type { ContainerOrientation } from "constants/WidgetConstants";
 import { Input, Icon } from "design-system";
 import useInteractionAnalyticsEvent from "utils/hooks/useInteractionAnalyticsEvent";
 
-type ControlWrapperProps = {
+interface ControlWrapperProps {
   orientation?: ContainerOrientation;
   isAction?: boolean;
-};
+}
 
 export const ControlWrapper = styled.div<ControlWrapperProps>`
   display: ${(props) =>
diff --git a/app/client/src/components/propertyControls/TabControl.tsx b/app/client/src/components/propertyControls/TabControl.tsx
index dc86b06e99..e1797cae16 100644
--- a/app/client/src/components/propertyControls/TabControl.tsx
+++ b/app/client/src/components/propertyControls/TabControl.tsx
@@ -61,10 +61,10 @@ function TabControlComponent(props: RenderComponentProps<DroppableItem>) {
   );
 }
 
-type State = {
+interface State {
   focusedIndex: number | null;
   duplicateTabIds: string[];
-};
+}
 
 class TabControl extends BaseControl<ControlProps, State> {
   constructor(props: ControlProps) {
diff --git a/app/client/src/components/propertyControls/TableComputeValue.tsx b/app/client/src/components/propertyControls/TableComputeValue.tsx
index 620f6658e5..a4f07e6f0e 100644
--- a/app/client/src/components/propertyControls/TableComputeValue.tsx
+++ b/app/client/src/components/propertyControls/TableComputeValue.tsx
@@ -39,7 +39,7 @@ const CurlyBraces = styled.span`
   font-weight: var(--ads-v2-font-weight-bold);
 `;
 
-type InputTextProp = {
+interface InputTextProp {
   label: string;
   value: string;
   onChange: (event: React.ChangeEvent<HTMLTextAreaElement> | string) => void;
@@ -49,7 +49,7 @@ type InputTextProp = {
   dataTreePath?: string;
   additionalDynamicData: AdditionalDynamicDataTree;
   theme: EditorTheme;
-};
+}
 
 function InputText(props: InputTextProp) {
   const {
diff --git a/app/client/src/components/propertyControls/TableInlineEditValidationControl.tsx b/app/client/src/components/propertyControls/TableInlineEditValidationControl.tsx
index 4cae9ff9ca..75edcc5d50 100644
--- a/app/client/src/components/propertyControls/TableInlineEditValidationControl.tsx
+++ b/app/client/src/components/propertyControls/TableInlineEditValidationControl.tsx
@@ -51,7 +51,7 @@ export const CurlyBraces = styled.span`
   font-weight: var(--ads-v2-font-weight-bold);
 `;
 
-type InputTextProp = {
+interface InputTextProp {
   label: string;
   value: string;
   onChange: (event: React.ChangeEvent<HTMLTextAreaElement> | string) => void;
@@ -62,7 +62,7 @@ type InputTextProp = {
   additionalDynamicData: AdditionalDynamicDataTree;
   theme: EditorTheme;
   promptMessage?: JSX.Element;
-};
+}
 
 export function InputText(props: InputTextProp) {
   const {
diff --git a/app/client/src/components/propertyControls/WrappedCodeEditorControl.tsx b/app/client/src/components/propertyControls/WrappedCodeEditorControl.tsx
index 7969a8d742..f02df3e8e9 100644
--- a/app/client/src/components/propertyControls/WrappedCodeEditorControl.tsx
+++ b/app/client/src/components/propertyControls/WrappedCodeEditorControl.tsx
@@ -19,7 +19,7 @@ import { assistiveBindingHinter } from "components/editorComponents/CodeEditor/a
 import { bindingHintHelper } from "components/editorComponents/CodeEditor/hintHelpers";
 import { slashCommandHintHelper } from "components/editorComponents/CodeEditor/commandsHelper";
 
-type InputTextProp = {
+interface InputTextProp {
   label: string;
   value: string;
   onChange: (event: React.ChangeEvent<HTMLTextAreaElement> | string) => void;
@@ -29,7 +29,7 @@ type InputTextProp = {
   dataTreePath?: string;
   additionalDynamicData?: AdditionalDynamicDataTree;
   theme: EditorTheme;
-};
+}
 
 function InputText(props: InputTextProp) {
   const {
diff --git a/app/client/src/components/utils/NameEditorComponent.tsx b/app/client/src/components/utils/NameEditorComponent.tsx
index 290e59b229..22864df943 100644
--- a/app/client/src/components/utils/NameEditorComponent.tsx
+++ b/app/client/src/components/utils/NameEditorComponent.tsx
@@ -19,14 +19,14 @@ import {
 } from "@appsmith/constants/messages";
 import { PluginType } from "entities/Action";
 
-type NameEditorProps = {
+interface NameEditorProps {
   checkForGuidedTour?: boolean;
   children: (params: any) => JSX.Element;
   currentActionConfig: { id: string; name: string } | undefined;
   dispatchAction: (a: any) => any;
   suffixErrorMessage?: (params?: any) => string;
   pluginType?: PluginType;
-};
+}
 
 /**
  * It is wrapper component using render props method.
diff --git a/app/client/src/components/utils/ReduxFormTextField.tsx b/app/client/src/components/utils/ReduxFormTextField.tsx
index afc12c86fa..70ba9e3cda 100644
--- a/app/client/src/components/utils/ReduxFormTextField.tsx
+++ b/app/client/src/components/utils/ReduxFormTextField.tsx
@@ -20,11 +20,9 @@ const renderComponent = (
       {...omit(componentProps, "type")}
       {...componentProps.input}
       errorMessage={
-        !componentProps.hideErrorMessage &&
-        showError &&
-        componentProps.meta.error &&
-        componentProps.meta.error
+        !componentProps.hideErrorMessage && componentProps.meta.error
       }
+      isDisabled={componentProps.disabled}
       label={componentProps.label as string}
     />
   ) : (
@@ -36,13 +34,14 @@ const renderComponent = (
         showError &&
         componentProps.meta.error
       }
+      isDisabled={componentProps.disabled}
       renderAs={"input"}
       size="md"
     />
   );
 };
 
-export type FormTextFieldProps = {
+export interface FormTextFieldProps {
   name: string;
   placeholder: string;
   description?: string;
@@ -53,7 +52,7 @@ export type FormTextFieldProps = {
   autoFocus?: boolean;
   hideErrorMessage?: boolean;
   isRequired?: boolean;
-};
+}
 
 function ReduxFormTextField(props: FormTextFieldProps) {
   return <Field component={renderComponent} {...props} asyncControl />;
diff --git a/app/client/src/components/utils/TreeStructure.tsx b/app/client/src/components/utils/TreeStructure.tsx
index dfe7783d81..c93942ba1d 100644
--- a/app/client/src/components/utils/TreeStructure.tsx
+++ b/app/client/src/components/utils/TreeStructure.tsx
@@ -67,9 +67,9 @@ const TreeStructureWrapper = styled.div`
   }
 `;
 
-type TreeStructureProps = {
+interface TreeStructureProps {
   children: React.ReactNode;
-};
+}
 
 const TreeStructure = React.forwardRef(
   (props: TreeStructureProps, ref: any) => {
diff --git a/app/client/src/components/wds/Checkbox/index.tsx b/app/client/src/components/wds/Checkbox/index.tsx
index fbc6ba769f..a34850ab12 100644
--- a/app/client/src/components/wds/Checkbox/index.tsx
+++ b/app/client/src/components/wds/Checkbox/index.tsx
@@ -7,7 +7,7 @@ import DisabledIndeterminate from "assets/icons/widget/checkbox//disabled-indete
 
 import { darkenColor } from "widgets/WidgetUtils";
 
-type StyledCheckboxProps = {
+interface StyledCheckboxProps {
   checked?: boolean;
   disabled?: boolean;
   borderRadius?: string;
@@ -15,7 +15,7 @@ type StyledCheckboxProps = {
   hasError?: boolean;
   accentColor?: string;
   inputRef?: (el: HTMLInputElement | null) => any;
-};
+}
 
 const Checkbox = styled(BlueprintCheckbox)<StyledCheckboxProps>`
   ${({ accentColor, alignIndicator, borderRadius, hasError }) => `
diff --git a/app/client/src/components/wds/constants.ts b/app/client/src/components/wds/constants.ts
index b86e2aa195..cb05ba5aa2 100644
--- a/app/client/src/components/wds/constants.ts
+++ b/app/client/src/components/wds/constants.ts
@@ -1,4 +1,5 @@
 export const WDS_V2_WIDGET_MAP = {
-  BUTTON_WIDGET: "BUTTON_WIDGET_V2",
-  INPUT_WIDGET_V2: "INPUT_WIDGET_V3",
+  BUTTON_WIDGET: "WDS_BUTTON_WIDGET",
+  INPUT_WIDGET_V2: "WDS_INPUT_WIDGET",
+  CHECKBOX_WIDGET: "WDS_CHECKBOX_WIDGET",
 };
diff --git a/app/client/src/constants/ApiEditorConstants/GraphQLEditorConstants.ts b/app/client/src/constants/ApiEditorConstants/GraphQLEditorConstants.ts
index 0c81f7b0c4..0115f46b77 100644
--- a/app/client/src/constants/ApiEditorConstants/GraphQLEditorConstants.ts
+++ b/app/client/src/constants/ApiEditorConstants/GraphQLEditorConstants.ts
@@ -17,13 +17,13 @@ export const GRAPHQL_HTTP_METHOD_OPTIONS = [
 ];
 
 // Graphql Pagination type
-type GRAPHQL_PAGINATION_INDIVIDUAL_TYPE = {
+interface GRAPHQL_PAGINATION_INDIVIDUAL_TYPE {
   name?: any;
   type?: any;
   value?: any;
-};
+}
 
-export type GRAPHQL_PAGINATION_TYPE = {
+export interface GRAPHQL_PAGINATION_TYPE {
   cursorBased?: {
     next?: {
       limit?: GRAPHQL_PAGINATION_INDIVIDUAL_TYPE & { isSeparate: boolean };
@@ -38,7 +38,7 @@ export type GRAPHQL_PAGINATION_TYPE = {
     limit?: GRAPHQL_PAGINATION_INDIVIDUAL_TYPE;
     offset?: GRAPHQL_PAGINATION_INDIVIDUAL_TYPE;
   };
-};
+}
 
 // Graphql Default Config
 export const DEFAULT_GRAPHQL_ACTION_CONFIG: ApiActionConfig = {
diff --git a/app/client/src/constants/AppConstants.ts b/app/client/src/constants/AppConstants.ts
index ce2c8fc913..43d201193c 100644
--- a/app/client/src/constants/AppConstants.ts
+++ b/app/client/src/constants/AppConstants.ts
@@ -78,7 +78,7 @@ export const NAVIGATION_SETTINGS = {
   },
 };
 
-export type NavigationSetting = {
+export interface NavigationSetting {
   showNavbar: boolean;
   showSignIn: boolean;
   orientation: (typeof NAVIGATION_SETTINGS.ORIENTATION)[keyof typeof NAVIGATION_SETTINGS.ORIENTATION];
@@ -88,7 +88,7 @@ export type NavigationSetting = {
   colorStyle: (typeof NAVIGATION_SETTINGS.COLOR_STYLE)[keyof typeof NAVIGATION_SETTINGS.COLOR_STYLE];
   logoAssetId: string;
   logoConfiguration: (typeof NAVIGATION_SETTINGS.LOGO_CONFIGURATION)[keyof typeof NAVIGATION_SETTINGS.LOGO_CONFIGURATION];
-};
+}
 
 export type StringsFromNavigationSetting = Omit<
   NavigationSetting,
@@ -125,6 +125,8 @@ export const SIDEBAR_WIDTH = {
   MINIMAL: 66,
 };
 
+export const APP_SIDEBAR_WIDTH = 50;
+
 export const APPLICATION_TITLE_MAX_WIDTH = 192;
 export const APPLICATION_TITLE_MAX_WIDTH_MOBILE = 150;
 //all values are in milliseconds
diff --git a/app/client/src/constants/AppsmithActionConstants/ActionConstants.tsx b/app/client/src/constants/AppsmithActionConstants/ActionConstants.tsx
index 8a6f055bb1..81d5168a06 100644
--- a/app/client/src/constants/AppsmithActionConstants/ActionConstants.tsx
+++ b/app/client/src/constants/AppsmithActionConstants/ActionConstants.tsx
@@ -9,29 +9,29 @@ import apiActionDependencyConfig from "constants/AppsmithActionConstants/formCon
 import apiActionDatasourceFormButtonConfig from "constants/AppsmithActionConstants/formConfig/ApiDatasourceFormsButtonConfig";
 import type { ENTITY_TYPE } from "@appsmith/entities/DataTree/types";
 
-export type ExecuteActionPayloadEvent = {
+export interface ExecuteActionPayloadEvent {
   type: EventType;
   callback?: (result: ExecutionResult) => void;
-};
+}
 
-export type ExecutionResult = {
+export interface ExecutionResult {
   success: boolean;
-};
+}
 
-export type TriggerSource = {
+export interface TriggerSource {
   id: string;
   name: string;
   entityType?: ENTITY_TYPE;
   collectionId?: string;
   isJSAction?: boolean;
   actionId?: string;
-};
+}
 export enum TriggerKind {
   EVENT_EXECUTION = "EVENT_EXECUTION", // Eg. Button onClick
   JS_FUNCTION_EXECUTION = "JS_FUNCTION_EXECUTION", // Executing js function from jsObject page
 }
 
-export type ExecuteTriggerPayload = {
+export interface ExecuteTriggerPayload {
   dynamicString: string;
   event: ExecuteActionPayloadEvent;
   callbackData?: Array<any>;
@@ -39,7 +39,7 @@ export type ExecuteTriggerPayload = {
   source?: TriggerSource;
   widgetId?: string;
   globalContext?: Record<string, unknown>;
-};
+}
 
 export type ContentType =
   | "application/json"
diff --git a/app/client/src/constants/CanvasEditorConstants.tsx b/app/client/src/constants/CanvasEditorConstants.tsx
index e3c4ce2cc4..181340c4a8 100644
--- a/app/client/src/constants/CanvasEditorConstants.tsx
+++ b/app/client/src/constants/CanvasEditorConstants.tsx
@@ -1,13 +1,13 @@
-export type OccupiedSpace = {
+export interface OccupiedSpace {
   left: number;
   right: number;
   top: number;
   bottom: number;
   id: string;
   parentId?: string;
-};
+}
 
-export type WidgetSpace = {
+export interface WidgetSpace {
   left: number;
   right: number;
   top: number;
@@ -17,7 +17,7 @@ export type WidgetSpace = {
   parentId?: string;
   isDropTarget?: boolean;
   fixedHeight?: number;
-};
+}
 
 export const zIndexLayers = {
   PROPERTY_PANE: "z-[3]",
diff --git a/app/client/src/constants/DefaultTheme.tsx b/app/client/src/constants/DefaultTheme.tsx
index a00e9542f6..462b7e4871 100644
--- a/app/client/src/constants/DefaultTheme.tsx
+++ b/app/client/src/constants/DefaultTheme.tsx
@@ -369,25 +369,25 @@ const iconSizes = {
 
 type IconSizeType = typeof iconSizes;
 
-export type ThemeBorder = {
+export interface ThemeBorder {
   thickness: number;
   style: "dashed" | "solid";
   color: Color;
-};
+}
 
-type PropertyPaneTheme = {
+interface PropertyPaneTheme {
   width: number;
   height: number;
   dividerColor: Color;
   titleHeight: number;
   connectionsHeight: number;
-};
+}
 
 export type NestedObjectOrArray<T> =
   | Record<string, T | T[] | Record<string, T | T[]>>
   | T
   | T[];
-export type Theme = {
+export interface Theme {
   radii: Array<number>;
   fontSizes: Array<number>;
   drawerWidth: string;
@@ -513,7 +513,7 @@ export type Theme = {
     footerShadow: string;
     linkBg: string;
   };
-};
+}
 
 export const getColorWithOpacity = (color: Color, opacity: number) => {
   color = color.slice(1);
@@ -665,15 +665,15 @@ const lightShades = [
 
 type ShadeColor = (typeof darkShades)[number] | (typeof lightShades)[number];
 
-type buttonVariant = {
+interface buttonVariant {
   main: string;
   light: string;
   dark: string;
   darker: string;
   darkest: string;
-};
+}
 
-type ButtonVariantColor = {
+interface ButtonVariantColor {
   primary: {
     bgColor?: Color;
     borderColor?: Color;
@@ -692,9 +692,9 @@ type ButtonVariantColor = {
     hoverColor: Color;
     textColor?: Color;
   };
-};
+}
 
-type ColorType = {
+interface ColorType {
   overlayColor: string;
   button: {
     disabledText: ShadeColor;
@@ -1329,7 +1329,7 @@ type ColorType = {
   settings: {
     link: string;
   };
-};
+}
 
 const editorBottomBar = {
   background: Colors.WHITE,
diff --git a/app/client/src/constants/IconConstants.tsx b/app/client/src/constants/IconConstants.tsx
index b30f9d9bb8..40be6ef047 100644
--- a/app/client/src/constants/IconConstants.tsx
+++ b/app/client/src/constants/IconConstants.tsx
@@ -1,7 +1,7 @@
 import styled from "styled-components";
 import type { Color } from "./Colors";
 
-export type IconProps = {
+export interface IconProps {
   width?: number;
   height?: number;
   color?: Color;
@@ -11,7 +11,7 @@ export type IconProps = {
   keepColors?: boolean;
   disabled?: boolean;
   cursor?: "move" | "grab" | "default";
-};
+}
 
 export const IconWrapper = styled.div<IconProps>`
   &:focus {
diff --git a/app/client/src/constants/ProductUpdate.ts b/app/client/src/constants/ProductUpdate.ts
index bef8a4824e..a463f7d30c 100644
--- a/app/client/src/constants/ProductUpdate.ts
+++ b/app/client/src/constants/ProductUpdate.ts
@@ -4,7 +4,7 @@
  *
  */
 
-type ProductUpdate = {
+interface ProductUpdate {
   id: string; // ID is important for dismissal and remindLater to work
   enabled: boolean; // Won't be shown till this is true
   title: string;
@@ -12,7 +12,7 @@ type ProductUpdate = {
   learnMoreLink: string;
   canDismiss: boolean; // Can the user close this message.
   remindLaterDays?: number; // If the user chooses to remind later, // it will be shown again after these many days
-};
+}
 
 const update: ProductUpdate = {
   enabled: false,
diff --git a/app/client/src/constants/PropertyControlConstants.tsx b/app/client/src/constants/PropertyControlConstants.tsx
index 6e54fe3771..45e2b3855f 100644
--- a/app/client/src/constants/PropertyControlConstants.tsx
+++ b/app/client/src/constants/PropertyControlConstants.tsx
@@ -14,7 +14,7 @@ import type { PropertyUpdates } from "WidgetProvider/constants";
 const ControlTypes = getPropertyControlTypes();
 export type ControlType = (typeof ControlTypes)[keyof typeof ControlTypes];
 
-export type PropertyPaneSectionConfig = {
+export interface PropertyPaneSectionConfig {
   sectionName: string;
   id?: string;
   children: PropertyPaneConfig[];
@@ -24,9 +24,9 @@ export type PropertyPaneSectionConfig = {
   isDefaultOpen?: boolean;
   propertySectionPath?: string;
   tag?: string; // Used to show a tag right after the section name (only in the search results)
-};
+}
 
-export type PanelConfig = {
+export interface PanelConfig {
   editableTitle: boolean;
   titlePropertyName: string;
   panelIdPropertyName: string;
@@ -39,9 +39,9 @@ export type PanelConfig = {
     propertyPath: string,
     propertyValue: any,
   ) => Array<PropertyUpdates> | undefined;
-};
+}
 
-export type PropertyPaneControlConfig = {
+export interface PropertyPaneControlConfig {
   id?: string;
   label: string;
   propertyName: string;
@@ -98,9 +98,9 @@ export type PropertyPaneControlConfig = {
     isToggleDisabled: boolean,
     triggerFlag?: boolean,
   ) => boolean;
-};
+}
 
-type ValidationConfigParams = {
+interface ValidationConfigParams {
   min?: number; // min allowed for a number
   max?: number; // max allowed for a number
   natural?: boolean; // is a positive integer
@@ -135,13 +135,13 @@ type ValidationConfigParams = {
   limitLineBreaks?: boolean; // Used for ValidationType.TEXT to limit line breaks in a large json object.
   defaultValue?: unknown; // used for ValidationType.UNION when none the union type validation is success
   defaultErrorMessage?: string; // used for ValidationType.UNION when none the union type validation is success
-};
+}
 
-export type ValidationConfig = {
+export interface ValidationConfig {
   type: ValidationTypes;
   params?: ValidationConfigParams;
   dependentPaths?: string[];
-};
+}
 
 export type PropertyPaneConfig =
   | PropertyPaneSectionConfig
diff --git a/app/client/src/constants/ThemeConstants.tsx b/app/client/src/constants/ThemeConstants.tsx
index 64f09ec6eb..85171fc4d0 100644
--- a/app/client/src/constants/ThemeConstants.tsx
+++ b/app/client/src/constants/ThemeConstants.tsx
@@ -5,11 +5,11 @@ import { invert } from "lodash";
  *
  * NOTE: these are used in colorpicker
  */
-export type TailwindColors = {
+export interface TailwindColors {
   [key: string]: {
     [key: string]: string;
   };
-};
+}
 
 export const TAILWIND_COLORS: TailwindColors = {
   gray: {
diff --git a/app/client/src/constants/ThirdPartyConstants.tsx b/app/client/src/constants/ThirdPartyConstants.tsx
index c179106675..938c44e86b 100644
--- a/app/client/src/constants/ThirdPartyConstants.tsx
+++ b/app/client/src/constants/ThirdPartyConstants.tsx
@@ -36,3 +36,14 @@ export const PRICING_PAGE_URL = (
   `${URL}?source=${source}${instanceId ? `&instance=${instanceId}` : ``}${
     feature ? `&feature=${feature}` : ""
   }${section ? `&section=${section}` : ""}`;
+
+export const CUSTOMER_PORTAL_URL_WITH_PARAMS = (
+  URL: string,
+  source: string,
+  instanceId: string,
+  feature?: string,
+  section?: string,
+) =>
+  `${URL}?source=${source}${instanceId ? `&instance=${instanceId}` : ``}${
+    feature ? `&feature=${feature}` : ""
+  }${section ? `&section=${section}` : ""}`;
diff --git a/app/client/src/constants/WidgetValidation.ts b/app/client/src/constants/WidgetValidation.ts
index cfe96b1ace..f149850ca5 100644
--- a/app/client/src/constants/WidgetValidation.ts
+++ b/app/client/src/constants/WidgetValidation.ts
@@ -19,13 +19,13 @@ export enum ValidationTypes {
   UNION = "UNION",
 }
 
-export type ValidationResponse = {
+export interface ValidationResponse {
   isValid: boolean;
   parsed: any;
   messages?: Array<Error>;
   transformed?: any;
   isParsedValueTheSame?: boolean;
-};
+}
 
 export type Validator = (
   config: ValidationConfig,
diff --git a/app/client/src/constants/collectionsConstants.ts b/app/client/src/constants/collectionsConstants.ts
index e5bd1ba2eb..706caabdd0 100644
--- a/app/client/src/constants/collectionsConstants.ts
+++ b/app/client/src/constants/collectionsConstants.ts
@@ -1,6 +1,6 @@
 import type { ApiResponse } from "api/ApiResponses";
 
-export type TemplateList = {
+export interface TemplateList {
   id: string;
   delete: boolean;
   name: string;
@@ -8,13 +8,13 @@ export type TemplateList = {
   publisher: string;
   packageName: string;
   versionId: string;
-};
+}
 
-export type CollectionDataArray = {
+export interface CollectionDataArray {
   id: string;
   deleted: boolean;
   apiTemplateList: Array<TemplateList>;
-};
+}
 
 export type ImportedCollections = ApiResponse & {
   data: Array<CollectionDataArray>;
diff --git a/app/client/src/constants/providerConstants.ts b/app/client/src/constants/providerConstants.ts
index c71d1b5aec..b910b77013 100644
--- a/app/client/src/constants/providerConstants.ts
+++ b/app/client/src/constants/providerConstants.ts
@@ -27,7 +27,7 @@ export type ProviderTemplates = ApiResponse & {
   templateId: string;
 };
 
-export type ApiTemplates = {
+export interface ApiTemplates {
   id: string;
   deleted: boolean;
   name: string;
@@ -52,7 +52,7 @@ export type ApiTemplates = {
   datasourceConfiguration: {
     url: string;
   };
-};
+}
 
 export type ProviderTemplateArray = ApiResponse & {
   templateData: {
@@ -86,13 +86,13 @@ export type ProviderTemplateArray = ApiResponse & {
   addToPageLoading: boolean;
 };
 
-export type SearchResultsProviders = {
+export interface SearchResultsProviders {
   id: string;
   name: string;
   description: string;
   imageUrl: string;
   url: string;
   documentationUrl: string;
-};
+}
 
 export const DEFAULT_TEMPLATE_TYPE = "TEMPLATE";
diff --git a/app/client/src/constants/routes.test.ts b/app/client/src/constants/routes.test.ts
index 99917bc2b8..03d5fe4533 100644
--- a/app/client/src/constants/routes.test.ts
+++ b/app/client/src/constants/routes.test.ts
@@ -1,5 +1,5 @@
-import urlBuilder from "entities/URLRedirect/URLAssembly";
-import { builderURL, viewerURL } from "RouteBuilder";
+import urlBuilder from "@appsmith/entities/URLRedirect/URLAssembly";
+import { builderURL, viewerURL } from "@appsmith/RouteBuilder";
 
 describe("builderURL", () => {
   let location: typeof window.location;
diff --git a/app/client/src/constants/routes/appRoutes.ts b/app/client/src/constants/routes/appRoutes.ts
index bed3acea55..0f1b37cbef 100644
--- a/app/client/src/constants/routes/appRoutes.ts
+++ b/app/client/src/constants/routes/appRoutes.ts
@@ -94,36 +94,36 @@ export const addBranchParam = (branch: string) => {
   return url.toString().slice(url.origin.length);
 };
 
-export type BuilderRouteParams = {
+export interface BuilderRouteParams {
   pageId: string;
   applicationId: string;
-};
+}
 
-export type AppViewerRouteParams = {
+export interface AppViewerRouteParams {
   pageId: string;
   applicationId?: string;
-};
+}
 
-export type APIEditorRouteParams = {
+export interface APIEditorRouteParams {
   pageId: string;
   apiId?: string;
-};
+}
 
-export type ProviderViewerRouteParams = {
+export interface ProviderViewerRouteParams {
   pageId: string;
   providerId: string;
-};
+}
 
-export type QueryEditorRouteParams = {
+export interface QueryEditorRouteParams {
   pageId: string;
   queryId?: string;
   apiId?: string;
-};
+}
 
-export type JSEditorRouteParams = {
+export interface JSEditorRouteParams {
   pageId: string;
   collectionId?: string;
-};
+}
 
 export const GIT_BRANCH_QUERY_KEY = "branch";
 
diff --git a/app/client/src/constants/routes/baseRoutes.ts b/app/client/src/constants/routes/baseRoutes.ts
index 583419d6db..4b0a059c63 100644
--- a/app/client/src/constants/routes/baseRoutes.ts
+++ b/app/client/src/constants/routes/baseRoutes.ts
@@ -28,7 +28,7 @@ export const WORKSPACE_INVITE_USERS_PAGE_URL = `${WORKSPACE_URL}/invite`;
 export const WORKSPACE_SETTINGS_PAGE_URL = `${WORKSPACE_URL}/settings`;
 export const WORKSPACE_SETTINGS_GENERAL_PAGE_URL = `${WORKSPACE_URL}/settings/general`;
 export const WORKSPACE_SETTINGS_MEMBERS_PAGE_URL = `${WORKSPACE_URL}/settings/members`;
-export const WORKSPACE_SETTINGS_BILLING_PAGE_URL = `/settings/billing`;
+export const WORKSPACE_SETTINGS_LICENSE_PAGE_URL = `/settings/license`;
 
 export const matchApplicationPath = match(APPLICATIONS_URL);
 export const matchTemplatesPath = match(TEMPLATES_PATH);
diff --git a/app/client/src/constants/userConstants.ts b/app/client/src/constants/userConstants.ts
index 43caa5a9db..33c614fb38 100644
--- a/app/client/src/constants/userConstants.ts
+++ b/app/client/src/constants/userConstants.ts
@@ -2,7 +2,7 @@ export const ANONYMOUS_USERNAME = "anonymousUser";
 
 type Gender = "MALE" | "FEMALE";
 
-export type User = {
+export interface User {
   email: string;
   workspaceIds: string[];
   username: string;
@@ -19,7 +19,7 @@ export type User = {
   isAnonymous?: boolean;
   isIntercomConsentGiven?: boolean;
   emailVerified: boolean;
-};
+}
 
 export interface UserApplication {
   id: string;
@@ -48,7 +48,7 @@ export const DefaultCurrentUserDetails: User = {
 export const USER_PHOTO_URL = "v1/users/photo";
 export const USER_PHOTO_ASSET_URL = "v1/assets";
 
-export type UserRoleUsecasePayload = {
+export interface UserRoleUsecasePayload {
   role: string;
   useCase: string;
-};
+}
diff --git a/app/client/src/ee/RouteBuilder.ts b/app/client/src/ee/RouteBuilder.ts
new file mode 100644
index 0000000000..1ca10fd6a7
--- /dev/null
+++ b/app/client/src/ee/RouteBuilder.ts
@@ -0,0 +1 @@
+export * from "ce/RouteBuilder";
diff --git a/app/client/src/ee/components/EnvConfigSection/index.tsx b/app/client/src/ee/components/EnvConfigSection/index.tsx
index 87bfba2728..400272023d 100644
--- a/app/client/src/ee/components/EnvConfigSection/index.tsx
+++ b/app/client/src/ee/components/EnvConfigSection/index.tsx
@@ -1,12 +1,12 @@
 import type { Datasource } from "entities/Datasource";
 import { renderDatasourceSection } from "pages/Editor/DataSourceEditor/DatasourceSection";
 
-type Props = {
+interface Props {
   currentEnv: string;
   config: any;
   datasource: Datasource;
   viewMode: boolean | undefined;
-};
+}
 
 export function EnvConfigSection({
   config,
diff --git a/app/client/src/ee/entities/URLRedirect/URLAssembly.ts b/app/client/src/ee/entities/URLRedirect/URLAssembly.ts
new file mode 100644
index 0000000000..492c934e6c
--- /dev/null
+++ b/app/client/src/ee/entities/URLRedirect/URLAssembly.ts
@@ -0,0 +1,3 @@
+export * from "ce/entities/URLRedirect/URLAssembly";
+import { default as CE_urlBUilder } from "ce/entities/URLRedirect/URLAssembly";
+export default CE_urlBUilder;
diff --git a/app/client/src/ee/pages/AdminSettings/config/DeveloperSettings/index.ts b/app/client/src/ee/pages/AdminSettings/config/DeveloperSettings/index.ts
new file mode 100644
index 0000000000..bdc549e9f3
--- /dev/null
+++ b/app/client/src/ee/pages/AdminSettings/config/DeveloperSettings/index.ts
@@ -0,0 +1 @@
+export * from "ce/pages/AdminSettings/config/DeveloperSettings";
diff --git a/app/client/src/ee/pages/common/AppHeader.tsx b/app/client/src/ee/pages/common/AppHeader.tsx
new file mode 100644
index 0000000000..72bdbe75d7
--- /dev/null
+++ b/app/client/src/ee/pages/common/AppHeader.tsx
@@ -0,0 +1,38 @@
+export * from "ce/pages/common/AppHeader";
+import { Routes as CE_Routes } from "ce/pages/common/AppHeader";
+import React from "react";
+import ReactDOM from "react-dom";
+import { Switch } from "react-router";
+import type { RouteComponentProps } from "react-router";
+import { withRouter } from "react-router";
+
+type Props = RouteComponentProps;
+
+const headerRoot = document.getElementById("header-root");
+
+const Routes = () => {
+  return (
+    <Switch>
+      <CE_Routes />
+    </Switch>
+  );
+};
+
+class AppHeader extends React.Component<Props, any> {
+  private container = document.createElement("div");
+
+  componentDidMount() {
+    headerRoot?.appendChild(this.container);
+  }
+  componentWillUnmount() {
+    headerRoot?.removeChild(this.container);
+  }
+  get header() {
+    return <Routes />;
+  }
+  render() {
+    return ReactDOM.createPortal(this.header, this.container);
+  }
+}
+
+export default withRouter(AppHeader);
diff --git a/app/client/src/entities/Action/index.ts b/app/client/src/entities/Action/index.ts
index f27eed1f2f..9756c02d52 100644
--- a/app/client/src/entities/Action/index.ts
+++ b/app/client/src/entities/Action/index.ts
@@ -62,10 +62,10 @@ export interface KeyValuePair {
   value?: unknown;
 }
 
-export type LimitOffset = {
+export interface LimitOffset {
   limit: Record<string, unknown>;
   offset: Record<string, unknown>;
-};
+}
 export interface SelfReferencingData {
   limitBased?: LimitOffset;
   curserBased?: {
@@ -196,14 +196,14 @@ export interface QueryAction extends BaseAction {
   datasource: StoredDatasource;
 }
 
-export type ActionViewMode = {
+export interface ActionViewMode {
   id: string;
   name: string;
   pageId: string;
   jsonPathKeys: string[];
   confirmBeforeExecute?: boolean;
   timeoutInMillisecond?: number;
-};
+}
 
 export type Action = ApiAction | QueryAction | SaaSAction | RemoteAction;
 
@@ -214,11 +214,11 @@ export enum SlashCommand {
   ASK_AI,
 }
 
-export type SlashCommandPayload = {
+export interface SlashCommandPayload {
   actionType: SlashCommand;
   callback?: (binding: string) => void;
   args: any;
-};
+}
 
 export function isAPIAction(action: Action): action is ApiAction {
   return action.pluginType === PluginType.API;
diff --git a/app/client/src/entities/AppCollab/CollabInterfaces.ts b/app/client/src/entities/AppCollab/CollabInterfaces.ts
index 9b1827609f..c7dc357eeb 100644
--- a/app/client/src/entities/AppCollab/CollabInterfaces.ts
+++ b/app/client/src/entities/AppCollab/CollabInterfaces.ts
@@ -1,4 +1,4 @@
-export type User = {
+export interface User {
   name: string;
   email: string;
-};
+}
diff --git a/app/client/src/entities/AppTheming/index.ts b/app/client/src/entities/AppTheming/index.ts
index e40b76b7e9..5193be0a86 100644
--- a/app/client/src/entities/AppTheming/index.ts
+++ b/app/client/src/entities/AppTheming/index.ts
@@ -8,24 +8,24 @@ export type Stylesheet<T = void> = T extends void
   ? DefaultStylesheet
   : T & DefaultStylesheet;
 
-export type AppThemeStylesheet = {
+export interface AppThemeStylesheet {
   [key: string]: Stylesheet;
-};
+}
 
-export type ButtonStyles = {
+export interface ButtonStyles {
   resetButtonStyles: {
     [key: string]: string;
   };
   submitButtonStyles: {
     [key: string]: string;
   };
-};
+}
 
-export type ChildStylesheet = {
+export interface ChildStylesheet {
   childStylesheet: AppThemeStylesheet;
-};
+}
 
-export type AppTheme = {
+export interface AppTheme {
   id: string;
   name: string;
   displayName: string;
@@ -76,9 +76,9 @@ export type AppTheme = {
       [key: string]: string;
     };
   };
-};
+}
 
-export type SetterConfig = {
+export interface SetterConfig {
   __setters: {
     [key: string]: {
       path: string;
@@ -87,4 +87,4 @@ export type SetterConfig = {
       accessor?: string;
     };
   };
-};
+}
diff --git a/app/client/src/entities/AppsmithConsole/index.ts b/app/client/src/entities/AppsmithConsole/index.ts
index 50e9a81822..4f31256e64 100644
--- a/app/client/src/entities/AppsmithConsole/index.ts
+++ b/app/client/src/entities/AppsmithConsole/index.ts
@@ -29,14 +29,14 @@ export type Methods =
   | "count"
   | "assert";
 
-export type LogObject = {
+export interface LogObject {
   method: Methods | "result";
   data: any[];
   timestamp: string;
   id: string;
   severity: Severity;
   source: SourceEntity;
-};
+}
 
 export type ErrorType = PropertyEvaluationErrorType | PLATFORM_ERROR;
 
@@ -53,7 +53,7 @@ export enum Severity {
   // CRITICAL = "critical",
 }
 
-export type UserAction = {
+export interface UserAction {
   // Label is used to display the
   label: string;
   // As there can be multiple errors of the same base type at the same time
@@ -61,7 +61,7 @@ export type UserAction = {
   // these action types should have a dynamic `id` associated with them
   // or we should use JS callback functions instead
   reduxAction: ReduxAction<unknown>;
-};
+}
 
 export interface SourceEntity {
   type: ENTITY_TYPE;
diff --git a/app/client/src/entities/DataTree/dataTreeFactory.ts b/app/client/src/entities/DataTree/dataTreeFactory.ts
index 7428610823..e3a49e7c65 100644
--- a/app/client/src/entities/DataTree/dataTreeFactory.ts
+++ b/app/client/src/entities/DataTree/dataTreeFactory.ts
@@ -9,12 +9,14 @@ import {
 import { generateDataTreeModuleInputs } from "@appsmith/entities/DataTree/utils";
 import type {
   DataTreeSeed,
-  unEvalAndConfigTree,
-  ConfigTree,
   AppsmithEntity,
-  UnEvalTree,
   ENTITY_TYPE,
 } from "@appsmith/entities/DataTree/types";
+import type {
+  unEvalAndConfigTree,
+  ConfigTree,
+  UnEvalTree,
+} from "entities/DataTree/dataTreeTypes";
 import { isEmpty } from "lodash";
 
 export class DataTreeFactory {
@@ -34,8 +36,8 @@ export class DataTreeFactory {
     widgets,
     widgetsMeta,
   }: DataTreeSeed): unEvalAndConfigTree {
-    let dataTree: UnEvalTree = {};
-    let configTree: ConfigTree = {};
+    const dataTree: UnEvalTree = {};
+    const configTree: ConfigTree = {};
     const start = performance.now();
     const startActions = performance.now();
 
@@ -64,13 +66,14 @@ export class DataTreeFactory {
     const startWidgets = performance.now();
 
     if (!isEmpty(moduleInputs)) {
-      const data = generateDataTreeModuleInputs(
-        dataTree,
-        configTree,
-        moduleInputs,
-      );
-      dataTree = data.dataTree;
-      configTree = data.configTree;
+      for (const [key, value] of Object.entries(moduleInputs)) {
+        const { configEntity, unEvalEntity } =
+          generateDataTreeModuleInputs(value);
+        if (!!configEntity && !!unEvalEntity) {
+          dataTree[key] = unEvalEntity;
+          configTree[key] = configEntity;
+        }
+      }
     }
 
     Object.values(widgets).forEach((widget) => {
diff --git a/app/client/src/entities/DataTree/dataTreeTypes.ts b/app/client/src/entities/DataTree/dataTreeTypes.ts
new file mode 100644
index 0000000000..8d0996a839
--- /dev/null
+++ b/app/client/src/entities/DataTree/dataTreeTypes.ts
@@ -0,0 +1,27 @@
+import type {
+  DataTreeEntityConfig,
+  DataTreeEntityObject,
+  ActionDispatcher,
+  UnEvalTreeEntityObject,
+  AppsmithEntity,
+} from "@appsmith/entities/DataTree/types";
+import type { Page } from "@appsmith/constants/ReduxActionConstants";
+
+export interface unEvalAndConfigTree {
+  unEvalTree: UnEvalTree;
+  configTree: ConfigTree;
+}
+
+export interface ConfigTree {
+  [entityName: string]: DataTreeEntityConfig;
+}
+export type DataTreeEntity = DataTreeEntityObject | Page[] | ActionDispatcher;
+
+export interface DataTree {
+  [entityName: string]: DataTreeEntity;
+}
+export type UnEvalTreeEntity = UnEvalTreeEntityObject | AppsmithEntity | Page[];
+
+export interface UnEvalTree {
+  [entityName: string]: UnEvalTreeEntity;
+}
diff --git a/app/client/src/entities/Engine/index.ts b/app/client/src/entities/Engine/index.ts
index 9c94b86230..50e05f5f2f 100644
--- a/app/client/src/entities/Engine/index.ts
+++ b/app/client/src/entities/Engine/index.ts
@@ -18,12 +18,12 @@ import URLGeneratorFactory from "entities/URLRedirect/factory";
 import { updateBranchLocally } from "actions/gitSyncActions";
 import { getCurrentGitBranch } from "selectors/gitSyncSelectors";
 
-export type AppEnginePayload = {
+export interface AppEnginePayload {
   applicationId?: string;
   pageId?: string;
   branch?: string;
   mode: APP_MODE;
-};
+}
 
 export interface IAppEngine {
   setupEngine(payload: AppEnginePayload): any;
diff --git a/app/client/src/entities/GitSync.ts b/app/client/src/entities/GitSync.ts
index 65f464028c..6b8d46bde2 100644
--- a/app/client/src/entities/GitSync.ts
+++ b/app/client/src/entities/GitSync.ts
@@ -5,21 +5,21 @@ export enum GitSyncModalTab {
   SETTINGS = "SETTINGS",
 }
 
-export type GitConfig = {
+export interface GitConfig {
   authorName: string;
   authorEmail: string;
   useGlobalProfile?: boolean;
-};
+}
 
-export type Branch = {
+export interface Branch {
   branchName: string;
   default: boolean;
-};
+}
 
-export type MergeStatus = {
+export interface MergeStatus {
   isMergeAble: boolean;
   conflictingFiles: Array<string>;
   status?: string;
   message?: string;
   referenceDoc?: string;
-};
+}
diff --git a/app/client/src/entities/JSCollection/index.ts b/app/client/src/entities/JSCollection/index.ts
index df540b556f..c1bbe97ba0 100644
--- a/app/client/src/entities/JSCollection/index.ts
+++ b/app/client/src/entities/JSCollection/index.ts
@@ -2,10 +2,10 @@ import type { BaseAction } from "../Action";
 import type { PluginType } from "entities/Action";
 import type { LayoutOnLoadActionErrors } from "constants/AppsmithActionConstants/ActionConstants";
 
-export type Variable = {
+export interface Variable {
   name: string;
   value: any;
-};
+}
 export interface JSCollection {
   id: string;
   applicationId: string;
diff --git a/app/client/src/entities/Replay/ReplayEntity/ReplayCanvas.ts b/app/client/src/entities/Replay/ReplayEntity/ReplayCanvas.ts
index a4134998c8..0134501aa1 100644
--- a/app/client/src/entities/Replay/ReplayEntity/ReplayCanvas.ts
+++ b/app/client/src/entities/Replay/ReplayEntity/ReplayCanvas.ts
@@ -13,10 +13,10 @@ import {
 import type { AppTheme } from "entities/AppTheming";
 import { ENTITY_TYPE } from "entities/AppsmithConsole";
 
-export type Canvas = {
+export interface Canvas {
   widgets: CanvasWidgetsReduxState;
   theme: AppTheme;
-};
+}
 export type CanvasDiff = Diff<Canvas, Canvas>;
 export type DSLDiff = Diff<CanvasWidgetsReduxState, CanvasWidgetsReduxState>;
 
diff --git a/app/client/src/entities/Replay/ReplayEntity/ReplayEditor.ts b/app/client/src/entities/Replay/ReplayEntity/ReplayEditor.ts
index 4ba85a92d5..364b201ba2 100644
--- a/app/client/src/entities/Replay/ReplayEntity/ReplayEditor.ts
+++ b/app/client/src/entities/Replay/ReplayEntity/ReplayEditor.ts
@@ -20,13 +20,13 @@ export type Replayable =
 
 type ReplayEditorDiff = Diff<Replayable, Replayable>;
 
-export type ReplayEditorUpdate = {
+export interface ReplayEditorUpdate {
   modifiedProperty: string;
   index?: number;
   update: Replayable | ReplayEditorDiff;
   kind: "N" | "D" | "E" | "A";
   isUndo?: boolean;
-};
+}
 export default class ReplayEditor extends ReplayEntity<Replayable> {
   constructor(entity: Replayable, entityType: ENTITY_TYPE) {
     super(entity, entityType);
diff --git a/app/client/src/entities/URLRedirect/DefaultURLRedirect.ts b/app/client/src/entities/URLRedirect/DefaultURLRedirect.ts
index c5eb3d37b0..5a380bd717 100644
--- a/app/client/src/entities/URLRedirect/DefaultURLRedirect.ts
+++ b/app/client/src/entities/URLRedirect/DefaultURLRedirect.ts
@@ -2,7 +2,7 @@ import { ApplicationVersion } from "@appsmith/actions/applicationActions";
 import type { ApplicationPayload } from "@appsmith/constants/ReduxActionConstants";
 import { APP_MODE } from "entities/App";
 import { select } from "redux-saga/effects";
-import { builderURL } from "RouteBuilder";
+import { builderURL } from "@appsmith/RouteBuilder";
 import { getCurrentApplication } from "@appsmith/selectors/applicationSelectors";
 import { isURLDeprecated } from "utils/helpers";
 import URLRedirect from ".";
diff --git a/app/client/src/entities/URLRedirect/SlugURLRedirect.ts b/app/client/src/entities/URLRedirect/SlugURLRedirect.ts
index 3d03aca20d..3b2b13ba49 100644
--- a/app/client/src/entities/URLRedirect/SlugURLRedirect.ts
+++ b/app/client/src/entities/URLRedirect/SlugURLRedirect.ts
@@ -4,7 +4,7 @@ import type {
 } from "@appsmith/constants/ReduxActionConstants";
 import { APP_MODE } from "entities/App";
 import { select } from "redux-saga/effects";
-import { fillPathname, viewerURL } from "RouteBuilder";
+import { fillPathname, viewerURL } from "@appsmith/RouteBuilder";
 import { getCurrentApplication } from "@appsmith/selectors/applicationSelectors";
 import { getPageById } from "selectors/editorSelectors";
 import { getUpdatedRoute, isURLDeprecated } from "utils/helpers";
diff --git a/app/client/src/layoutSystems/anvil/integrations/actions/actionTypes.ts b/app/client/src/layoutSystems/anvil/integrations/actions/actionTypes.ts
index 97ef0dc919..6eccae1173 100644
--- a/app/client/src/layoutSystems/anvil/integrations/actions/actionTypes.ts
+++ b/app/client/src/layoutSystems/anvil/integrations/actions/actionTypes.ts
@@ -1,7 +1,7 @@
-export type AnvilReduxAction<T> = {
+export interface AnvilReduxAction<T> {
   type: AnvilReduxActionTypes;
   payload: T;
-};
+}
 
 export enum AnvilReduxActionTypes {
   READ_WIDGET_POSITIONS = "READ_WIDGET_POSITIONS",
diff --git a/app/client/src/layoutSystems/autolayout/canvas/types.ts b/app/client/src/layoutSystems/autolayout/canvas/types.ts
index e9528c099c..e7ff54f663 100644
--- a/app/client/src/layoutSystems/autolayout/canvas/types.ts
+++ b/app/client/src/layoutSystems/autolayout/canvas/types.ts
@@ -1,4 +1,4 @@
-export type AdditionalAutoLayoutProperties = {
+export interface AdditionalAutoLayoutProperties {
   parentColumnSpace: number;
   parentRowSpace: number;
-};
+}
diff --git a/app/client/src/layoutSystems/autolayout/utils/AutoLayoutUtils.ts b/app/client/src/layoutSystems/autolayout/utils/AutoLayoutUtils.ts
index 897a4de233..7b18ead699 100644
--- a/app/client/src/layoutSystems/autolayout/utils/AutoLayoutUtils.ts
+++ b/app/client/src/layoutSystems/autolayout/utils/AutoLayoutUtils.ts
@@ -34,11 +34,11 @@ import type {
 } from "layoutSystems/autolayout/utils/types";
 import type { FlexLayer, LayerChild } from "./types";
 
-export type ReadableSnapShotDetails = {
+export interface ReadableSnapShotDetails {
   timeSince: string;
   timeTillExpiration: string;
   readableDate: string;
-};
+}
 
 /**
  * Update flex layers of parent canvas upon deleting a child widget.
diff --git a/app/client/src/layoutSystems/autolayout/utils/types.ts b/app/client/src/layoutSystems/autolayout/utils/types.ts
index a6b6660648..4fa28d18c9 100644
--- a/app/client/src/layoutSystems/autolayout/utils/types.ts
+++ b/app/client/src/layoutSystems/autolayout/utils/types.ts
@@ -17,7 +17,7 @@ export interface FlexLayer {
   children: LayerChild[];
 }
 
-export type FlexComponentProps = {
+export interface FlexComponentProps {
   alignment: FlexVerticalAlignment;
   children: ReactNode;
   componentHeight: number;
@@ -34,20 +34,20 @@ export type FlexComponentProps = {
   flexVerticalAlignment: FlexVerticalAlignment;
   isMobile: boolean;
   renderMode: RenderMode;
-};
+}
 
 export type AlignmentColumnInfo = {
   [key in FlexLayerAlignment]: number;
 };
 
-export type FlexBoxAlignmentColumnInfo = {
+export interface FlexBoxAlignmentColumnInfo {
   [key: number]: AlignmentColumnInfo;
-};
+}
 
-export type AlignmentColumnData = {
+export interface AlignmentColumnData {
   alignment: FlexLayerAlignment;
   columns: number;
-};
+}
 
 /**
  * Start: Position utils types
diff --git a/app/client/src/layoutSystems/common/WidgetNamesCanvas/WidgetNameTypes.ts b/app/client/src/layoutSystems/common/WidgetNamesCanvas/WidgetNameTypes.ts
index 7336cb6a9f..d7b0af3c20 100644
--- a/app/client/src/layoutSystems/common/WidgetNamesCanvas/WidgetNameTypes.ts
+++ b/app/client/src/layoutSystems/common/WidgetNamesCanvas/WidgetNameTypes.ts
@@ -4,30 +4,30 @@ import type { WidgetNameState } from "./WidgetNameConstants";
 export type WIDGET_NAME_TYPE = "selected" | "focused";
 
 //Contains the data of widget which are required to draw widget names on canvas
-export type WidgetNameData = {
+export interface WidgetNameData {
   id: string;
   position: WidgetPosition;
   widgetName: string;
   parentId: string;
   nameState: WidgetNameState;
   dragDisabled: boolean;
-};
+}
 
 //Position of the widget name on canvas, required to enable interaction on canvas
-export type WidgetNamePositionData = {
+export interface WidgetNamePositionData {
   left: number;
   top: number;
   width: number;
   height: number;
   widgetNameData: WidgetNameData;
-};
+}
 
 //Position of canvas with respect to client browser
-export type CanvasPositions = {
+export interface CanvasPositions {
   top: number;
   left: number;
   xDiff: number;
   width: number;
   yDiff: number;
   height: number;
-};
+}
diff --git a/app/client/src/layoutSystems/common/canvasArenas/ArenaTypes.ts b/app/client/src/layoutSystems/common/canvasArenas/ArenaTypes.ts
index d3f6106f57..52e76a7bd6 100644
--- a/app/client/src/layoutSystems/common/canvasArenas/ArenaTypes.ts
+++ b/app/client/src/layoutSystems/common/canvasArenas/ArenaTypes.ts
@@ -4,7 +4,7 @@ import type { WidgetOperationParams } from "utils/WidgetPropsUtils";
 
 //WidgetDraggingBlock contains information related to a dragging widget,
 //that is used in computing logic to enable drag and drop of the particular widget
-export type WidgetDraggingBlock = {
+export interface WidgetDraggingBlock {
   left: number;
   top: number;
   width: number;
@@ -16,7 +16,7 @@ export type WidgetDraggingBlock = {
   detachFromLayout?: boolean;
   fixedHeight?: number;
   type: string;
-};
+}
 
 //WidgetDraggingUpdateParams is an extension of WidgetDraggingBlock,
 // with updateWidgetParams information required to dispatch action for updating DSL
diff --git a/app/client/src/layoutSystems/common/canvasArenas/CanvasMultiPointerArena.tsx b/app/client/src/layoutSystems/common/canvasArenas/CanvasMultiPointerArena.tsx
index d34a16a996..59120ebe54 100644
--- a/app/client/src/layoutSystems/common/canvasArenas/CanvasMultiPointerArena.tsx
+++ b/app/client/src/layoutSystems/common/canvasArenas/CanvasMultiPointerArena.tsx
@@ -72,9 +72,9 @@ const drawMousePointer = (
 };
 
 // This maps the `socketId` to pointerEventData for all concurrent users.
-type PointerDataType = {
+interface PointerDataType {
   [s: string]: any;
-};
+}
 
 function CanvasMultiPointerArena({ pageId }: { pageId: string }) {
   const dispatch = useDispatch();
diff --git a/app/client/src/layoutSystems/common/canvasViewer/CanvasViewerWrapper.tsx b/app/client/src/layoutSystems/common/canvasViewer/CanvasViewerWrapper.tsx
index 1f8c7b887e..bb33542b3d 100644
--- a/app/client/src/layoutSystems/common/canvasViewer/CanvasViewerWrapper.tsx
+++ b/app/client/src/layoutSystems/common/canvasViewer/CanvasViewerWrapper.tsx
@@ -3,11 +3,11 @@ import type { CSSProperties, ReactNode } from "react";
 import React from "react";
 import { getCanvasClassName } from "utils/generators";
 
-type CanvasViewerWrapperProps = {
+interface CanvasViewerWrapperProps {
   snapRows: number;
   isListWidgetCanvas: boolean;
   children: ReactNode;
-};
+}
 
 /**
  * This component is a wrapper for the canvas in the viewer.
diff --git a/app/client/src/layoutSystems/common/draggable/DraggableComponent.tsx b/app/client/src/layoutSystems/common/draggable/DraggableComponent.tsx
index 6ad39ab64b..604b04b3c7 100644
--- a/app/client/src/layoutSystems/common/draggable/DraggableComponent.tsx
+++ b/app/client/src/layoutSystems/common/draggable/DraggableComponent.tsx
@@ -26,7 +26,7 @@ const DraggableWrapper = styled.div`
   cursor: grab;
 `;
 
-type DraggableComponentProps = {
+interface DraggableComponentProps {
   widgetId: string;
   parentId?: string;
   isFlexChild?: boolean;
@@ -40,7 +40,7 @@ type DraggableComponentProps = {
   parentColumnSpace: number;
   children: ReactNode;
   dragDisabled?: boolean;
-};
+}
 
 // Widget Boundaries which is shown to indicate the boundaries of the widget
 const WidgetBoundaries = styled.div`
diff --git a/app/client/src/layoutSystems/common/dropTarget/DragLayerComponent.tsx b/app/client/src/layoutSystems/common/dropTarget/DragLayerComponent.tsx
index 2ec8e26ce5..ea238aee63 100644
--- a/app/client/src/layoutSystems/common/dropTarget/DragLayerComponent.tsx
+++ b/app/client/src/layoutSystems/common/dropTarget/DragLayerComponent.tsx
@@ -34,10 +34,10 @@ const WrappedDragLayer = styled.div<{
     ${GridDefaults.DEFAULT_GRID_ROW_HEIGHT}px;
 `;
 
-type DragLayerProps = {
+interface DragLayerProps {
   parentColumnWidth: number;
   noPad: boolean;
-};
+}
 
 function DragLayerComponent(props: DragLayerProps) {
   return (
diff --git a/app/client/src/layoutSystems/common/dropTarget/DropTargetComponentWrapper.tsx b/app/client/src/layoutSystems/common/dropTarget/DropTargetComponentWrapper.tsx
index e0e1482639..45ec5947a6 100644
--- a/app/client/src/layoutSystems/common/dropTarget/DropTargetComponentWrapper.tsx
+++ b/app/client/src/layoutSystems/common/dropTarget/DropTargetComponentWrapper.tsx
@@ -4,12 +4,12 @@ import type { ReactNode } from "react";
 import { memo } from "react";
 import React from "react";
 
-type DropTargetComponentWrapperProps = {
+interface DropTargetComponentWrapperProps {
   dropTargetProps: DropTargetComponentProps;
   dropDisabled: boolean;
   children: ReactNode;
   snapColumnSpace: number;
-};
+}
 
 /**
  * This component is a wrapper for the DropTargetComponent.
diff --git a/app/client/src/layoutSystems/common/resizer/ModalResizable.tsx b/app/client/src/layoutSystems/common/resizer/ModalResizable.tsx
index 42ed69b0f0..5e08f8874e 100644
--- a/app/client/src/layoutSystems/common/resizer/ModalResizable.tsx
+++ b/app/client/src/layoutSystems/common/resizer/ModalResizable.tsx
@@ -25,7 +25,7 @@ const getSnappedValues = (
   };
 };
 
-type ResizableHandleProps = {
+interface ResizableHandleProps {
   allowResize: boolean;
   showLightBorder?: boolean;
   isHovered: boolean;
@@ -38,11 +38,11 @@ type ResizableHandleProps = {
     x: number;
     y: number;
   };
-};
+}
 
 function ResizableHandle(props: ResizableHandleProps) {
   const bind = useDrag(
-    ({ first, last, dragging, movement: [mx, my], memo }) => {
+    ({ dragging, first, last, memo, movement: [mx, my] }) => {
       if (!props.allowResize) {
         return;
       }
@@ -69,7 +69,7 @@ function ResizableHandle(props: ResizableHandleProps) {
   return <props.component {...propsToPass} />;
 }
 
-type ResizableProps = {
+interface ResizableProps {
   allowResize: boolean;
   handles: {
     left?: StyledComponent<"div", Record<string, unknown>>;
@@ -101,7 +101,7 @@ type ResizableProps = {
   widgetId: string;
   showLightBorder?: boolean;
   zWidgetType?: string;
-};
+}
 
 export function ModalResizable(props: ResizableProps) {
   // Performance tracking start
diff --git a/app/client/src/layoutSystems/common/resizer/ResizableUtils.ts b/app/client/src/layoutSystems/common/resizer/ResizableUtils.ts
index 202f94fd20..48e5ec29d1 100644
--- a/app/client/src/layoutSystems/common/resizer/ResizableUtils.ts
+++ b/app/client/src/layoutSystems/common/resizer/ResizableUtils.ts
@@ -4,18 +4,21 @@ import type { XYCord } from "layoutSystems/common/canvasArenas/ArenaTypes";
 import { ReflowDirection } from "reflow/reflowTypes";
 import { ResponsiveBehavior } from "layoutSystems/common/utils/constants";
 
-export type UIElementSize = { height: number; width: number };
+export interface UIElementSize {
+  height: number;
+  width: number;
+}
 
 export const RESIZABLE_CONTAINER_BORDER_THEME_INDEX = 1;
 
-export type WidgetPosition = {
+export interface WidgetPosition {
   rightColumn: number;
   leftColumn: number;
   bottomRow: number;
   topRow: number;
   parentRowSpace: number;
   parentColumnSpace: number;
-};
+}
 
 export type WidgetExtendedPosition = WidgetPosition & {
   paddingOffset: number;
diff --git a/app/client/src/layoutSystems/common/resizer/common.tsx b/app/client/src/layoutSystems/common/resizer/common.tsx
index 06e2bfbeb9..b10b511b2c 100644
--- a/app/client/src/layoutSystems/common/resizer/common.tsx
+++ b/app/client/src/layoutSystems/common/resizer/common.tsx
@@ -130,7 +130,7 @@ const getSnappedValues = (
   };
 };
 
-export type DimensionUpdateProps = {
+export interface DimensionUpdateProps {
   width: number;
   height: number;
   x: number;
@@ -141,9 +141,9 @@ export type DimensionUpdateProps = {
   Y?: number;
   reflectPosition: boolean;
   reflectDimension: boolean;
-};
+}
 
-type ResizableHandleProps = {
+interface ResizableHandleProps {
   allowResize: boolean;
   scrollParent: HTMLDivElement | null;
   disableDot: boolean;
@@ -163,14 +163,14 @@ type ResizableHandleProps = {
     y: number;
   };
   direction?: ReflowDirection;
-};
+}
 
 export function ResizableHandle(props: ResizableHandleProps) {
   const bind = useDrag((state) => {
     const {
+      dragging,
       first,
       last,
-      dragging,
       memo,
       movement: [mx, my],
     } = state;
@@ -219,7 +219,7 @@ export function ResizableHandle(props: ResizableHandleProps) {
   );
 }
 
-export type ResizableProps = {
+export interface ResizableProps {
   allowResize: boolean;
   handles: {
     left?: StyledComponent<"div", Record<string, unknown>>;
@@ -265,4 +265,4 @@ export type ResizableProps = {
   isMobile: boolean;
   showResizeBoundary: boolean;
   topRow: number;
-};
+}
diff --git a/app/client/src/layoutSystems/common/selectors.ts b/app/client/src/layoutSystems/common/selectors.ts
index 97d88fc27c..341ad7e922 100644
--- a/app/client/src/layoutSystems/common/selectors.ts
+++ b/app/client/src/layoutSystems/common/selectors.ts
@@ -12,7 +12,7 @@ import { getErrorCount } from "layoutSystems/common/widgetName/utils";
 import type { WidgetPositions } from "./types";
 import type { WidgetProps } from "widgets/BaseWidget";
 import type { WidgetNameData } from "./WidgetNamesCanvas/WidgetNameTypes";
-import type { DataTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 
 export const getWidgetPositions = (state: AppState) =>
   state.entities.widgetPositions;
diff --git a/app/client/src/layoutSystems/common/snipeable/SnipeableComponent.tsx b/app/client/src/layoutSystems/common/snipeable/SnipeableComponent.tsx
index c4d678024a..4a99c29122 100644
--- a/app/client/src/layoutSystems/common/snipeable/SnipeableComponent.tsx
+++ b/app/client/src/layoutSystems/common/snipeable/SnipeableComponent.tsx
@@ -30,11 +30,11 @@ const SnipeableWrapper = styled.div<{ isFocused: boolean }>`
   }
 `;
 
-type SnipeableComponentProps = {
+interface SnipeableComponentProps {
   widgetId: string;
   type: string;
   children: ReactNode;
-};
+}
 
 /**
  * SnipeableComponent
diff --git a/app/client/src/layoutSystems/common/types.ts b/app/client/src/layoutSystems/common/types.ts
index 217e81240f..5e1e455ef6 100644
--- a/app/client/src/layoutSystems/common/types.ts
+++ b/app/client/src/layoutSystems/common/types.ts
@@ -1,12 +1,12 @@
 /*
   Hols the position of a widget in pixels from the top left of the MainContainer
 */
-export type WidgetPosition = {
+export interface WidgetPosition {
   left: number;
   top: number;
   height: number;
   width: number;
-};
+}
 
 export interface WidgetPositions {
   [widgetId: string]: WidgetPosition;
diff --git a/app/client/src/layoutSystems/common/utils/canvasDraggingUtils.ts b/app/client/src/layoutSystems/common/utils/canvasDraggingUtils.ts
index 17f0a4f3f4..edd998c0b4 100644
--- a/app/client/src/layoutSystems/common/utils/canvasDraggingUtils.ts
+++ b/app/client/src/layoutSystems/common/utils/canvasDraggingUtils.ts
@@ -101,14 +101,14 @@ export function getReflowedSpaces(
   return draggingSpace;
 }
 
-type NewWidgetBlock = {
+interface NewWidgetBlock {
   columns: number;
   rows: number;
   widgetId: string;
   detachFromLayout: boolean;
   isDynamicHeight: boolean;
   type: WidgetType;
-};
+}
 
 /**
  * This method returns blocks and dragging spaces of the widgets being dragged on canvas..
diff --git a/app/client/src/layoutSystems/common/utils/commonTypes.ts b/app/client/src/layoutSystems/common/utils/commonTypes.ts
index 69008298d7..a34cc9d043 100644
--- a/app/client/src/layoutSystems/common/utils/commonTypes.ts
+++ b/app/client/src/layoutSystems/common/utils/commonTypes.ts
@@ -7,7 +7,7 @@ import type {
 } from "layoutSystems/common/utils/constants";
 import type { ReactNode } from "react";
 
-export type AutoLayoutProps = {
+export interface AutoLayoutProps {
   alignment: FlexLayerAlignment;
   children: ReactNode;
   componentHeight: number;
@@ -24,4 +24,4 @@ export type AutoLayoutProps = {
   flexVerticalAlignment: FlexVerticalAlignment;
   isMobile: boolean;
   renderMode: RenderMode;
-};
+}
diff --git a/app/client/src/layoutSystems/common/widgetComponent/WidgetComponentBoundary.tsx b/app/client/src/layoutSystems/common/widgetComponent/WidgetComponentBoundary.tsx
index 6c5ee8271b..c8896ae61e 100644
--- a/app/client/src/layoutSystems/common/widgetComponent/WidgetComponentBoundary.tsx
+++ b/app/client/src/layoutSystems/common/widgetComponent/WidgetComponentBoundary.tsx
@@ -5,7 +5,10 @@ import styled from "styled-components";
 import WalkthroughContext from "components/featureWalkthrough/walkthroughContext";
 import { WIDGET_COMPONENT_BOUNDARY_CLASS } from "constants/componentClassNameConstants";
 
-type Props = { children: ReactNode; widgetType: string };
+interface Props {
+  children: ReactNode;
+  widgetType: string;
+}
 
 const WidgetComponentBoundaryWrapper = styled.div`
   height: 100%;
diff --git a/app/client/src/layoutSystems/common/widgetName/DeleteControl.tsx b/app/client/src/layoutSystems/common/widgetName/DeleteControl.tsx
index 77bb05c12a..30d300d9fd 100644
--- a/app/client/src/layoutSystems/common/widgetName/DeleteControl.tsx
+++ b/app/client/src/layoutSystems/common/widgetName/DeleteControl.tsx
@@ -26,10 +26,10 @@ const StyledDeleteIcon = styled.div`
   }
 `;
 
-type DeleteControlProps = {
+interface DeleteControlProps {
   deleteWidget: () => void;
   show: boolean;
-};
+}
 
 function DeleteControl(props: DeleteControlProps) {
   return props.show ? (
diff --git a/app/client/src/layoutSystems/common/widgetName/SettingsControl.tsx b/app/client/src/layoutSystems/common/widgetName/SettingsControl.tsx
index 6c6c079b16..e02342db41 100644
--- a/app/client/src/layoutSystems/common/widgetName/SettingsControl.tsx
+++ b/app/client/src/layoutSystems/common/widgetName/SettingsControl.tsx
@@ -64,14 +64,14 @@ const StyledErrorIcon = styled(Icon)`
   margin-right: ${(props) => props.theme.spaces[1]}px;
 `;
 
-type SettingsControlProps = {
+interface SettingsControlProps {
   toggleSettings: (e: any) => void;
   activity: Activities;
   name: string;
   errorCount: number;
   inverted: boolean;
   widgetWidth: number;
-};
+}
 
 const getStyles = (
   activity: Activities,
diff --git a/app/client/src/layoutSystems/common/widgetName/WidgetNameLayer.tsx b/app/client/src/layoutSystems/common/widgetName/WidgetNameLayer.tsx
index 32422bd69f..1e2e06e5e6 100644
--- a/app/client/src/layoutSystems/common/widgetName/WidgetNameLayer.tsx
+++ b/app/client/src/layoutSystems/common/widgetName/WidgetNameLayer.tsx
@@ -2,7 +2,7 @@ import WidgetNameComponent from "layoutSystems/common/widgetName";
 import React from "react";
 import { getErrorCount } from "./utils";
 
-type WidgetNameLayerProps = {
+interface WidgetNameLayerProps {
   disablePropertyPane?: boolean;
   children: any;
   parentId?: string;
@@ -14,7 +14,7 @@ type WidgetNameLayerProps = {
   componentWidth: number;
   evalErrorsObj: Record<any, any>;
   showControls?: boolean;
-};
+}
 
 export const WidgetNameLayer = (props: WidgetNameLayerProps) => {
   return !props.disablePropertyPane ? (
diff --git a/app/client/src/layoutSystems/common/widgetName/index.tsx b/app/client/src/layoutSystems/common/widgetName/index.tsx
index f14bd38540..b1b13655df 100644
--- a/app/client/src/layoutSystems/common/widgetName/index.tsx
+++ b/app/client/src/layoutSystems/common/widgetName/index.tsx
@@ -66,7 +66,7 @@ const ControlGroup = styled.div`
   }
 `;
 
-type WidgetNameComponentProps = {
+interface WidgetNameComponentProps {
   widgetName: string;
   widgetId: string;
   parentId?: string;
@@ -75,7 +75,7 @@ type WidgetNameComponentProps = {
   topRow: number;
   errorCount: number;
   widgetWidth: number;
-};
+}
 
 export function WidgetNameComponent(props: WidgetNameComponentProps) {
   const dispatch = useDispatch();
diff --git a/app/client/src/layoutSystems/fixedlayout/canvas/types.ts b/app/client/src/layoutSystems/fixedlayout/canvas/types.ts
index 17e014d9a9..9d9a20e8de 100644
--- a/app/client/src/layoutSystems/fixedlayout/canvas/types.ts
+++ b/app/client/src/layoutSystems/fixedlayout/canvas/types.ts
@@ -1,4 +1,4 @@
-export type AdditionalFixedLayoutProperties = {
+export interface AdditionalFixedLayoutProperties {
   parentRowSpace: number;
   parentColumnSpace: number;
-};
+}
diff --git a/app/client/src/layoutSystems/fixedlayout/common/autoHeight/AutoHeightContainerWrapper.tsx b/app/client/src/layoutSystems/fixedlayout/common/autoHeight/AutoHeightContainerWrapper.tsx
index 5ecaf403e2..964ee85b2d 100644
--- a/app/client/src/layoutSystems/fixedlayout/common/autoHeight/AutoHeightContainerWrapper.tsx
+++ b/app/client/src/layoutSystems/fixedlayout/common/autoHeight/AutoHeightContainerWrapper.tsx
@@ -10,10 +10,10 @@ import {
 } from "widgets/WidgetUtils";
 import AutoHeightContainer from "./AutoHeightContainer";
 
-export type AutoHeightWrapperProps = {
+export interface AutoHeightWrapperProps {
   widgetProps: WidgetProps;
   children: ReactNode;
-};
+}
 
 export function AutoHeightContainerWrapper(props: WidgetProps) {
   const isCanvas = useWidgetConfig(props.type, "isCanvas");
diff --git a/app/client/src/layoutSystems/fixedlayout/common/autoHeightOverlay/store.tsx b/app/client/src/layoutSystems/fixedlayout/common/autoHeightOverlay/store.tsx
index eae15b57b5..71847d1074 100644
--- a/app/client/src/layoutSystems/fixedlayout/common/autoHeightOverlay/store.tsx
+++ b/app/client/src/layoutSystems/fixedlayout/common/autoHeightOverlay/store.tsx
@@ -10,19 +10,31 @@ interface AutoHeightLimitsUIState {
   mindY: number; // the difference during dragging
 }
 
-type SET_MAX_Y = { type: "SET_MAX_Y"; payload: { maxY: number } };
-type SET_MIN_Y = { type: "SET_MIN_Y"; payload: { minY: number } };
-type SET_MAX_D_Y = { type: "SET_MAX_D_Y"; payload: { maxdY: number } };
-type SET_MIN_D_Y = { type: "SET_MIN_D_Y"; payload: { mindY: number } };
-type SET_IS_MIN_DOT_DRAGGING = {
+interface SET_MAX_Y {
+  type: "SET_MAX_Y";
+  payload: { maxY: number };
+}
+interface SET_MIN_Y {
+  type: "SET_MIN_Y";
+  payload: { minY: number };
+}
+interface SET_MAX_D_Y {
+  type: "SET_MAX_D_Y";
+  payload: { maxdY: number };
+}
+interface SET_MIN_D_Y {
+  type: "SET_MIN_D_Y";
+  payload: { mindY: number };
+}
+interface SET_IS_MIN_DOT_DRAGGING {
   type: "SET_IS_MIN_DOT_DRAGGING";
   payload: { isMinDotDragging: boolean };
-};
+}
 
-type SET_IS_MAX_DOT_DRAGGING = {
+interface SET_IS_MAX_DOT_DRAGGING {
   type: "SET_IS_MAX_DOT_DRAGGING";
   payload: { isMaxDotDragging: boolean };
-};
+}
 
 type AutoHeightLimitsUIAction =
   | SET_MAX_Y
diff --git a/app/client/src/layoutSystems/fixedlayout/common/widgetGrouping/WidgetsMultiSelectBox.tsx b/app/client/src/layoutSystems/fixedlayout/common/widgetGrouping/WidgetsMultiSelectBox.tsx
index f40d8d7578..d8e6d4f19e 100644
--- a/app/client/src/layoutSystems/fixedlayout/common/widgetGrouping/WidgetsMultiSelectBox.tsx
+++ b/app/client/src/layoutSystems/fixedlayout/common/widgetGrouping/WidgetsMultiSelectBox.tsx
@@ -206,10 +206,8 @@ function WidgetsMultiSelectBox(props: {
         left: (e.clientX - bounds.left) / props.snapColumnSpace,
       };
       const top = minBy(selectedWidgets, (rect) => rect.topRow)?.topRow;
-      const left = minBy(
-        selectedWidgets,
-        (rect) => rect.leftColumn,
-      )?.leftColumn;
+      const left = minBy(selectedWidgets, (rect) => rect.leftColumn)
+        ?.leftColumn;
       setDraggingState({
         isDragging: true,
         dragGroupActualParent: parentId || "",
diff --git a/app/client/src/layoutSystems/types/index.ts b/app/client/src/layoutSystems/types/index.ts
index 916d541d14..c33285754b 100644
--- a/app/client/src/layoutSystems/types/index.ts
+++ b/app/client/src/layoutSystems/types/index.ts
@@ -10,9 +10,9 @@ export enum LayoutSystemTypes {
 // interface for appPositioning(aka layoutStystem) details.
 // It is part of applicationDetails Record of an Application
 // Refer to ApplicationPayload
-export type LayoutSystemTypeConfig = {
+export interface LayoutSystemTypeConfig {
   type: LayoutSystemTypes;
-};
+}
 
 /**
  * @type WidgetLayoutSystem
@@ -23,10 +23,10 @@ export type LayoutSystemTypeConfig = {
  * @property propertyEnhancer - function that is used to enhance/modify widget properties as per the layout system
  */
 
-export type WidgetLayoutSystem = {
+export interface WidgetLayoutSystem {
   WidgetWrapper: (props: WidgetProps) => JSX.Element;
   propertyEnhancer: (props: WidgetProps) => WidgetProps;
-};
+}
 
 /**
  * @type CanvasLayoutSystem
@@ -36,10 +36,10 @@ export type WidgetLayoutSystem = {
  * @property propertyEnhancer - function that is used to enhance/modify canvas properties as per the layout system
  */
 
-export type CanvasLayoutSystem = {
+export interface CanvasLayoutSystem {
   Canvas: (props: WidgetProps) => JSX.Element;
   propertyEnhancer: (props: WidgetProps) => WidgetProps;
-};
+}
 
 /**
  * @type LayoutSystem
@@ -51,7 +51,7 @@ export type CanvasLayoutSystem = {
  * @property canvasSystem - provides canvas specific entities
  */
 
-export type LayoutSystem = {
+export interface LayoutSystem {
   widgetSystem: WidgetLayoutSystem;
   canvasSystem: CanvasLayoutSystem;
-};
+}
diff --git a/app/client/src/navigation/FocusElements.ts b/app/client/src/navigation/FocusElements.ts
index 8a917ea1ff..0e4910c211 100644
--- a/app/client/src/navigation/FocusElements.ts
+++ b/app/client/src/navigation/FocusElements.ts
@@ -91,13 +91,13 @@ export enum FocusElement {
   InputField = "InputField",
 }
 
-type Config = {
+interface Config {
   name: FocusElement;
   selector: (state: AppState) => unknown;
   setter: (payload: any) => ReduxAction<any>;
   defaultValue?: unknown;
   subTypes?: Record<string, { defaultValue: unknown }>;
-};
+}
 
 export const FocusElementsConfig: Record<FocusEntity, Config[]> = {
   [FocusEntity.NONE]: [],
diff --git a/app/client/src/navigation/FocusEntity.ts b/app/client/src/navigation/FocusEntity.ts
index 3706caab60..0924db6bb1 100644
--- a/app/client/src/navigation/FocusEntity.ts
+++ b/app/client/src/navigation/FocusEntity.ts
@@ -31,11 +31,11 @@ export const FocusStoreHierarchy: Partial<Record<FocusEntity, FocusEntity>> = {
   [FocusEntity.PROPERTY_PANE]: FocusEntity.CANVAS,
 };
 
-export type FocusEntityInfo = {
+export interface FocusEntityInfo {
   entity: FocusEntity;
   id: string;
   pageId?: string;
-};
+}
 
 /**
  * Method to indicate if the URL is of type API, Query etc.,
diff --git a/app/client/src/pages/AdminSettings/Authentication/AuthPage.tsx b/app/client/src/pages/AdminSettings/Authentication/AuthPage.tsx
index 5e8e4eb54e..500fe11cdf 100644
--- a/app/client/src/pages/AdminSettings/Authentication/AuthPage.tsx
+++ b/app/client/src/pages/AdminSettings/Authentication/AuthPage.tsx
@@ -12,7 +12,7 @@ import {
   AUTHENTICATION_METHOD_ENABLED,
 } from "@appsmith/constants/messages";
 import { Button, Callout, Divider, Icon, Text, Tooltip } from "design-system";
-import { adminSettingsCategoryUrl } from "RouteBuilder";
+import { adminSettingsCategoryUrl } from "@appsmith/RouteBuilder";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import useOnUpgrade from "utils/hooks/useOnUpgrade";
 import BusinessTag from "components/BusinessTag";
@@ -79,12 +79,12 @@ const MethodTitle = styled(Text)`
 
 const MethodDets = styled(Text)``;
 
-export type banner = {
+export interface banner {
   actionLabel: string;
   title: string;
-};
+}
 
-export type AuthMethodType = {
+export interface AuthMethodType {
   id: string;
   category?: string;
   label: string;
@@ -94,7 +94,7 @@ export type AuthMethodType = {
   calloutBanner?: banner;
   icon?: string;
   isFeatureEnabled: boolean;
-};
+}
 
 const ButtonWrapper = styled.div`
   min-width: 100px;
diff --git a/app/client/src/pages/AdminSettings/Branding/BrandingPage.tsx b/app/client/src/pages/AdminSettings/Branding/BrandingPage.tsx
index 2cdc51e479..5632c4317b 100644
--- a/app/client/src/pages/AdminSettings/Branding/BrandingPage.tsx
+++ b/app/client/src/pages/AdminSettings/Branding/BrandingPage.tsx
@@ -18,15 +18,15 @@ export type brandColorsKeys =
   | "hover"
   | "disabled";
 
-export type Inputs = {
+export interface Inputs {
   brandColors: Record<brandColorsKeys, string>;
   brandLogo: string;
   brandFavicon: string;
-};
+}
 
-type BrandingPageProps = {
+interface BrandingPageProps {
   category: AdminConfigType;
-};
+}
 
 function BrandingPage(props: BrandingPageProps) {
   const { category } = props;
diff --git a/app/client/src/pages/AdminSettings/Branding/SettingsForm.tsx b/app/client/src/pages/AdminSettings/Branding/SettingsForm.tsx
index bb3ef50180..6128a4e31c 100644
--- a/app/client/src/pages/AdminSettings/Branding/SettingsForm.tsx
+++ b/app/client/src/pages/AdminSettings/Branding/SettingsForm.tsx
@@ -40,7 +40,7 @@ const StyledText = styled(Text)`
   font-weight: var(--ads-v2-font-weight-bold);
 `;
 
-type SettingsFormProps = {
+interface SettingsFormProps {
   disabled?: boolean;
   control: Control<Inputs, any>;
   formState: FormState<Inputs>;
@@ -50,7 +50,7 @@ type SettingsFormProps = {
   setValue: UseFormSetValue<Inputs>;
   resetField: UseFormResetField<Inputs>;
   values: Inputs;
-};
+}
 
 function SettingsForm(props: SettingsFormProps) {
   const { control, defaultValues, disabled, formState, handleSubmit } = props;
diff --git a/app/client/src/pages/AdminSettings/Branding/previews/PreviewBox.tsx b/app/client/src/pages/AdminSettings/Branding/previews/PreviewBox.tsx
index ca7350534e..da7ca73332 100644
--- a/app/client/src/pages/AdminSettings/Branding/previews/PreviewBox.tsx
+++ b/app/client/src/pages/AdminSettings/Branding/previews/PreviewBox.tsx
@@ -2,12 +2,12 @@ import React from "react";
 import { ContentBox } from "pages/AdminSettings/components";
 import { Text } from "design-system";
 
-type PreviewBoxProps = {
+interface PreviewBoxProps {
   title?: string;
   children: React.ReactNode;
   className?: string;
   style?: React.CSSProperties;
-};
+}
 
 const PreviewBox = (props: PreviewBoxProps) => {
   const { children, className, title, ...rest } = props;
diff --git a/app/client/src/pages/AdminSettings/Branding/previews/index.tsx b/app/client/src/pages/AdminSettings/Branding/previews/index.tsx
index 76aec449bb..2be99567da 100644
--- a/app/client/src/pages/AdminSettings/Branding/previews/index.tsx
+++ b/app/client/src/pages/AdminSettings/Branding/previews/index.tsx
@@ -9,11 +9,11 @@ import DashboardPreview from "./DashboardPreview";
 import type { brandColorsKeys } from "../BrandingPage";
 import { ContentBox } from "pages/AdminSettings/components";
 
-export type PreviewsProps = {
+export interface PreviewsProps {
   shades: Record<brandColorsKeys, string>;
   logo: string | Blob;
   favicon: string;
-};
+}
 
 const Previews = (props: PreviewsProps) => {
   const { favicon, logo } = props;
diff --git a/app/client/src/pages/AdminSettings/FormGroup/Accordion.tsx b/app/client/src/pages/AdminSettings/FormGroup/Accordion.tsx
index f67ddf1644..62492b5093 100644
--- a/app/client/src/pages/AdminSettings/FormGroup/Accordion.tsx
+++ b/app/client/src/pages/AdminSettings/FormGroup/Accordion.tsx
@@ -39,13 +39,13 @@ const Line = styled.hr`
 }
 `;
 
-type AccordionProps = {
+interface AccordionProps {
   label?: React.ReactNode;
   settings?: Setting[];
   isHidden?: boolean;
   category?: string;
   subCategory?: string;
-};
+}
 
 export default function Accordion({
   category,
diff --git a/app/client/src/pages/AdminSettings/FormGroup/Button.tsx b/app/client/src/pages/AdminSettings/FormGroup/Button.tsx
index e5c3dfbcd6..c1bef4609f 100644
--- a/app/client/src/pages/AdminSettings/FormGroup/Button.tsx
+++ b/app/client/src/pages/AdminSettings/FormGroup/Button.tsx
@@ -1,14 +1,21 @@
 import { SETTINGS_FORM_NAME } from "@appsmith/constants/forms";
 import React from "react";
-import { Button, Text } from "design-system";
+import { Button } from "design-system";
 import { useDispatch, useSelector } from "react-redux";
 import { getFormValues } from "redux-form";
 import styled from "styled-components";
-import type { SettingComponentProps } from "./Common";
+import { FormGroup, type SettingComponentProps } from "./Common";
 
 const ButtonWrapper = styled.div`
   width: 357px;
-  margin-bottom: 8px;
+
+  .styled-label {
+    padding: 0 0 0.5rem;
+  }
+
+  .admin-settings-form-group-label {
+    font-weight: var(--ads-v2-h5-font-weight);
+  }
 `;
 
 export const StyledButton = styled(Button)`
@@ -22,28 +29,21 @@ export default function ButtonComponent({ setting }: SettingComponentProps) {
   const settings = useSelector(formValuesSelector);
   return (
     <ButtonWrapper>
-      <Text
-        className="admin-settings-form-group-label pb-2"
-        color="var(--ads-v2-color-fg)"
-        data-testid="admin-settings-form-group-label"
-        kind="heading-xs"
-        renderAs="p"
-      >
-        {setting.label}
-      </Text>
-      <StyledButton
-        data-testid="admin-settings-button"
-        isDisabled={setting.isDisabled && setting.isDisabled(settings)}
-        kind="secondary"
-        onClick={() => {
-          if (setting.action) {
-            setting.action(dispatch, settings);
-          }
-        }}
-        size="md"
-      >
-        {setting.text}
-      </StyledButton>
+      <FormGroup setting={setting}>
+        <StyledButton
+          data-testid="admin-settings-button"
+          isDisabled={setting.isDisabled && setting.isDisabled(settings)}
+          kind="secondary"
+          onClick={() => {
+            if (setting.action) {
+              setting.action(dispatch, settings);
+            }
+          }}
+          size="md"
+        >
+          {setting.text}
+        </StyledButton>
+      </FormGroup>
     </ButtonWrapper>
   );
 }
diff --git a/app/client/src/pages/AdminSettings/FormGroup/Checkbox.tsx b/app/client/src/pages/AdminSettings/FormGroup/Checkbox.tsx
index b18d18a7df..5d9ad0ba7a 100644
--- a/app/client/src/pages/AdminSettings/FormGroup/Checkbox.tsx
+++ b/app/client/src/pages/AdminSettings/FormGroup/Checkbox.tsx
@@ -2,13 +2,12 @@ import React, { memo } from "react";
 import type { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form";
 import { Field, getFormValues } from "redux-form";
 import styled from "styled-components";
-import type { SettingComponentProps } from "./Common";
+import { FormGroup, type SettingComponentProps } from "./Common";
 import type { FormTextFieldProps } from "components/utils/ReduxFormTextField";
-import { Checkbox, Text } from "design-system";
+import { Checkbox } from "design-system";
 import { useSelector } from "react-redux";
 import { SETTINGS_FORM_NAME } from "@appsmith/constants/forms";
 import { isTenantConfig } from "@appsmith/utils/adminSettingsHelpers";
-import BusinessTag from "components/BusinessTag";
 
 const CheckboxWrapper = styled.div`
   display: grid;
@@ -18,7 +17,7 @@ const CheckboxWrapper = styled.div`
   gap: 16px;
 `;
 
-type CheckboxProps = {
+interface CheckboxProps {
   label?: React.ReactNode;
   id?: string;
   isDisabled?: boolean;
@@ -26,7 +25,7 @@ type CheckboxProps = {
   text: string;
   labelSuffix?: React.ReactElement;
   isPropertyDisabled?: boolean;
-};
+}
 
 function FieldCheckboxWithCheckboxText(props: CheckboxProps) {
   return function FieldCheckbox(
@@ -65,7 +64,13 @@ function FieldCheckboxWithCheckboxText(props: CheckboxProps) {
 }
 
 const StyledFieldCheckboxGroup = styled.div`
-  margin-bottom: 8px;
+  .styled-label {
+    padding: 0 0 0.5rem;
+  }
+
+  .admin-settings-form-group-label {
+    font-weight: var(--ads-v2-h5-font-weight);
+  }
 `;
 
 const formValuesSelector = getFormValues(SETTINGS_FORM_NAME);
@@ -75,32 +80,22 @@ export function CheckboxComponent({ setting }: SettingComponentProps) {
 
   return (
     <StyledFieldCheckboxGroup>
-      <div className="flex gap-1 items-center">
-        <Text
-          className="admin-settings-form-group-label pt-2 pb-2"
-          color="var(--ads-v2-color-fg)"
-          data-testid="admin-settings-form-group-label"
-          kind="heading-xs"
-          renderAs="p"
-        >
-          {setting.label}
-        </Text>
-        {setting.isFeatureEnabled === false && <BusinessTag />}
-      </div>
-      <Field
-        component={FieldCheckboxWithCheckboxText({
-          label: setting.label,
-          text: setting.text || "",
-          id: setting.id,
-          isDisabled: setting.isDisabled && setting.isDisabled(settings),
-          isFeatureEnabled: setting.isFeatureEnabled,
-          labelSuffix: setting.textSuffix,
-          isPropertyDisabled: isTenantConfig(setting.id)
-            ? false
-            : !setting.name?.toLowerCase().includes("enable"),
-        })}
-        name={setting.name}
-      />
+      <FormGroup setting={setting}>
+        <Field
+          component={FieldCheckboxWithCheckboxText({
+            label: setting.label,
+            text: setting.text || "",
+            id: setting.id,
+            isDisabled: setting.isDisabled && setting.isDisabled(settings),
+            isFeatureEnabled: setting.isFeatureEnabled,
+            labelSuffix: setting.textSuffix,
+            isPropertyDisabled: isTenantConfig(setting.id)
+              ? false
+              : !setting.name?.toLowerCase().includes("enable"),
+          })}
+          name={setting.name}
+        />
+      </FormGroup>
     </StyledFieldCheckboxGroup>
   );
 }
diff --git a/app/client/src/pages/AdminSettings/FormGroup/ColorInput.tsx b/app/client/src/pages/AdminSettings/FormGroup/ColorInput.tsx
index 1dd4ea0c68..5e7cc5a834 100644
--- a/app/client/src/pages/AdminSettings/FormGroup/ColorInput.tsx
+++ b/app/client/src/pages/AdminSettings/FormGroup/ColorInput.tsx
@@ -78,7 +78,7 @@ const StyledText = styled(Text)`
   font-weight: 500;
 `;
 
-type ColorInputProps = {
+interface ColorInputProps {
   value: Record<brandColorsKeys, string>;
   onChange?: (value: any) => void;
   className?: string;
@@ -86,7 +86,7 @@ type ColorInputProps = {
   filter?: (key: brandColorsKeys) => boolean;
   defaultValue?: Record<brandColorsKeys, string>;
   logEvent?: (property: string) => void;
-};
+}
 
 const LeftIcon = (
   props: Omit<ColorInputProps, "value"> & { value: string },
@@ -102,11 +102,11 @@ export const ColorInput = (props: ColorInputProps) => {
     useState<brandColorsKeys>("primary");
   const {
     className,
+    filter = () => true,
+    logEvent,
     onChange,
     tooltips,
     value,
-    filter = () => true,
-    logEvent,
   } = props;
   const colorInputRef = useRef<HTMLInputElement>(null);
 
diff --git a/app/client/src/pages/AdminSettings/FormGroup/Common.tsx b/app/client/src/pages/AdminSettings/FormGroup/Common.tsx
index accb024b98..254c3e03de 100644
--- a/app/client/src/pages/AdminSettings/FormGroup/Common.tsx
+++ b/app/client/src/pages/AdminSettings/FormGroup/Common.tsx
@@ -3,13 +3,15 @@ import React from "react";
 import styled from "styled-components";
 import { Icon, Tooltip, Text } from "design-system";
 import type { Setting } from "@appsmith/pages/AdminSettings/config/types";
+import EnterpriseTag from "components/EnterpriseTag";
+import BusinessTag from "components/BusinessTag";
 
-type FieldHelperProps = {
+interface FieldHelperProps {
   setting: Setting;
   children: React.ReactNode;
   className?: string;
   isToggle?: boolean;
-};
+}
 
 export const StyledFormGroup = styled.div`
   width: 40rem;
@@ -28,6 +30,8 @@ export const StyledFormGroup = styled.div`
 
 export const StyledLabel = styled.div`
   margin-bottom: 4px;
+  display: flex;
+  align-items: center;
 `;
 
 export const StyledSubtext = styled(Text)`
@@ -48,7 +52,7 @@ export function FormGroup({ children, className, setting }: FieldHelperProps) {
       className={`${className}`}
       data-testid="admin-settings-form-group"
     >
-      <StyledLabel>
+      <StyledLabel className="styled-label">
         {setting.label && (
           <Text
             className="admin-settings-form-group-label"
@@ -73,6 +77,14 @@ export function FormGroup({ children, className, setting }: FieldHelperProps) {
             />
           </Tooltip>
         )}
+        <div className="ml-2">
+          {setting.isFeatureEnabled === false &&
+            (setting.isEnterprise === true ? (
+              <EnterpriseTag />
+            ) : (
+              <BusinessTag />
+            ))}
+        </div>
       </StyledLabel>
       {children}
       {setting.subText && (
@@ -87,6 +99,6 @@ export function FormGroup({ children, className, setting }: FieldHelperProps) {
   );
 }
 
-export type SettingComponentProps = {
+export interface SettingComponentProps {
   setting: Setting;
-};
+}
diff --git a/app/client/src/pages/AdminSettings/FormGroup/ImageInput.tsx b/app/client/src/pages/AdminSettings/FormGroup/ImageInput.tsx
index 40f91b4495..4a72c54af0 100644
--- a/app/client/src/pages/AdminSettings/FormGroup/ImageInput.tsx
+++ b/app/client/src/pages/AdminSettings/FormGroup/ImageInput.tsx
@@ -10,7 +10,7 @@ import { FormGroup } from "./Common";
 import { ContentBox } from "../components";
 import { getAssetUrl } from "@appsmith/utils/airgapHelpers";
 
-type ImageInputProps = {
+interface ImageInputProps {
   value?: any;
   onChange?(value?: any): void;
   validate?(
@@ -19,7 +19,7 @@ type ImageInputProps = {
   ): void;
   className?: string;
   defaultValue?: string;
-};
+}
 export const ImageInput = (props: ImageInputProps) => {
   const { className, defaultValue, onChange, validate, value } = props;
   const [preview, setPreview] = useState<string | ArrayBuffer | null>(null);
diff --git a/app/client/src/pages/AdminSettings/FormGroup/Radio.tsx b/app/client/src/pages/AdminSettings/FormGroup/Radio.tsx
index 65fc0f6be3..81e3624bbe 100644
--- a/app/client/src/pages/AdminSettings/FormGroup/Radio.tsx
+++ b/app/client/src/pages/AdminSettings/FormGroup/Radio.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
 import type { ReactElement } from "react";
 import { FieldError } from "design-system-old";
 import { Popover2 } from "@blueprintjs/popover2";
-import type { SettingComponentProps } from "./Common";
+import { FormGroup, type SettingComponentProps } from "./Common";
 import type { WrappedFieldInputProps, WrappedFieldMetaProps } from "redux-form";
 import { Field } from "redux-form";
 import styled, { createGlobalStyle } from "styled-components";
@@ -24,9 +24,9 @@ type RadioOption = {
   };
   label: string;
 } & RadioProps;
-export type RadioOptionProps = {
+export interface RadioOptionProps {
   options: RadioOption[];
-};
+}
 
 const StyledTag = styled(Tag)<{ selected?: boolean }>`
   /* 
@@ -87,6 +87,16 @@ const PopoverStyles = createGlobalStyle`
   }
 `;
 
+const StyledFormGroup = styled(FormGroup)`
+  .styled-label {
+    padding: 0 0 0.5rem;
+  }
+
+  .admin-settings-form-group-label {
+    font-weight: var(--ads-v2-h5-font-weight);
+  }
+`;
+
 type RadioGroupProps = SettingComponentProps;
 
 function RadioFieldWrapper(
@@ -201,20 +211,12 @@ export default function RadioField({ setting }: RadioGroupProps) {
   const controlTypeProps = setting.controlTypeProps as RadioOptionProps;
 
   return (
-    <div
+    <StyledFormGroup
       className={`t--admin-settings-radio t--admin-settings-${
         setting.name || setting.id
       }`}
+      setting={setting}
     >
-      <Text
-        className="admin-settings-form-group-label pt-2 pb-4"
-        color="var(--ads-v2-color-fg)"
-        data-testid="admin-settings-form-group-label"
-        kind="heading-xs"
-        renderAs="p"
-      >
-        {setting.label}
-      </Text>
       <Field
         component={RadioFieldWrapper}
         {...controlTypeProps}
@@ -222,6 +224,6 @@ export default function RadioField({ setting }: RadioGroupProps) {
         name={setting.name}
         parse={setting.parse}
       />
-    </div>
+    </StyledFormGroup>
   );
 }
diff --git a/app/client/src/pages/AdminSettings/FormGroup/TagInputField.tsx b/app/client/src/pages/AdminSettings/FormGroup/TagInputField.tsx
index 8f4cdedf6d..38476ec359 100644
--- a/app/client/src/pages/AdminSettings/FormGroup/TagInputField.tsx
+++ b/app/client/src/pages/AdminSettings/FormGroup/TagInputField.tsx
@@ -25,7 +25,7 @@ const renderComponent = (
   );
 };
 
-type TagListFieldProps = {
+interface TagListFieldProps {
   name: string;
   placeholder: string;
   type: string;
@@ -33,7 +33,7 @@ type TagListFieldProps = {
   intent: Intent;
   setting: Setting;
   customError?: (err: string) => void;
-};
+}
 
 function TagInputField(props: TagListFieldProps) {
   return <Field component={renderComponent} {...props} />;
diff --git a/app/client/src/pages/AdminSettings/FormGroup/TextAreaField.tsx b/app/client/src/pages/AdminSettings/FormGroup/TextAreaField.tsx
index 6f54e8e6a6..b778e2bd5d 100644
--- a/app/client/src/pages/AdminSettings/FormGroup/TextAreaField.tsx
+++ b/app/client/src/pages/AdminSettings/FormGroup/TextAreaField.tsx
@@ -35,7 +35,7 @@ const renderComponent = (
   );
 };
 
-export type FormTextAreaFieldProps = {
+export interface FormTextAreaFieldProps {
   name?: string;
   placeholder?: string;
   label?: string;
@@ -44,7 +44,7 @@ export type FormTextAreaFieldProps = {
   autoFocus?: boolean;
   hideErrorMessage?: boolean;
   setting: Setting;
-};
+}
 
 function FormTextAreaField(props: FormTextAreaFieldProps) {
   const { setting } = props;
diff --git a/app/client/src/pages/AdminSettings/FormGroup/TextInput.tsx b/app/client/src/pages/AdminSettings/FormGroup/TextInput.tsx
index 3d3c6981c3..2662119630 100644
--- a/app/client/src/pages/AdminSettings/FormGroup/TextInput.tsx
+++ b/app/client/src/pages/AdminSettings/FormGroup/TextInput.tsx
@@ -1,23 +1,23 @@
 import FormTextField from "components/utils/ReduxFormTextField";
 import { createMessage } from "@appsmith/constants/messages";
 import React from "react";
-import type { SettingComponentProps } from "./Common";
+import { FormGroup, type SettingComponentProps } from "./Common";
 
 export default function TextInput({ setting }: SettingComponentProps) {
   return (
-    <div
+    <FormGroup
       className={`t--admin-settings-text-input t--admin-settings-${
         setting.name || setting.id
       } mb-4`}
+      setting={setting}
     >
       <FormTextField
-        description={setting.subText || ""}
+        disabled={setting.isFeatureEnabled === false}
         isRequired={setting.isRequired}
-        label={setting.label || ""}
         name={setting.name || setting.id || ""}
         placeholder={createMessage(() => setting.placeholder || "")}
         type={setting.controlSubType}
       />
-    </div>
+    </FormGroup>
   );
 }
diff --git a/app/client/src/pages/AdminSettings/FormGroup/group.tsx b/app/client/src/pages/AdminSettings/FormGroup/group.tsx
index 4e9c087fd0..7583e1ef86 100644
--- a/app/client/src/pages/AdminSettings/FormGroup/group.tsx
+++ b/app/client/src/pages/AdminSettings/FormGroup/group.tsx
@@ -21,13 +21,13 @@ import Radio from "./Radio";
 import { getTypographyByKey } from "constants/DefaultTheme";
 import classNames from "classnames";
 
-type GroupProps = {
+interface GroupProps {
   name?: string;
   settings?: Setting[];
   isHidden?: boolean;
   category?: string;
   subCategory?: string;
-};
+}
 
 const GroupWrapper = styled.div`
   position: relative;
diff --git a/app/client/src/pages/AdminSettings/LeftPane.tsx b/app/client/src/pages/AdminSettings/LeftPane.tsx
index 6d00765def..d73cff9491 100644
--- a/app/client/src/pages/AdminSettings/LeftPane.tsx
+++ b/app/client/src/pages/AdminSettings/LeftPane.tsx
@@ -5,7 +5,7 @@ import {
   CategoryType,
   type Category,
 } from "@appsmith/pages/AdminSettings/config/types";
-import { adminSettingsCategoryUrl } from "RouteBuilder";
+import { adminSettingsCategoryUrl } from "@appsmith/RouteBuilder";
 import { useParams } from "react-router";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import { Link, Text } from "design-system";
diff --git a/app/client/src/pages/AdminSettings/SaveSettings.tsx b/app/client/src/pages/AdminSettings/SaveSettings.tsx
index 6654a5ed41..74ceda927e 100644
--- a/app/client/src/pages/AdminSettings/SaveSettings.tsx
+++ b/app/client/src/pages/AdminSettings/SaveSettings.tsx
@@ -30,7 +30,7 @@ const SettingsButtonWrapper = styled.div`
   align-items: center;
 `;
 
-type SaveAdminSettingsProps = {
+interface SaveAdminSettingsProps {
   isOnlyTenantConfig?: boolean;
   isSaving?: boolean;
   needsRefresh?: boolean;
@@ -39,7 +39,7 @@ type SaveAdminSettingsProps = {
   settings: Record<string, string>;
   valid: boolean;
   updatedTenantSettings?: string[];
-};
+}
 
 const saveAdminSettings = (props: SaveAdminSettingsProps) => {
   const {
diff --git a/app/client/src/pages/AdminSettings/SettingsForm.tsx b/app/client/src/pages/AdminSettings/SettingsForm.tsx
index 5ddcb06b6b..f224afe58f 100644
--- a/app/client/src/pages/AdminSettings/SettingsForm.tsx
+++ b/app/client/src/pages/AdminSettings/SettingsForm.tsx
@@ -51,12 +51,12 @@ import {
 import { updateTenantConfig } from "@appsmith/actions/tenantActions";
 import { tenantConfigConnection } from "@appsmith/constants/tenantConstants";
 
-type FormProps = {
+interface FormProps {
   settings: Record<string, string>;
   settingsConfig: Record<string, string | boolean>;
   isSaving: boolean;
   showReleaseNotes: boolean;
-};
+}
 
 function getSettingLabel(name = "") {
   return name.replace(/-/g, "");
@@ -337,8 +337,9 @@ export default withRouter(
         setting.controlType === SettingTypes.CHECKBOX &&
         !settingsConfig[name] &&
         !fieldValue;
-
-      if (fieldValue !== settingsConfig[name] && !doNotUpdate) {
+      //We are not performing type check here as inputs we take are stored as string
+      //But server stores as numeric, string etc..
+      if (fieldValue != settingsConfig[name] && !doNotUpdate) {
         newProps.settings[name] = fieldValue;
       }
     });
diff --git a/app/client/src/pages/AdminSettings/config/googleMaps.ts b/app/client/src/pages/AdminSettings/config/googleMaps.ts
deleted file mode 100644
index 159ccd026c..0000000000
--- a/app/client/src/pages/AdminSettings/config/googleMaps.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { GOOGLE_MAPS_SETUP_DOC } from "constants/ThirdPartyConstants";
-import type { AdminConfigType } from "@appsmith/pages/AdminSettings/config/types";
-import {
-  CategoryType,
-  SettingCategories,
-  SettingSubtype,
-  SettingTypes,
-} from "@appsmith/pages/AdminSettings/config/types";
-
-export const config: AdminConfigType = {
-  icon: "map-pin-2-line",
-  type: SettingCategories.GOOGLE_MAPS,
-  categoryType: CategoryType.GENERAL,
-  controlType: SettingTypes.GROUP,
-  title: "Google Maps",
-  canSave: true,
-  needsRefresh: true,
-  settings: [
-    {
-      id: "APPSMITH_GOOGLE_MAPS_READ_MORE",
-      category: SettingCategories.GOOGLE_MAPS,
-      controlType: SettingTypes.CALLOUT,
-      label: "How to configure?",
-      url: GOOGLE_MAPS_SETUP_DOC,
-    },
-    {
-      id: "googleMapsKey",
-      category: SettingCategories.GOOGLE_MAPS,
-      controlType: SettingTypes.TEXTINPUT,
-      controlSubType: SettingSubtype.TEXT,
-      label: "Google Maps API key",
-    },
-  ],
-};
diff --git a/app/client/src/pages/AppViewer/AppPage.tsx b/app/client/src/pages/AppViewer/AppPage.tsx
index 28f2640382..68e0a14fd3 100644
--- a/app/client/src/pages/AppViewer/AppPage.tsx
+++ b/app/client/src/pages/AppViewer/AppPage.tsx
@@ -17,13 +17,13 @@ import { useLocation } from "react-router";
 import { renderAppsmithCanvas } from "layoutSystems/CanvasFactory";
 import type { WidgetProps } from "widgets/BaseWidget";
 
-type AppPageProps = {
+interface AppPageProps {
   appName?: string;
   canvasWidth: number;
   pageId?: string;
   pageName?: string;
   widgetsStructure: CanvasWidgetStructure;
-};
+}
 
 export function AppPage(props: AppPageProps) {
   const currentApplicationDetails = useSelector(getCurrentApplication);
diff --git a/app/client/src/pages/AppViewer/AppViewerPageContainer.tsx b/app/client/src/pages/AppViewer/AppViewerPageContainer.tsx
index b07549780a..cef242e0c2 100644
--- a/app/client/src/pages/AppViewer/AppViewerPageContainer.tsx
+++ b/app/client/src/pages/AppViewer/AppViewerPageContainer.tsx
@@ -16,7 +16,7 @@ import {
   isPermitted,
   PERMISSION_TYPE,
 } from "@appsmith/utils/permissionHelpers";
-import { builderURL } from "RouteBuilder";
+import { builderURL } from "@appsmith/RouteBuilder";
 import { getCanvasWidgetsStructure } from "@appsmith/selectors/entitiesSelector";
 import equal from "fast-deep-equal/es6";
 
diff --git a/app/client/src/pages/AppViewer/Navigation/Sidebar.tsx b/app/client/src/pages/AppViewer/Navigation/Sidebar.tsx
index ddad01faf6..b6cd1d3f12 100644
--- a/app/client/src/pages/AppViewer/Navigation/Sidebar.tsx
+++ b/app/client/src/pages/AppViewer/Navigation/Sidebar.tsx
@@ -13,7 +13,7 @@ import MenuItem from "./components/MenuItem";
 import ShareButton from "./components/ShareButton";
 import PrimaryCTA from "../PrimaryCTA";
 import { useHref } from "pages/Editor/utils";
-import { builderURL } from "RouteBuilder";
+import { builderURL } from "@appsmith/RouteBuilder";
 import {
   getCurrentPageId,
   previewModeSelector,
@@ -38,13 +38,13 @@ import NavigationLogo from "@appsmith/pages/AppViewer/NavigationLogo";
 import MenuItemContainer from "./components/MenuItemContainer";
 import BackToAppsButton from "./components/BackToAppsButton";
 
-type SidebarProps = {
+interface SidebarProps {
   currentApplicationDetails?: ApplicationPayload;
   pages: Page[];
   currentWorkspaceId: string;
   currentUser: User | undefined;
   showUserSettings: boolean;
-};
+}
 
 export function Sidebar(props: SidebarProps) {
   const selectedTheme = useSelector(getSelectedAppTheme);
diff --git a/app/client/src/pages/AppViewer/Navigation/TopInline.tsx b/app/client/src/pages/AppViewer/Navigation/TopInline.tsx
index e9169cc1f9..776a2163f5 100644
--- a/app/client/src/pages/AppViewer/Navigation/TopInline.tsx
+++ b/app/client/src/pages/AppViewer/Navigation/TopInline.tsx
@@ -21,10 +21,10 @@ import { throttle } from "lodash";
 // TODO - @Dhruvik - ImprovedAppNav
 // Replace with NavigationProps if nothing changes
 // appsmith/app/client/src/pages/AppViewer/Navigation/constants.ts
-type TopInlineProps = {
+interface TopInlineProps {
   currentApplicationDetails?: ApplicationPayload;
   pages: Page[];
-};
+}
 
 export function TopInline(props: TopInlineProps) {
   const { currentApplicationDetails, pages } = props;
diff --git a/app/client/src/pages/AppViewer/Navigation/TopStacked.tsx b/app/client/src/pages/AppViewer/Navigation/TopStacked.tsx
index 111083ae3e..9a2386774c 100644
--- a/app/client/src/pages/AppViewer/Navigation/TopStacked.tsx
+++ b/app/client/src/pages/AppViewer/Navigation/TopStacked.tsx
@@ -16,10 +16,10 @@ import { Container, ScrollBtnContainer } from "./TopStacked.styled";
 // TODO - @Dhruvik - ImprovedAppNav
 // Replace with NavigationProps if nothing changes
 // appsmith/app/client/src/pages/AppViewer/Navigation/constants.ts
-type TopStackedProps = {
+interface TopStackedProps {
   currentApplicationDetails?: ApplicationPayload;
   pages: Page[];
-};
+}
 
 export function TopStacked(props: TopStackedProps) {
   const { currentApplicationDetails, pages } = props;
diff --git a/app/client/src/pages/AppViewer/Navigation/components/ApplicationName.tsx b/app/client/src/pages/AppViewer/Navigation/components/ApplicationName.tsx
index e1d262c0e0..80fb5a93e5 100644
--- a/app/client/src/pages/AppViewer/Navigation/components/ApplicationName.tsx
+++ b/app/client/src/pages/AppViewer/Navigation/components/ApplicationName.tsx
@@ -5,14 +5,14 @@ import { isEllipsisActive } from "utils/helpers";
 import { Tooltip } from "design-system";
 import { useIsMobileDevice } from "utils/hooks/useDeviceDetect";
 
-type ApplicationNameProps = {
+interface ApplicationNameProps {
   appName?: string;
   navColorStyle: NavigationSetting["colorStyle"];
   navStyle: NavigationSetting["navStyle"];
   primaryColor: string;
   forSidebar?: boolean;
   fontWeight?: "regular" | "bold";
-};
+}
 
 const ApplicationName = (props: ApplicationNameProps) => {
   const {
diff --git a/app/client/src/pages/AppViewer/Navigation/components/BackToAppsButton.tsx b/app/client/src/pages/AppViewer/Navigation/components/BackToAppsButton.tsx
index 34bd59af1f..c5bbd486ae 100644
--- a/app/client/src/pages/AppViewer/Navigation/components/BackToAppsButton.tsx
+++ b/app/client/src/pages/AppViewer/Navigation/components/BackToAppsButton.tsx
@@ -20,11 +20,11 @@ const AppsLineIcon = importRemixIcon(
   async () => import("remixicon-react/AppsLineIcon"),
 );
 
-type BackToAppsButtonProps = {
+interface BackToAppsButtonProps {
   currentApplicationDetails?: ApplicationPayload;
   insideSidebar?: boolean;
   isMinimal?: boolean;
-};
+}
 
 const StyledAppIcon = styled(AppsLineIcon)<{
   primaryColor: string;
diff --git a/app/client/src/pages/AppViewer/Navigation/components/CollapseButton.tsx b/app/client/src/pages/AppViewer/Navigation/components/CollapseButton.tsx
index 8caf7d3d68..18be8d1b26 100644
--- a/app/client/src/pages/AppViewer/Navigation/components/CollapseButton.tsx
+++ b/app/client/src/pages/AppViewer/Navigation/components/CollapseButton.tsx
@@ -21,14 +21,14 @@ const PinIcon = importSvg(
   async () => import("assets/icons/ads/double-arrow-left.svg"),
 );
 
-type CollapseButtonProps = {
+interface CollapseButtonProps {
   borderRadius: string;
   primaryColor: string;
   navColorStyle: NavigationSetting["colorStyle"];
   isOpen: boolean;
   isPinned: boolean;
   setIsPinned: (isPinned: boolean) => void;
-};
+}
 
 const CollapseButton = (props: CollapseButtonProps) => {
   const {
diff --git a/app/client/src/pages/AppViewer/Navigation/components/MenuItem.tsx b/app/client/src/pages/AppViewer/Navigation/components/MenuItem.tsx
index 74473707dd..1b4ea3569c 100644
--- a/app/client/src/pages/AppViewer/Navigation/components/MenuItem.tsx
+++ b/app/client/src/pages/AppViewer/Navigation/components/MenuItem.tsx
@@ -6,7 +6,7 @@ import { APP_MODE } from "entities/App";
 import { get } from "lodash";
 import { useHref } from "pages/Editor/utils";
 import { useSelector } from "react-redux";
-import { builderURL, viewerURL } from "RouteBuilder";
+import { builderURL, viewerURL } from "@appsmith/RouteBuilder";
 import { getAppMode } from "@appsmith/selectors/applicationSelectors";
 import { getSelectedAppTheme } from "selectors/appThemingSelectors";
 import { trimQueryString } from "utils/helpers";
@@ -15,12 +15,12 @@ import MenuText from "./MenuText";
 import classNames from "classnames";
 import { StyledMenuItem } from "./MenuItem.styled";
 
-type MenuItemProps = {
+interface MenuItemProps {
   page: Page;
   query: string;
   navigationSetting?: NavigationSetting;
   isMinimal?: boolean;
-};
+}
 
 const MenuItem = ({
   isMinimal,
diff --git a/app/client/src/pages/AppViewer/Navigation/components/MenuItemContainer.tsx b/app/client/src/pages/AppViewer/Navigation/components/MenuItemContainer.tsx
index c379a25fbf..0242550886 100644
--- a/app/client/src/pages/AppViewer/Navigation/components/MenuItemContainer.tsx
+++ b/app/client/src/pages/AppViewer/Navigation/components/MenuItemContainer.tsx
@@ -1,13 +1,13 @@
 import React, { useEffect, useRef } from "react";
 import scrollIntoView from "scroll-into-view-if-needed";
 
-type MenuItemContainerProps = {
+interface MenuItemContainerProps {
   children: React.ReactNode;
   isTabActive: boolean;
   tabsScrollable?: boolean;
   setShowScrollArrows?: () => void;
   forSidebar?: boolean;
-};
+}
 
 const MenuItemContainer = ({
   children,
diff --git a/app/client/src/pages/AppViewer/Navigation/components/MenuText.tsx b/app/client/src/pages/AppViewer/Navigation/components/MenuText.tsx
index 2a30d7dc06..3016d52f10 100644
--- a/app/client/src/pages/AppViewer/Navigation/components/MenuText.tsx
+++ b/app/client/src/pages/AppViewer/Navigation/components/MenuText.tsx
@@ -4,11 +4,11 @@ import { TooltipComponent } from "design-system-old";
 import { isEllipsisActive } from "utils/helpers";
 import { StyledMenuItemText } from "./MenuText.styled";
 
-type MenuTextProps = {
+interface MenuTextProps {
   name: string;
   primaryColor: string;
   navColorStyle: NavigationSetting["colorStyle"];
-};
+}
 
 const MenuText = ({ name, navColorStyle, primaryColor }: MenuTextProps) => {
   const tabNameRef = useRef<HTMLSpanElement>(null);
diff --git a/app/client/src/pages/AppViewer/Navigation/components/MobileNavToggle.tsx b/app/client/src/pages/AppViewer/Navigation/components/MobileNavToggle.tsx
index 3d8e1bed2b..fb2b17c462 100644
--- a/app/client/src/pages/AppViewer/Navigation/components/MobileNavToggle.tsx
+++ b/app/client/src/pages/AppViewer/Navigation/components/MobileNavToggle.tsx
@@ -3,12 +3,12 @@ import { getMenuItemTextColor } from "pages/AppViewer/utils";
 import type { NavigationSetting } from "constants/AppConstants";
 import { Icon } from "design-system";
 
-type MobileNavToggleProps = {
+interface MobileNavToggleProps {
   isMenuOpen: boolean;
   setMenuOpen: (prevState: boolean) => void;
   navColorStyle: NavigationSetting["colorStyle"];
   primaryColor: string;
-};
+}
 
 const MobileNavToggle = (props: MobileNavToggleProps) => {
   const { isMenuOpen, navColorStyle, primaryColor, setMenuOpen } = props;
diff --git a/app/client/src/pages/AppViewer/Navigation/components/MoreDropdownButton.tsx b/app/client/src/pages/AppViewer/Navigation/components/MoreDropdownButton.tsx
index 2f07176389..556743f91f 100644
--- a/app/client/src/pages/AppViewer/Navigation/components/MoreDropdownButton.tsx
+++ b/app/client/src/pages/AppViewer/Navigation/components/MoreDropdownButton.tsx
@@ -15,13 +15,13 @@ import {
 import type { Page } from "@appsmith/constants/ReduxActionConstants";
 import { getAppMode } from "@appsmith/selectors/applicationSelectors";
 import { APP_MODE } from "entities/App";
-import { builderURL, viewerURL } from "RouteBuilder";
+import { builderURL, viewerURL } from "@appsmith/RouteBuilder";
 import { trimQueryString } from "utils/helpers";
 
-type MoreDropdownButtonProps = {
+interface MoreDropdownButtonProps {
   navigationSetting?: NavigationSetting;
   pages: Page[];
-};
+}
 
 const MoreDropdownButton = ({
   navigationSetting,
diff --git a/app/client/src/pages/AppViewer/Navigation/components/ShareButton.tsx b/app/client/src/pages/AppViewer/Navigation/components/ShareButton.tsx
index 628ba0cb9c..ee54b9b394 100644
--- a/app/client/src/pages/AppViewer/Navigation/components/ShareButton.tsx
+++ b/app/client/src/pages/AppViewer/Navigation/components/ShareButton.tsx
@@ -18,12 +18,12 @@ import { getCurrentAppWorkspace } from "@appsmith/selectors/workspaceSelectors";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
 
-type ShareButtonProps = {
+interface ShareButtonProps {
   currentApplicationDetails?: ApplicationPayload;
   currentWorkspaceId: string;
   insideSidebar?: boolean;
   isMinimal?: boolean;
-};
+}
 
 const ShareButton = (props: ShareButtonProps) => {
   const [showModal, setShowModal] = useState(false);
diff --git a/app/client/src/pages/AppViewer/Navigation/components/SidebarProfileComponent.tsx b/app/client/src/pages/AppViewer/Navigation/components/SidebarProfileComponent.tsx
index 01d3f8fe48..2de3a941ce 100644
--- a/app/client/src/pages/AppViewer/Navigation/components/SidebarProfileComponent.tsx
+++ b/app/client/src/pages/AppViewer/Navigation/components/SidebarProfileComponent.tsx
@@ -10,12 +10,12 @@ import {
   StyledTextContainer,
 } from "./SidebarProfileComponent.styled";
 
-type SidebarProfileComponent = {
+interface SidebarProfileComponent {
   currentUser: User | undefined;
   primaryColor: string;
   navColorStyle: NavigationSetting["colorStyle"];
   isMinimal: boolean;
-};
+}
 
 const SidebarProfileComponent = (props: SidebarProfileComponent) => {
   const { currentUser, isMinimal, navColorStyle, primaryColor } = props;
diff --git a/app/client/src/pages/AppViewer/Navigation/components/TopHeader.tsx b/app/client/src/pages/AppViewer/Navigation/components/TopHeader.tsx
index 36b9352d52..e368c56126 100644
--- a/app/client/src/pages/AppViewer/Navigation/components/TopHeader.tsx
+++ b/app/client/src/pages/AppViewer/Navigation/components/TopHeader.tsx
@@ -7,7 +7,7 @@ import { get } from "lodash";
 import { useHref } from "pages/Editor/utils";
 import React from "react";
 import { useSelector } from "react-redux";
-import { builderURL } from "RouteBuilder";
+import { builderURL } from "@appsmith/RouteBuilder";
 import { getSelectedAppTheme } from "selectors/appThemingSelectors";
 import { getCurrentPageId } from "selectors/editorSelectors";
 import MobileNavToggle from "./MobileNavToggle";
@@ -24,7 +24,7 @@ import TopInline from "../TopInline";
 import NavigationLogo from "@appsmith/pages/AppViewer/NavigationLogo";
 import BackToAppsButton from "./BackToAppsButton";
 
-type TopHeaderProps = {
+interface TopHeaderProps {
   currentApplicationDetails?: ApplicationPayload;
   pages: Page[];
   currentWorkspaceId: string;
@@ -32,7 +32,7 @@ type TopHeaderProps = {
   isMenuOpen: boolean;
   setMenuOpen: (isMenuOpen: boolean) => void;
   showUserSettings: boolean;
-};
+}
 
 const TopHeader = (props: TopHeaderProps) => {
   const {
diff --git a/app/client/src/pages/AppViewer/Navigation/constants.ts b/app/client/src/pages/AppViewer/Navigation/constants.ts
index 4250afe541..90c426353e 100644
--- a/app/client/src/pages/AppViewer/Navigation/constants.ts
+++ b/app/client/src/pages/AppViewer/Navigation/constants.ts
@@ -3,7 +3,7 @@ import type {
   Page,
 } from "@appsmith/constants/ReduxActionConstants";
 
-export type NavigationProps = {
+export interface NavigationProps {
   pages: Page[];
   currentApplicationDetails?: ApplicationPayload;
-};
+}
diff --git a/app/client/src/pages/AppViewer/Navigation/index.tsx b/app/client/src/pages/AppViewer/Navigation/index.tsx
index 4ef8d7eee8..9e0b444654 100644
--- a/app/client/src/pages/AppViewer/Navigation/index.tsx
+++ b/app/client/src/pages/AppViewer/Navigation/index.tsx
@@ -18,7 +18,7 @@ import { NAVIGATION_SETTINGS } from "constants/AppConstants";
 import PageMenu from "pages/AppViewer/PageMenu";
 import TourCompletionMessage from "pages/Editor/GuidedTour/TourCompletionMessage";
 import { useHref } from "pages/Editor/utils";
-import { builderURL } from "RouteBuilder";
+import { builderURL } from "@appsmith/RouteBuilder";
 import TopHeader from "./components/TopHeader";
 import Sidebar from "./Sidebar";
 import { getCurrentApplication } from "@appsmith/selectors/applicationSelectors";
diff --git a/app/client/src/pages/AppViewer/PageMenu.tsx b/app/client/src/pages/AppViewer/PageMenu.tsx
index f810b07aa6..c405556686 100644
--- a/app/client/src/pages/AppViewer/PageMenu.tsx
+++ b/app/client/src/pages/AppViewer/PageMenu.tsx
@@ -14,9 +14,8 @@ import { getAppViewHeaderHeight } from "selectors/appViewSelectors";
 import { useOnClickOutside } from "utils/hooks/useOnClickOutside";
 import { useHref } from "pages/Editor/utils";
 import { APP_MODE } from "entities/App";
-import { builderURL, viewerURL } from "RouteBuilder";
+import { builderURL, viewerURL } from "@appsmith/RouteBuilder";
 import { trimQueryString } from "utils/helpers";
-import { getAppsmithConfigs } from "@appsmith/configs";
 import type { NavigationSetting } from "constants/AppConstants";
 import { NAVIGATION_SETTINGS } from "constants/AppConstants";
 import { get } from "lodash";
@@ -24,15 +23,16 @@ import { PageMenuContainer, StyledNavLink } from "./PageMenu.styled";
 import { StyledCtaContainer } from "./Navigation/Sidebar.styled";
 import ShareButton from "./Navigation/components/ShareButton";
 import BackToAppsButton from "./Navigation/components/BackToAppsButton";
+import { getHideWatermark } from "@appsmith/selectors/tenantSelectors";
 
-type NavigationProps = {
+interface NavigationProps {
   isOpen?: boolean;
   application?: ApplicationPayload;
   pages: Page[];
   url?: string;
   setMenuOpen?: (shouldOpen: boolean) => void;
   headerRef?: React.RefObject<HTMLDivElement>;
-};
+}
 
 export function PageMenu(props: NavigationProps) {
   const { application, headerRef, isOpen, pages, setMenuOpen } = props;
@@ -41,7 +41,7 @@ export function PageMenu(props: NavigationProps) {
   const workspaceID = useSelector(getCurrentWorkspaceId);
   const headerHeight = useSelector(getAppViewHeaderHeight);
   const [query, setQuery] = useState("");
-  const { hideWatermark } = getAppsmithConfigs();
+  const hideWatermark = useSelector(getHideWatermark);
   const navColorStyle =
     application?.applicationDetail?.navigationSetting?.colorStyle ||
     NAVIGATION_SETTINGS.COLOR_STYLE.LIGHT;
@@ -147,7 +147,7 @@ export function PageMenu(props: NavigationProps) {
 
               {!hideWatermark && (
                 <a
-                  className="flex hover:no-underline mt-2"
+                  className="flex mt-2 hover:no-underline"
                   href="https://appsmith.com"
                   rel="noreferrer"
                   target="_blank"
diff --git a/app/client/src/pages/AppViewer/PageTabs.tsx b/app/client/src/pages/AppViewer/PageTabs.tsx
index 9b8ace2fd9..b6a7b391d9 100644
--- a/app/client/src/pages/AppViewer/PageTabs.tsx
+++ b/app/client/src/pages/AppViewer/PageTabs.tsx
@@ -13,7 +13,7 @@ import { useSelector } from "react-redux";
 import { getSelectedAppTheme } from "selectors/appThemingSelectors";
 import { useHref } from "pages/Editor/utils";
 import { APP_MODE } from "entities/App";
-import { builderURL, viewerURL } from "RouteBuilder";
+import { builderURL, viewerURL } from "@appsmith/RouteBuilder";
 import {
   getMenuItemBackgroundColorWhenActive,
   getMenuItemBackgroundColorOnHover,
@@ -140,13 +140,13 @@ function PageTabContainer({
   return <div ref={tabContainerRef}>{children}</div>;
 }
 
-type Props = {
+interface Props {
   appPages: Page[];
   currentApplicationDetails?: ApplicationPayload;
   measuredTabsRef: (ref: HTMLElement | null) => void;
   tabsScrollable: boolean;
   setShowScrollArrows: () => void;
-};
+}
 
 export function PageTabs(props: Props) {
   const { appPages, currentApplicationDetails } = props;
diff --git a/app/client/src/pages/AppViewer/PrimaryCTA.tsx b/app/client/src/pages/AppViewer/PrimaryCTA.tsx
index 3db8451f65..fb41ab5cba 100644
--- a/app/client/src/pages/AppViewer/PrimaryCTA.tsx
+++ b/app/client/src/pages/AppViewer/PrimaryCTA.tsx
@@ -21,7 +21,7 @@ import {
 import { getCurrentUser } from "selectors/usersSelectors";
 import { ANONYMOUS_USERNAME } from "constants/userConstants";
 import ForkApplicationModal from "pages/Applications/ForkApplicationModal";
-import { viewerURL } from "RouteBuilder";
+import { viewerURL } from "@appsmith/RouteBuilder";
 import { useHistory, useLocation } from "react-router";
 import { useHref } from "pages/Editor/utils";
 import type { NavigationSetting } from "constants/AppConstants";
@@ -35,14 +35,14 @@ import { setPreviewModeInitAction } from "actions/editorActions";
  * TYPES
  * ---------------------------------------------------------------------------------------------------
  */
-type Props = {
+interface Props {
   url?: string;
   className?: string;
   primaryColor: string;
   navColorStyle: NavigationSetting["colorStyle"];
   insideSidebar?: boolean;
   isMinimal?: boolean;
-};
+}
 
 /**
  * ---------------------------------------------------------------------------------------------------
@@ -117,6 +117,7 @@ function PrimaryCTA(props: Props) {
     pageId: currentPageID,
     params: {
       fork: "true",
+      branch: null,
     },
   });
 
diff --git a/app/client/src/pages/AppViewer/SideNav.tsx b/app/client/src/pages/AppViewer/SideNav.tsx
index 24ec3308b1..48a6a27ff5 100644
--- a/app/client/src/pages/AppViewer/SideNav.tsx
+++ b/app/client/src/pages/AppViewer/SideNav.tsx
@@ -4,13 +4,13 @@ import { Menu, Button } from "@blueprintjs/core";
 import type { SideNavItemProps } from "./SideNavItem";
 import SideNavItem from "./SideNavItem";
 import LetterIcon from "components/editorComponents/LetterIcon";
-type SideNavProps = {
+interface SideNavProps {
   items?: SideNavItemProps[];
   active?: string;
   headeroffset?: number;
   open: boolean;
   toggleCollapse: (open: boolean) => void;
-};
+}
 
 /* eslint-disable no-unexpected-multiline */
 
diff --git a/app/client/src/pages/AppViewer/SideNavItem.tsx b/app/client/src/pages/AppViewer/SideNavItem.tsx
index f17e8ad51d..c880bdc17a 100644
--- a/app/client/src/pages/AppViewer/SideNavItem.tsx
+++ b/app/client/src/pages/AppViewer/SideNavItem.tsx
@@ -14,14 +14,14 @@ const Content = styled.div<{ collapsed: boolean }>`
   }
 `;
 
-export type SideNavItemProps = {
+export interface SideNavItemProps {
   id: string;
   icon?: ReactNode;
   text: string;
   path: string;
   loading: boolean;
   showText?: boolean;
-};
+}
 
 export function SideNavItem(props: SideNavItemProps) {
   const match = useRouteMatch({
diff --git a/app/client/src/pages/AppViewer/index.tsx b/app/client/src/pages/AppViewer/index.tsx
index a9f3cca915..6b76997765 100644
--- a/app/client/src/pages/AppViewer/index.tsx
+++ b/app/client/src/pages/AppViewer/index.tsx
@@ -34,7 +34,6 @@ import { getIsBranchUpdated } from "../utils";
 import { APP_MODE } from "entities/App";
 import { initAppViewer } from "actions/initActions";
 import { WidgetGlobaStyles } from "globalStyles/WidgetGlobalStyles";
-import { getAppsmithConfigs } from "@appsmith/configs";
 import useWidgetFocus from "utils/hooks/useWidgetFocus/useWidgetFocus";
 import HtmlTitle from "./AppViewerHtmlTitle";
 import BottomBar from "components/BottomBar";
@@ -53,6 +52,8 @@ import { RAMP_NAME } from "utils/ProductRamps/RampsControlList";
 import { showProductRamps } from "@appsmith/selectors/rampSelectors";
 import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
 import { KBViewerFloatingButton } from "@appsmith/pages/AppViewer/KnowledgeBase/KBViewerFloatingButton";
+import urlBuilder from "@appsmith/entities/URLRedirect/URLAssembly";
+import { getHideWatermark } from "@appsmith/selectors/tenantSelectors";
 
 const AppViewerBody = styled.section<{
   hasPages: boolean;
@@ -102,7 +103,7 @@ function AppViewer(props: Props) {
   const headerHeight = useSelector(getAppViewHeaderHeight);
   const branch = getSearchQuery(search, GIT_BRANCH_QUERY_KEY);
   const prevValues = usePrevious({ branch, location: props.location, pageId });
-  const { hideWatermark } = getAppsmithConfigs();
+  const hideWatermark = useSelector(getHideWatermark);
   const pageDescription = useSelector(getCurrentPageDescription);
   const currentApplicationDetails: ApplicationPayload | undefined = useSelector(
     getCurrentApplication,
@@ -171,6 +172,14 @@ function AppViewer(props: Props) {
     }
   }, [branch, pageId, applicationId, pathname]);
 
+  useEffect(() => {
+    urlBuilder.setCurrentPageId(pageId);
+
+    return () => {
+      urlBuilder.setCurrentPageId(null);
+    };
+  }, [pageId]);
+
   useEffect(() => {
     const header = document.querySelector(".js-appviewer-header");
 
diff --git a/app/client/src/pages/Applications/ApplicationCard.tsx b/app/client/src/pages/Applications/ApplicationCard.tsx
index 862259dd0f..4061622bb8 100644
--- a/app/client/src/pages/Applications/ApplicationCard.tsx
+++ b/app/client/src/pages/Applications/ApplicationCard.tsx
@@ -47,9 +47,9 @@ import {
 } from "@appsmith/selectors/applicationSelectors";
 import ForkApplicationModal from "./ForkApplicationModal";
 import { getExportAppAPIRoute } from "@appsmith/constants/ApiConstants";
-import { builderURL, viewerURL } from "RouteBuilder";
+import { builderURL, viewerURL } from "@appsmith/RouteBuilder";
 import history from "utils/history";
-import urlBuilder from "entities/URLRedirect/URLAssembly";
+import urlBuilder from "@appsmith/entities/URLRedirect/URLAssembly";
 import { toast } from "design-system";
 import { getAppsmithConfigs } from "@appsmith/configs";
 import { addItemsInContextMenu } from "@appsmith/utils";
@@ -63,7 +63,7 @@ import {
 
 const { cloudHosting } = getAppsmithConfigs();
 
-type ApplicationCardProps = {
+interface ApplicationCardProps {
   application: ApplicationPayload;
   share?: (applicationId: string) => void;
   delete?: (applicationId: string) => void;
@@ -77,7 +77,7 @@ type ApplicationCardProps = {
     canInviteToWorkspace?: boolean;
   };
   workspaceId: string;
-};
+}
 
 const IconScrollWrapper = styled.div`
   position: relative;
diff --git a/app/client/src/pages/Applications/EmbedSnippet/DimensionsInput.tsx b/app/client/src/pages/Applications/EmbedSnippet/DimensionsInput.tsx
index 8324e4ddac..2f96cb9410 100644
--- a/app/client/src/pages/Applications/EmbedSnippet/DimensionsInput.tsx
+++ b/app/client/src/pages/Applications/EmbedSnippet/DimensionsInput.tsx
@@ -12,12 +12,12 @@ const StyledInput = styled(Input)`
   }
 `;
 
-type DimensionsInputProp = {
+interface DimensionsInputProp {
   onChange?: ((value: string) => void) | undefined;
   value: string;
   prefix: string;
   icon: string;
-};
+}
 
 const regex = /^[1-9][0-9]{0,3}((px)|(em)|(%)|(vw)|(vh))?$/;
 
diff --git a/app/client/src/pages/Applications/EmbedSnippet/Snippet.tsx b/app/client/src/pages/Applications/EmbedSnippet/Snippet.tsx
index feaf3916e0..36d1a950fe 100644
--- a/app/client/src/pages/Applications/EmbedSnippet/Snippet.tsx
+++ b/app/client/src/pages/Applications/EmbedSnippet/Snippet.tsx
@@ -19,15 +19,15 @@ const EmbedSnippetContainer = styled.div`
   gap: 1.5rem;
 `;
 
-type EmbedCodeSnippetProps = {
+interface EmbedCodeSnippetProps {
   snippet: string;
   isAppSettings?: boolean;
-};
+}
 
-type SnippetProps = {
+interface SnippetProps {
   onCopy: () => void;
   snippet: string;
-};
+}
 
 function AppSettings(props: SnippetProps) {
   return (
diff --git a/app/client/src/pages/Applications/EmbedSnippet/useUpdateEmbedSnippet.tsx b/app/client/src/pages/Applications/EmbedSnippet/useUpdateEmbedSnippet.tsx
index 343ca9d2f9..243551c007 100644
--- a/app/client/src/pages/Applications/EmbedSnippet/useUpdateEmbedSnippet.tsx
+++ b/app/client/src/pages/Applications/EmbedSnippet/useUpdateEmbedSnippet.tsx
@@ -7,7 +7,7 @@ import { getCurrentApplication } from "@appsmith/selectors/applicationSelectors"
 import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 import debounce from "lodash/debounce";
 import { updateApplication } from "@appsmith/actions/applicationActions";
-import { viewerURL } from "RouteBuilder";
+import { viewerURL } from "@appsmith/RouteBuilder";
 import {
   createMessage,
   IN_APP_EMBED_SETTING,
diff --git a/app/client/src/pages/Applications/ForkApplicationModal.tsx b/app/client/src/pages/Applications/ForkApplicationModal.tsx
index 970b22f146..60580629dd 100644
--- a/app/client/src/pages/Applications/ForkApplicationModal.tsx
+++ b/app/client/src/pages/Applications/ForkApplicationModal.tsx
@@ -27,7 +27,7 @@ import {
 } from "@appsmith/constants/messages";
 import { getAllApplications } from "@appsmith/actions/applicationActions";
 
-type ForkApplicationModalProps = {
+interface ForkApplicationModalProps {
   applicationId: string;
   // if a trigger is passed
   // it renders that component
@@ -36,7 +36,7 @@ type ForkApplicationModalProps = {
   handleOpen?: () => void;
   handleClose?: () => void;
   isInEditMode?: boolean;
-};
+}
 
 function ForkApplicationModal(props: ForkApplicationModalProps) {
   const { handleClose, handleOpen, isModalOpen } = props;
diff --git a/app/client/src/pages/Applications/ImportApplicationModal.tsx b/app/client/src/pages/Applications/ImportApplicationModal.tsx
index a22fb91269..406afafcb0 100644
--- a/app/client/src/pages/Applications/ImportApplicationModal.tsx
+++ b/app/client/src/pages/Applications/ImportApplicationModal.tsx
@@ -183,13 +183,13 @@ function GitImportCard(props: { children?: ReactNode; handler?: () => void }) {
   );
 }
 
-type ImportApplicationModalProps = {
+interface ImportApplicationModalProps {
   workspaceId?: string;
   isModalOpen?: boolean;
   onClose?: () => void;
   appId?: string;
   toApp?: boolean;
-};
+}
 
 function ImportApplicationModal(props: ImportApplicationModalProps) {
   const { appId, isModalOpen, onClose, toApp = false, workspaceId } = props;
diff --git a/app/client/src/pages/Applications/ProductUpdatesModal/ReleaseComponent.tsx b/app/client/src/pages/Applications/ProductUpdatesModal/ReleaseComponent.tsx
index 8043b81b84..2b04dba363 100644
--- a/app/client/src/pages/Applications/ProductUpdatesModal/ReleaseComponent.tsx
+++ b/app/client/src/pages/Applications/ProductUpdatesModal/ReleaseComponent.tsx
@@ -72,16 +72,16 @@ const StyledContent = styled.div<{ maxHeight: number }>`
   max-height: ${(props) => props.maxHeight}px;
 `;
 
-export type Release = {
+export interface Release {
   descriptionHtml: string;
   name: string;
   publishedAt?: string;
   tagName: string;
-};
+}
 
-type ReleaseProps = {
+interface ReleaseProps {
   release: Release;
-};
+}
 
 enum ReleaseComponentViewState {
   "collapsed",
diff --git a/app/client/src/pages/Applications/ProductUpdatesModal/index.tsx b/app/client/src/pages/Applications/ProductUpdatesModal/index.tsx
index 0b0d7a72a4..29bab4f1d9 100644
--- a/app/client/src/pages/Applications/ProductUpdatesModal/index.tsx
+++ b/app/client/src/pages/Applications/ProductUpdatesModal/index.tsx
@@ -17,11 +17,11 @@ const Container = styled.div`
   height: 410px;
 `;
 
-type ProductUpdatesModalProps = {
+interface ProductUpdatesModalProps {
   isOpen?: boolean;
   onClose?: () => void;
   hideTrigger?: boolean;
-};
+}
 
 function ProductUpdatesModal(props: ProductUpdatesModalProps) {
   const { releaseItems } = useSelector((state: AppState) => state.ui.releases);
diff --git a/app/client/src/pages/Applications/helpers.ts b/app/client/src/pages/Applications/helpers.ts
index 830ec8448b..d249e5b91c 100644
--- a/app/client/src/pages/Applications/helpers.ts
+++ b/app/client/src/pages/Applications/helpers.ts
@@ -5,17 +5,17 @@ import { SubmissionError } from "redux-form";
 
 import { truncateString, howMuchTimeBeforeText } from "utils/helpers";
 
-export type CreateApplicationFormValues = {
+export interface CreateApplicationFormValues {
   applicationName: string;
   workspaceId: string;
   colorCode?: AppColorCode;
   appName?: AppIconName;
-};
+}
 
-export type EditedByTextProps = {
+export interface EditedByTextProps {
   modifiedAt?: string;
   modifiedBy?: string;
-};
+}
 
 export const CREATE_APPLICATION_FORM_NAME_FIELD = "applicationName";
 
diff --git a/app/client/src/pages/Editor/APIEditor/ApiRightPane.tsx b/app/client/src/pages/Editor/APIEditor/ApiRightPane.tsx
index b9b10def27..29baf5b6de 100644
--- a/app/client/src/pages/Editor/APIEditor/ApiRightPane.tsx
+++ b/app/client/src/pages/Editor/APIEditor/ApiRightPane.tsx
@@ -9,7 +9,7 @@ import ActionRightPane, {
   useEntityDependencies,
 } from "components/editorComponents/ActionRightPane";
 import { sortedDatasourcesHandler } from "./helpers";
-import { datasourcesEditorIdURL } from "RouteBuilder";
+import { datasourcesEditorIdURL } from "@appsmith/RouteBuilder";
 import { setApiRightPaneSelectedTab } from "actions/apiPaneActions";
 import { useDispatch, useSelector } from "react-redux";
 import { getApiRightPaneSelectedTab } from "selectors/apiPaneSelectors";
diff --git a/app/client/src/pages/Editor/APIEditor/GraphQL/GraphQLEditorForm.tsx b/app/client/src/pages/Editor/APIEditor/GraphQL/GraphQLEditorForm.tsx
index beaf6bd818..d953fd8735 100644
--- a/app/client/src/pages/Editor/APIEditor/GraphQL/GraphQLEditorForm.tsx
+++ b/app/client/src/pages/Editor/APIEditor/GraphQL/GraphQLEditorForm.tsx
@@ -148,9 +148,9 @@ function GraphQLEditorForm(props: Props) {
 
 const selector = formValueSelector(API_EDITOR_FORM_NAME);
 
-type ReduxDispatchProps = {
+interface ReduxDispatchProps {
   updateDatasource: (datasource: Datasource) => void;
-};
+}
 
 const mapDispatchToProps = (dispatch: any): ReduxDispatchProps => ({
   updateDatasource: (datasource) => {
diff --git a/app/client/src/pages/Editor/APIEditor/GraphQL/Pagination.tsx b/app/client/src/pages/Editor/APIEditor/GraphQL/Pagination.tsx
index 5ffae1394c..208170f9c9 100644
--- a/app/client/src/pages/Editor/APIEditor/GraphQL/Pagination.tsx
+++ b/app/client/src/pages/Editor/APIEditor/GraphQL/Pagination.tsx
@@ -151,7 +151,7 @@ const graphqlParseVariables = (queryBody: string) => {
   return variables;
 };
 
-type PaginationTypeBasedWrapperProps = {
+interface PaginationTypeBasedWrapperProps {
   actionName: string;
   className: string;
   dataReplayId: string;
@@ -174,7 +174,7 @@ type PaginationTypeBasedWrapperProps = {
   variableLabel: string;
   variableTooltip?: string;
   valueTooltip?: string;
-};
+}
 
 function PaginationTypeBasedWrapper({
   actionName,
diff --git a/app/client/src/pages/Editor/APIEditor/GraphQL/QueryEditor.tsx b/app/client/src/pages/Editor/APIEditor/GraphQL/QueryEditor.tsx
index 074f1190ee..37c9505565 100644
--- a/app/client/src/pages/Editor/APIEditor/GraphQL/QueryEditor.tsx
+++ b/app/client/src/pages/Editor/APIEditor/GraphQL/QueryEditor.tsx
@@ -25,7 +25,7 @@ const QueryHeader = styled.div`
   padding: 8px 16px;
 `;
 
-type QueryProps = {
+interface QueryProps {
   // Path to store the value in the actual data object
   dataTreePath: string;
   // Height for the editor
@@ -34,7 +34,7 @@ type QueryProps = {
   name: string;
   // Theme to be used in CodeEditor
   theme: EditorTheme;
-};
+}
 
 /**
  * Query Editor is for writing Graphql query using the Codemirror Editor which we use
diff --git a/app/client/src/pages/Editor/APIEditor/GraphQL/VariableEditor.tsx b/app/client/src/pages/Editor/APIEditor/GraphQL/VariableEditor.tsx
index 5335f45a97..e5ea15ef1f 100644
--- a/app/client/src/pages/Editor/APIEditor/GraphQL/VariableEditor.tsx
+++ b/app/client/src/pages/Editor/APIEditor/GraphQL/VariableEditor.tsx
@@ -38,12 +38,12 @@ const EXPECTED_VARIABLE = {
   autocompleteDataType: AutocompleteDataType.OBJECT,
 };
 
-type VariableProps = {
+interface VariableProps {
   // Name of the action to define the path to the config property
   actionName: string;
   // Theme to be used in CodeEditor
   theme: EditorTheme;
-};
+}
 
 /**
  * Variable Editor is for writing Graphql variables using the Codemirror Editor which we use for JSON
diff --git a/app/client/src/pages/Editor/APIEditor/ProviderTemplates.tsx b/app/client/src/pages/Editor/APIEditor/ProviderTemplates.tsx
index ec3841c207..7f631f36b5 100644
--- a/app/client/src/pages/Editor/APIEditor/ProviderTemplates.tsx
+++ b/app/client/src/pages/Editor/APIEditor/ProviderTemplates.tsx
@@ -32,7 +32,7 @@ import { getInitialsAndColorCode } from "utils/AppsmithUtils";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import { getAppCardColorPalette } from "selectors/themeSelectors";
 import { getCurrentApplicationId } from "selectors/editorSelectors";
-import { integrationEditorURL } from "RouteBuilder";
+import { integrationEditorURL } from "@appsmith/RouteBuilder";
 import { getAssetUrl } from "@appsmith/utils/airgapHelpers";
 
 const TEMPLATES_TOP_SECTION_HEIGHT = "83px";
diff --git a/app/client/src/pages/Editor/APIEditor/RestAPIForm.tsx b/app/client/src/pages/Editor/APIEditor/RestAPIForm.tsx
index 6a127d3201..11a98c1775 100644
--- a/app/client/src/pages/Editor/APIEditor/RestAPIForm.tsx
+++ b/app/client/src/pages/Editor/APIEditor/RestAPIForm.tsx
@@ -73,9 +73,9 @@ function ApiEditorForm(props: Props) {
 
 const selector = formValueSelector(API_EDITOR_FORM_NAME);
 
-type ReduxDispatchProps = {
+interface ReduxDispatchProps {
   updateDatasource: (datasource: Datasource) => void;
-};
+}
 
 const mapDispatchToProps = (dispatch: any): ReduxDispatchProps => ({
   updateDatasource: (datasource) => {
diff --git a/app/client/src/pages/Editor/APIEditor/helpers.ts b/app/client/src/pages/Editor/APIEditor/helpers.ts
index 6e29b240c3..b752e18bd7 100644
--- a/app/client/src/pages/Editor/APIEditor/helpers.ts
+++ b/app/client/src/pages/Editor/APIEditor/helpers.ts
@@ -1,10 +1,10 @@
 import { submitCurlImportForm } from "actions/importActions";
 
-export type curlImportFormValues = {
+export interface curlImportFormValues {
   curl: string;
   pageId: string;
   name: string;
-};
+}
 
 export const curlImportSubmitHandler = (
   values: curlImportFormValues,
@@ -32,11 +32,11 @@ export const sortedDatasourcesHandler = (
   return sortedArr;
 };
 
-export type AutoGeneratedHeader = {
+export interface AutoGeneratedHeader {
   key: string;
   value: string;
   isInvalid: boolean;
-};
+}
 
 const isKeyInArray = (arr: any[], key: any) => {
   return arr.some(
diff --git a/app/client/src/pages/Editor/APIEditor/index.tsx b/app/client/src/pages/Editor/APIEditor/index.tsx
index 38806b2518..3dc41400b2 100644
--- a/app/client/src/pages/Editor/APIEditor/index.tsx
+++ b/app/client/src/pages/Editor/APIEditor/index.tsx
@@ -41,7 +41,7 @@ import {
   getPluginSettingConfigs,
 } from "@appsmith/selectors/entitiesSelector";
 import history from "utils/history";
-import { saasEditorApiIdURL } from "RouteBuilder";
+import { saasEditorApiIdURL } from "@appsmith/RouteBuilder";
 import GraphQLEditorForm from "./GraphQL/GraphQLEditorForm";
 
 const LoadingContainer = styled(CenteredWrapper)`
diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/MakeApplicationForkable.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/MakeApplicationForkable.tsx
index 04d4dc14ae..6aa751b482 100644
--- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/MakeApplicationForkable.tsx
+++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/MakeApplicationForkable.tsx
@@ -19,11 +19,11 @@ import { getIsFetchingApplications } from "@appsmith/selectors/applicationSelect
 import { updateApplication } from "@appsmith/actions/applicationActions";
 import type { ApplicationPayload } from "@appsmith/constants/ReduxActionConstants";
 
-type ConfirmEnableForkingModalProps = {
+interface ConfirmEnableForkingModalProps {
   isOpen: boolean;
   onClose: () => void;
   onConfirm: () => void;
-};
+}
 
 function ConfirmEnableForkingModal({
   isOpen,
diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/ButtonGroupSetting.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/ButtonGroupSetting.tsx
index 95b976bbb0..6a44006110 100644
--- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/ButtonGroupSetting.tsx
+++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/ButtonGroupSetting.tsx
@@ -16,7 +16,7 @@ const StyledSegmentedControl = styled(SegmentedControl)`
   }
 `;
 
-export type ButtonGroupSettingProps = {
+export interface ButtonGroupSettingProps {
   heading: string;
   options: Array<
     SegmentedControlOption & { startIcon?: any; hidden?: boolean }
@@ -24,7 +24,7 @@ export type ButtonGroupSettingProps = {
   navigationSetting: NavigationSetting;
   keyName: keyof StringsFromNavigationSetting;
   updateSetting: UpdateSetting;
-};
+}
 
 const ButtonGroupSetting = ({
   heading,
diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/ImageInput.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/ImageInput.tsx
index 02adebc53d..0acc1ef2e9 100644
--- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/ImageInput.tsx
+++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/ImageInput.tsx
@@ -10,7 +10,7 @@ import {
 } from "@appsmith/selectors/applicationSelectors";
 import { ContentBox } from "pages/AdminSettings/components";
 
-type ImageInputProps = {
+interface ImageInputProps {
   value?: any;
   onChange?(value?: any): void;
   validate?(
@@ -19,7 +19,7 @@ type ImageInputProps = {
   ): void;
   className?: string;
   defaultValue?: string;
-};
+}
 
 const StyledImg = styled.img`
   object-fit: contain;
diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/index.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/index.tsx
index 42573add5d..a8fd0451a1 100644
--- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/index.tsx
+++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/index.tsx
@@ -39,10 +39,10 @@ export type UpdateSetting = (
   value: NavigationSetting[keyof NavigationSetting],
 ) => void;
 
-export type LogoConfigurationSwitches = {
+export interface LogoConfigurationSwitches {
   logo: boolean;
   applicationTitle: boolean;
-};
+}
 
 function NavigationSettings() {
   const application = useSelector(getCurrentApplication);
diff --git a/app/client/src/pages/Editor/AppSettingsPane/Utils.ts b/app/client/src/pages/Editor/AppSettingsPane/Utils.ts
index 33213fcd48..a9f6537276 100644
--- a/app/client/src/pages/Editor/AppSettingsPane/Utils.ts
+++ b/app/client/src/pages/Editor/AppSettingsPane/Utils.ts
@@ -1,5 +1,5 @@
 import { APP_MODE } from "entities/App";
-import urlBuilder from "entities/URLRedirect/URLAssembly";
+import urlBuilder from "@appsmith/entities/URLRedirect/URLAssembly";
 import { splitPathPreview } from "utils/helpers";
 
 export const getUrlPreview = (
diff --git a/app/client/src/pages/Editor/AppsmithLink.tsx b/app/client/src/pages/Editor/AppsmithLink.tsx
new file mode 100644
index 0000000000..124e4e294c
--- /dev/null
+++ b/app/client/src/pages/Editor/AppsmithLink.tsx
@@ -0,0 +1,36 @@
+import React from "react";
+import { Link, Tooltip } from "design-system";
+import styled from "styled-components";
+import { LOGO_TOOLTIP, createMessage } from "@appsmith/constants/messages";
+import { APPLICATIONS_URL } from "constants/routes";
+import AppsmithLogo from "assets/images/appsmith_logo_square.png";
+
+export const StyledLink = styled((props) => {
+  // we are removing non input related props before passing them in the components
+  // eslint-disable @typescript-eslint/no-unused-vars
+  return <Link {...props} />;
+})`
+  height: 24px;
+  min-width: 24px;
+  width: 24px;
+  display: inline-block;
+  img {
+    min-width: 24px;
+    width: 24px;
+    height: 24px;
+  }
+`;
+
+export const AppsmithLink = () => {
+  return (
+    <Tooltip content={createMessage(LOGO_TOOLTIP)} placement="bottomLeft">
+      <StyledLink target="_self" to={APPLICATIONS_URL}>
+        <img
+          alt="Appsmith logo"
+          className="t--appsmith-logo"
+          src={AppsmithLogo}
+        />
+      </StyledLink>
+    </Tooltip>
+  );
+};
diff --git a/app/client/src/pages/Editor/CanvasLayoutConversion/ConversionCompleteLayout.tsx b/app/client/src/pages/Editor/CanvasLayoutConversion/ConversionCompleteLayout.tsx
index 2a88b11751..aef3493263 100644
--- a/app/client/src/pages/Editor/CanvasLayoutConversion/ConversionCompleteLayout.tsx
+++ b/app/client/src/pages/Editor/CanvasLayoutConversion/ConversionCompleteLayout.tsx
@@ -19,12 +19,12 @@ const AlertIcons = {
   },
 };
 
-export type ConversionCompleteLayoutProps = {
+export interface ConversionCompleteLayoutProps {
   alertType: AlertType;
   headerText: string;
   infoText: string;
   errorText?: string;
-};
+}
 
 const StyledHugeIcon = styled(Icon)`
   svg {
diff --git a/app/client/src/pages/Editor/CanvasLayoutConversion/ConversionForm.tsx b/app/client/src/pages/Editor/CanvasLayoutConversion/ConversionForm.tsx
index dd42a62764..69be2ecf10 100644
--- a/app/client/src/pages/Editor/CanvasLayoutConversion/ConversionForm.tsx
+++ b/app/client/src/pages/Editor/CanvasLayoutConversion/ConversionForm.tsx
@@ -27,9 +27,13 @@ const SnapshotContainer = styled.div`
   border-radius: var(--ads-v2-border-radius);
 `;
 
-type ButtonInfo = { text: string; closeModal?: boolean; onClick: () => void };
+interface ButtonInfo {
+  text: string;
+  closeModal?: boolean;
+  onClick: () => void;
+}
 
-export type ConversionProps = {
+export interface ConversionProps {
   bannerMessageDetails?: {
     message: string;
     kind: CalloutKind;
@@ -57,7 +61,7 @@ export type ConversionProps = {
     icon: string;
     text: string;
   };
-};
+}
 
 export function ConversionForm(
   props: ConversionProps & { closeModal: () => void },
diff --git a/app/client/src/pages/Editor/CanvasLayoutConversion/InfoBlock.tsx b/app/client/src/pages/Editor/CanvasLayoutConversion/InfoBlock.tsx
index b78fc40cc7..a67ebf5a26 100644
--- a/app/client/src/pages/Editor/CanvasLayoutConversion/InfoBlock.tsx
+++ b/app/client/src/pages/Editor/CanvasLayoutConversion/InfoBlock.tsx
@@ -1,11 +1,11 @@
 import React from "react";
 import { Icon, Text } from "design-system";
 
-export type InfoBlockProps = {
+export interface InfoBlockProps {
   icon: string;
   header: string;
   info: string;
-};
+}
 
 export const InfoBlock = (props: InfoBlockProps) => {
   return (
diff --git a/app/client/src/pages/Editor/CommunityTemplates/Modals/CommunityTemplatesPublishInfo.tsx b/app/client/src/pages/Editor/CommunityTemplates/Modals/CommunityTemplatesPublishInfo.tsx
index 595c540004..997efe8e1a 100644
--- a/app/client/src/pages/Editor/CommunityTemplates/Modals/CommunityTemplatesPublishInfo.tsx
+++ b/app/client/src/pages/Editor/CommunityTemplates/Modals/CommunityTemplatesPublishInfo.tsx
@@ -10,10 +10,10 @@ import React, { useCallback, useEffect } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import styled from "styled-components";
 
-type Props = {
+interface Props {
   onPublishClick: () => void;
   setShowHostModal: (showModal: boolean) => void;
-};
+}
 const CommunityTemplatesPublishInfo = ({
   onPublishClick,
   setShowHostModal,
diff --git a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/CommunityTemplateForm.tsx b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/CommunityTemplateForm.tsx
index a1d942f5e0..cdeb1efee5 100644
--- a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/CommunityTemplateForm.tsx
+++ b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/CommunityTemplateForm.tsx
@@ -18,14 +18,13 @@ import {
 import ApplicationSettings from "./components/ApplicationSettings";
 import AuthorDetailsInput from "./components/AuthorDetailsInput";
 import PublishedInfo from "./components/PublishedInfo";
-import TemplateCardPreview from "./components/TemplateCardPreview";
 import TemplateInfoForm from "./components/TemplateInfoForm";
-import { viewerURL } from "RouteBuilder";
+import { viewerURL } from "@appsmith/RouteBuilder";
 import { getCurrentPageId } from "@appsmith/selectors/entitiesSelector";
 
-type Props = {
+interface Props {
   onPublishSuccess: () => void;
-};
+}
 
 const CommunityTemplateForm = ({ onPublishSuccess }: Props) => {
   const currentUser = useSelector(getCurrentUser);
@@ -110,11 +109,11 @@ const CommunityTemplateForm = ({ onPublishSuccess }: Props) => {
   return (
     <>
       <PublishPageBodyContainer>
-        <TemplateCardPreview
+        {/*<TemplateCardPreview
           excerpt={templateExcerpt}
           templateName={templateName}
           useCases={templateUseCases}
-        />
+  />*/}
         <PublishPageTemplateDetailsInputContainer>
           <TemplateInfoForm
             setTemplateDescription={setTemplateDescription}
diff --git a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/ApplicationSettings.tsx b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/ApplicationSettings.tsx
index 0599459af7..2145fc606f 100644
--- a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/ApplicationSettings.tsx
+++ b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/ApplicationSettings.tsx
@@ -6,12 +6,12 @@ import { Switch, Text } from "design-system";
 import React from "react";
 import styled from "styled-components";
 
-type Props = {
+interface Props {
   isForkable: boolean;
   isPublic: boolean;
   setIsForkable: (isForkable: boolean) => void;
   setIsPublic: (isForkable: boolean) => void;
-};
+}
 
 const ApplicationSettings = ({
   isForkable,
diff --git a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/AuthorDetailsInput.tsx b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/AuthorDetailsInput.tsx
index a26a6906a2..7bb3186035 100644
--- a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/AuthorDetailsInput.tsx
+++ b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/AuthorDetailsInput.tsx
@@ -8,14 +8,14 @@ import { emailValidator } from "design-system-old";
 import React, { useMemo } from "react";
 import styled from "styled-components";
 
-type Props = {
+interface Props {
   authorEmail: string;
   authorName: string;
   disableEmail: boolean;
   disableName: boolean;
   setAuthorEmail: React.Dispatch<string>;
   setAuthorName: React.Dispatch<string>;
-};
+}
 const AuthorDetailsInput = ({
   authorEmail,
   authorName,
diff --git a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/TemplateCardPreview.tsx b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/TemplateCardPreview.tsx
index a02e033e93..2b1322c88d 100644
--- a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/TemplateCardPreview.tsx
+++ b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/TemplateCardPreview.tsx
@@ -13,11 +13,11 @@ import {
   TemplatePreviewProfileContainer,
 } from "../StyledComponents";
 
-type Props = {
+interface Props {
   excerpt: string;
   templateName: string;
   useCases: string[];
-};
+}
 
 const TemplateCardPreview = ({ excerpt, templateName, useCases }: Props) => {
   return (
diff --git a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/TemplateInfoForm.tsx b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/TemplateInfoForm.tsx
index 5cd6379e84..386ee4c303 100644
--- a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/TemplateInfoForm.tsx
+++ b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/components/TemplateInfoForm.tsx
@@ -12,7 +12,7 @@ import {
 import { useSelector } from "react-redux";
 import { allTemplatesFiltersSelector } from "selectors/templatesSelectors";
 
-type Props = {
+interface Props {
   setTemplateDescription: (templateDescription: string) => void;
   setTemplateExcerpt: (excerpt: string) => void;
   setTemplateName: (templateName: string) => void;
@@ -21,7 +21,7 @@ type Props = {
   templateExcerpt: string;
   templateName: string;
   templateUseCases: string[];
-};
+}
 
 const TemplateInfoForm = ({
   setTemplateDescription,
@@ -115,10 +115,10 @@ const TemplateInfoForm = ({
 
 export default TemplateInfoForm;
 
-type UseCaseProps = {
+interface UseCaseProps {
   setTemplateUseCases: (useCases: string[]) => void;
   templateUseCases: string[];
-};
+}
 const UseCasesSelect = ({
   setTemplateUseCases,
   templateUseCases,
diff --git a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/index.tsx b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/index.tsx
index b2646dbc69..d861380105 100644
--- a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/index.tsx
+++ b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/index.tsx
@@ -13,11 +13,11 @@ import React from "react";
 import CommunityTemplateForm from "./CommunityTemplateForm";
 import { PublishPageHeaderContainer } from "./StyledComponents";
 
-type Props = {
+interface Props {
   onPublishSuccess: () => void;
   setShowModal: (showModal: boolean) => void;
   showModal: boolean;
-};
+}
 
 const PublishCommunityTemplateModal = ({
   onPublishSuccess,
diff --git a/app/client/src/pages/Editor/DataSourceEditor/BackButton.tsx b/app/client/src/pages/Editor/DataSourceEditor/BackButton.tsx
index e860ebe793..851ac0ac48 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/BackButton.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/BackButton.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import styled from "styled-components";
 import { getIsGeneratePageInitiator } from "utils/GenerateCrudUtil";
-import { builderURL, generateTemplateFormURL } from "RouteBuilder";
+import { builderURL, generateTemplateFormURL } from "@appsmith/RouteBuilder";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import { useSelector } from "react-redux";
 import { getCurrentPageId } from "selectors/editorSelectors";
diff --git a/app/client/src/pages/Editor/DataSourceEditor/DSFormHeader.tsx b/app/client/src/pages/Editor/DataSourceEditor/DSFormHeader.tsx
index e3c6d4503d..a19ff78fad 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/DSFormHeader.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/DSFormHeader.tsx
@@ -64,7 +64,7 @@ export const PluginImage = (props: any) => {
   );
 };
 
-type DSFormHeaderProps = {
+interface DSFormHeaderProps {
   canCreateDatasourceActions: boolean;
   canDeleteDatasource: boolean;
   canManageDatasource: boolean;
@@ -82,7 +82,7 @@ type DSFormHeaderProps = {
   }) => void;
   viewMode: boolean;
   isNewQuerySecondaryButton?: boolean;
-};
+}
 
 export const DSFormHeader = (props: DSFormHeaderProps) => {
   const {
diff --git a/app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx b/app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx
index b1c558efeb..51b7bd832b 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx
@@ -43,14 +43,14 @@ const FieldWrapper = styled.div`
   }
 `;
 
-type RenderDatasourceSectionProps = {
+interface RenderDatasourceSectionProps {
   config: any;
   datasource: Datasource;
   viewMode?: boolean;
   showOnlyCurrentEnv?: boolean;
   currentEnv: string;
   isEnvEnabled: boolean;
-};
+}
 const renderKVArray = (
   children: Array<any>,
   currentEnvironment: string,
diff --git a/app/client/src/pages/Editor/DataSourceEditor/DatasourceViewModeSchema.tsx b/app/client/src/pages/Editor/DataSourceEditor/DatasourceViewModeSchema.tsx
index 39daafbc08..9488b04641 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/DatasourceViewModeSchema.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/DatasourceViewModeSchema.tsx
@@ -88,11 +88,11 @@ const ButtonContainer = styled.div`
   justify-content: flex-end;
 `;
 
-type Props = {
+interface Props {
   datasourceId: string;
   datasource: Datasource;
   setDatasourceViewModeFlag: (viewMode: boolean) => void;
-};
+}
 
 const DatasourceViewModeSchema = (props: Props) => {
   const dispatch = useDispatch();
diff --git a/app/client/src/pages/Editor/DataSourceEditor/NewActionButton.tsx b/app/client/src/pages/Editor/DataSourceEditor/NewActionButton.tsx
index 3566970c0e..e68bc46afd 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/NewActionButton.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/NewActionButton.tsx
@@ -22,7 +22,7 @@ import { adaptiveSignpostingEnabled } from "@appsmith/selectors/featureFlagsSele
 import { actionsExistInCurrentPage } from "@appsmith/selectors/entitiesSelector";
 import { SignpostingWalkthroughConfig } from "../FirstTimeUserOnboarding/Utils";
 
-type NewActionButtonProps = {
+interface NewActionButtonProps {
   datasource?: Datasource;
   disabled?: boolean;
   packageName?: string;
@@ -31,7 +31,7 @@ type NewActionButtonProps = {
   pluginType?: string;
   style?: any;
   isNewQuerySecondaryButton?: boolean;
-};
+}
 function NewActionButton(props: NewActionButtonProps) {
   const { datasource, disabled, isNewQuerySecondaryButton, pluginType } = props;
   const [isSelected, setIsSelected] = useState(false);
diff --git a/app/client/src/pages/Editor/DataSourceEditor/hooks.ts b/app/client/src/pages/Editor/DataSourceEditor/hooks.ts
index abf18d1ec9..9acdcd29d2 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/hooks.ts
+++ b/app/client/src/pages/Editor/DataSourceEditor/hooks.ts
@@ -3,21 +3,21 @@ import type { QueryTemplate } from "entities/Datasource";
 import { useState, useCallback } from "react";
 import { useDispatch } from "react-redux";
 
-type FetchPreviewData = {
+interface FetchPreviewData {
   datasourceId: string;
   template: QueryTemplate;
-};
+}
 
-type UseDatasourceQueryReturn = {
+interface UseDatasourceQueryReturn {
   fetchPreviewData: (data: FetchPreviewData) => void;
   isLoading: boolean;
   failedFetchingPreviewData: boolean;
-};
+}
 
-type UseDatasourceQueryParams = {
+interface UseDatasourceQueryParams {
   setPreviewData: (data: any) => void;
   setPreviewDataError: (string: any) => void;
-};
+}
 
 export const useDatasourceQuery = ({
   setPreviewData,
diff --git a/app/client/src/pages/Editor/DataSourceEditor/index.tsx b/app/client/src/pages/Editor/DataSourceEditor/index.tsx
index 6633322f3b..bc68270046 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/index.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/index.tsx
@@ -45,7 +45,7 @@ import {
   getPagePermissions,
   selectURLSlugs,
 } from "selectors/editorSelectors";
-import { saasEditorDatasourceIdURL } from "RouteBuilder";
+import { saasEditorDatasourceIdURL } from "@appsmith/RouteBuilder";
 import {
   createMessage,
   REST_API_AUTHORIZATION_APPSMITH_ERROR,
@@ -175,11 +175,11 @@ export const CalloutContainer = styled.div<{
   margin-left: ${(props) => (!props.viewMode ? "24px" : "0px")};
 `;
 
-export type DatasourceFilterState = {
+export interface DatasourceFilterState {
   id: string;
   name: string;
   userPermissions: string[];
-};
+}
 
 /*
   **** State Variables Description ****
@@ -192,7 +192,7 @@ export type DatasourceFilterState = {
   unblock: on blocking routes using history.block, it returns a function which can be used to unblock the routes
   navigation: function that navigates to path that we want to transition to, after discard action on datasource discard dialog popup
 */
-type State = {
+interface State {
   showDialog: boolean;
   routesBlocked: boolean;
   switchFilterBlocked: boolean;
@@ -203,7 +203,7 @@ type State = {
 
   unblock(): void;
   navigation(): void;
-};
+}
 
 export interface DatasourcePaneFunctions {
   switchDatasource: (id: string) => void;
diff --git a/app/client/src/pages/Editor/EditorAppName/NavigationMenu.tsx b/app/client/src/pages/Editor/EditorAppName/NavigationMenu.tsx
index 6705108558..880f7d942f 100644
--- a/app/client/src/pages/Editor/EditorAppName/NavigationMenu.tsx
+++ b/app/client/src/pages/Editor/EditorAppName/NavigationMenu.tsx
@@ -6,10 +6,10 @@ import type { MenuItemData } from "./NavigationMenuItem";
 import { MenuContent } from "design-system";
 import { NavigationMenuItem } from "./NavigationMenuItem";
 
-type NavigationMenuProps = {
+interface NavigationMenuProps {
   menuItems: MenuItemData[] | undefined;
   setIsPopoverOpen: typeof noop;
-};
+}
 
 export function NavigationMenu(props: NavigationMenuProps) {
   const { menuItems, setIsPopoverOpen } = props;
diff --git a/app/client/src/pages/Editor/EditorHeader.tsx b/app/client/src/pages/Editor/EditorHeader.tsx
index 704835049c..0a2c8a2fca 100644
--- a/app/client/src/pages/Editor/EditorHeader.tsx
+++ b/app/client/src/pages/Editor/EditorHeader.tsx
@@ -1,18 +1,7 @@
-import React, {
-  useCallback,
-  useEffect,
-  useState,
-  lazy,
-  Suspense,
-  useContext,
-} from "react";
-import styled, { ThemeProvider } from "styled-components";
-import classNames from "classnames";
-import { APPLICATIONS_URL } from "constants/routes";
+import React, { useCallback, useEffect, useState, useContext } from "react";
+import { ThemeProvider } from "styled-components";
 import AppInviteUsersForm from "pages/workspace/AppInviteUsersForm";
 import AnalyticsUtil from "utils/AnalyticsUtil";
-import AppsmithLogo from "assets/images/appsmith_logo_square.png";
-import { Link } from "react-router-dom";
 import {
   getApplicationLastDeployedAt,
   getCurrentApplicationId,
@@ -21,7 +10,6 @@ import {
   previewModeSelector,
 } from "selectors/editorSelectors";
 import {
-  getAllUsers,
   getCurrentAppWorkspace,
   getCurrentWorkspaceId,
 } from "@appsmith/selectors/workspaceSelectors";
@@ -38,15 +26,9 @@ import {
   getCurrentApplication,
 } from "@appsmith/selectors/applicationSelectors";
 import EditorAppName from "./EditorAppName";
-import { getCurrentUser } from "selectors/usersSelectors";
-import {
-  EditInteractionKind,
-  SavingState,
-  getTypographyByKey,
-} from "design-system-old";
+import { EditInteractionKind, SavingState } from "design-system-old";
 import {
   Button,
-  Icon,
   Tooltip,
   Modal,
   ModalHeader,
@@ -57,11 +39,8 @@ import {
   Tab,
   TabPanel,
 } from "design-system";
-import { Profile } from "pages/common/ProfileImage";
-import HelpBar from "components/editorComponents/GlobalSearch/HelpBar";
 import { getTheme, ThemeMode } from "selectors/themeSelectors";
 import ToggleModeButton from "pages/Editor/ToggleModeButton";
-import { snipingModeSelector } from "selectors/editorSelectors";
 import { showConnectGitModal } from "actions/gitSyncActions";
 import RealtimeAppEditors from "./RealtimeAppEditors";
 import { EditorSaveIndicator } from "./EditorSaveIndicator";
@@ -69,36 +48,23 @@ import {
   adaptiveSignpostingEnabled,
   selectFeatureFlags,
 } from "@appsmith/selectors/featureFlagsSelectors";
-import { retryPromise } from "utils/AppsmithUtils";
 import { fetchUsersForWorkspace } from "@appsmith/actions/workspaceActions";
 
 import { getIsGitConnected } from "selectors/gitSyncSelectors";
 import {
-  CLOSE_ENTITY_EXPLORER_MESSAGE,
   createMessage,
   DEPLOY_BUTTON_TOOLTIP,
   DEPLOY_MENU_OPTION,
-  EDITOR_HEADER,
   INVITE_TAB,
   IN_APP_EMBED_SETTING,
-  LOCK_ENTITY_EXPLORER_MESSAGE,
-  LOGO_TOOLTIP,
   RENAME_APPLICATION_TOOLTIP,
-  SHARE_BUTTON_TOOLTIP,
-  SHARE_BUTTON_TOOLTIP_WITH_USER,
   COMMUNITY_TEMPLATES,
   APPLICATION_INVITE,
 } from "@appsmith/constants/messages";
-import { getExplorerPinned } from "selectors/explorerSelector";
-import {
-  setExplorerActiveAction,
-  setExplorerPinnedAction,
-} from "actions/explorerActions";
-import { modText } from "utils/helpers";
 import Boxed from "./GuidedTour/Boxed";
 import EndTour from "./GuidedTour/EndTour";
 import { GUIDED_TOUR_STEPS } from "./GuidedTour/constants";
-import { viewerURL } from "RouteBuilder";
+import { viewerURL } from "@appsmith/RouteBuilder";
 import { useHref } from "./utils";
 import { getAppsmithConfigs } from "@appsmith/configs";
 import { getIsAppSettingsPaneWithNavigationTabOpen } from "selectors/appSettingsPaneSelectors";
@@ -118,126 +84,21 @@ import PublishCommunityTemplateModal from "./CommunityTemplates/Modals/PublishCo
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
 import { getEmbedSnippetForm } from "@appsmith/utils/BusinessFeatures/privateEmbedHelpers";
+import { HeaderSection, HeaderWrapper } from "./commons/EditorHeaderComponents";
+import { LockEntityExplorer } from "./commons/LockEntityExplorer";
+import { Omnibar } from "./commons/Omnibar";
+import { EditorShareButton } from "./EditorShareButton";
+import { HelperBarInHeader } from "./HelpBarInHeader";
+import { AppsmithLink } from "./AppsmithLink";
 
 const { cloudHosting } = getAppsmithConfigs();
 
-const HeaderWrapper = styled.div`
-  width: 100%;
-  display: flex;
-  align-items: center;
-  background-color: var(--ads-v2-color-bg);
-  flex-direction: row;
-  box-shadow: none;
-  border-bottom: 1px solid var(--ads-v2-color-border);
-  height: ${(props) => props.theme.smallHeaderHeight};
-  & .editable-application-name {
-    ${getTypographyByKey("h4")}
-    color: ${(props) => props.theme.colors.header.appName};
-  }
-  & ${Profile} {
-    width: 24px;
-    height: 24px;
-  }
-
-  @media only screen and (max-width: 900px) {
-    & .help-bar {
-      display: none;
-    }
-  }
-
-  @media only screen and (max-width: 700px) {
-    & .app-realtime-editors {
-      display: none;
-    }
-  }
-`;
-
-const HeaderSection = styled.div`
-  position: relative;
-  display: flex;
-  flex: 1;
-  overflow: visible;
-  align-items: center;
-  :nth-child(1) {
-    justify-content: flex-start;
-    max-width: 30%;
-  }
-  :nth-child(2) {
-    justify-content: center;
-  }
-  :nth-child(3) {
-    justify-content: flex-end;
-  }
-`;
-
-const AppsmithLink = styled((props) => {
-  // we are removing non input related props before passing them in the components
-  // eslint-disable @typescript-eslint/no-unused-vars
-  return <Link {...props} />;
-})`
-  height: 24px;
-  min-width: 24px;
-  width: 24px;
-  display: inline-block;
-  img {
-    min-width: 24px;
-    width: 24px;
-    height: 24px;
-  }
-`;
-
-const BindingBanner = styled.div`
-  position: fixed;
-  width: 199px;
-  height: 36px;
-  left: 50%;
-  top: ${(props) => props.theme.smallHeaderHeight};
-  transform: translate(-50%, 0);
-  text-align: center;
-  background: var(--ads-v2-color-fg-information);
-  color: var(--ads-v2-color-white);
-  border-radius: var(--ads-v2-border-radius);
-  font-weight: 500;
-  font-size: 15px;
-  line-height: 20px;
-  /* Depth: 01 */
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  box-shadow: var(--ads-v2-shadow-popovers);
-  z-index: 9999;
-`;
-
-const SidebarNavButton = styled(Button)`
-  .ads-v2-button__content {
-    padding: 0;
-  }
-  .group {
-    height: 36px;
-    width: 36px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-`;
-
-const GlobalSearch = lazy(async () => {
-  return retryPromise(
-    async () =>
-      import(
-        /* webpackChunkName: "global-search" */ "components/editorComponents/GlobalSearch"
-      ),
-  );
-});
-
 const theme = getTheme(ThemeMode.LIGHT);
 
 export function EditorHeader() {
   const [activeTab, setActiveTab] = useState("invite");
   const dispatch = useDispatch();
-  const isSnipingMode = useSelector(snipingModeSelector);
   const isSavingName = useSelector(getIsSavingAppName);
-  const pinned = useSelector(getExplorerPinned);
   const isGitConnected = useSelector(getIsGitConnected);
   const isErroredSavingName = useSelector(getIsErroredSavingAppName);
   const applicationList = useSelector(getApplicationList);
@@ -249,8 +110,6 @@ export function EditorHeader() {
   const currentApplication = useSelector(getCurrentApplication);
   const isPublishing = useSelector(getIsPublishingApplication);
   const pageId = useSelector(getCurrentPageId) as string;
-  const sharedUserList = useSelector(getAllUsers);
-  const currentUser = useSelector(getCurrentUser);
   const featureFlags = useSelector(selectFeatureFlags);
 
   const deployLink = useHref(viewerURL, { pageId });
@@ -338,29 +197,12 @@ export function EditorHeader() {
     [dispatch, handlePublish],
   );
 
-  /**
-   * on hovering the menu, make the explorer active
-   */
-  const onMenuHover = useCallback(() => {
-    dispatch(setExplorerActiveAction(true));
-  }, [setExplorerActiveAction]);
-
-  /**
-   * toggles the pinned state of sidebar
-   */
-  const onPin = useCallback(() => {
-    dispatch(setExplorerPinnedAction(!pinned));
-  }, [pinned, dispatch, setExplorerPinnedAction]);
-
   //Fetch all users for the application to show the share button tooltip
   useEffect(() => {
     if (workspaceId) {
       dispatch(fetchUsersForWorkspace(workspaceId));
     }
   }, [workspaceId]);
-  const filteredSharedUserList = sharedUserList.filter(
-    (user) => user.username !== currentUser?.username,
-  );
 
   const {
     isOpened: isWalkthroughOpened,
@@ -412,74 +254,10 @@ export function EditorHeader() {
       >
         <HeaderSection className="space-x-2">
           {!signpostingEnabled && (
-            <Tooltip
-              content={
-                <div className="flex items-center justify-between">
-                  <span>
-                    {!pinned
-                      ? createMessage(LOCK_ENTITY_EXPLORER_MESSAGE)
-                      : createMessage(CLOSE_ENTITY_EXPLORER_MESSAGE)}
-                  </span>
-                  <span className="ml-4">{modText()} /</span>
-                </div>
-              }
-              placement="bottomLeft"
-            >
-              <SidebarNavButton
-                className={classNames({
-                  "transition-all transform duration-400": true,
-                  "-translate-x-full opacity-0": isPreviewingApp,
-                  "translate-x-0 opacity-100": !isPreviewingApp,
-                })}
-                data-testid="sidebar-nav-button"
-                kind="tertiary"
-                onClick={onPin}
-                size="md"
-              >
-                <div
-                  className="relative t--pin-entity-explorer group"
-                  onMouseEnter={onMenuHover}
-                >
-                  <Icon
-                    className="absolute transition-opacity group-hover:opacity-0"
-                    name="hamburger"
-                    size="md"
-                  />
-                  {pinned && (
-                    <Icon
-                      className="absolute transition-opacity opacity-0 group-hover:opacity-100"
-                      name="menu-fold"
-                      onClick={onPin}
-                      size="md"
-                    />
-                  )}
-                  {!pinned && (
-                    <Icon
-                      className="absolute transition-opacity opacity-0 group-hover:opacity-100"
-                      name="menu-unfold"
-                      onClick={onPin}
-                      size="md"
-                    />
-                  )}
-                </div>
-              </SidebarNavButton>
-            </Tooltip>
+            <LockEntityExplorer isPreviewingApp={isPreviewingApp} />
           )}
 
-          <Tooltip content={createMessage(LOGO_TOOLTIP)} placement="bottomLeft">
-            <AppsmithLink
-              className={classNames({
-                "ml-2": signpostingEnabled,
-              })}
-              to={APPLICATIONS_URL}
-            >
-              <img
-                alt="Appsmith logo"
-                className="t--appsmith-logo"
-                src={AppsmithLogo}
-              />
-            </AppsmithLink>
-          </Tooltip>
+          <AppsmithLink />
 
           <Tooltip
             content={createMessage(RENAME_APPLICATION_TOOLTIP)}
@@ -514,16 +292,9 @@ export function EditorHeader() {
           </Tooltip>
           <EditorSaveIndicator />
         </HeaderSection>
-        <HeaderSection
-          className={classNames({
-            "-translate-y-full opacity-0": isPreviewMode,
-            "translate-y-0 opacity-100": !isPreviewMode,
-            "transition-all transform duration-400": true,
-            "help-bar": "true",
-          })}
-        >
-          <HelpBar />
-        </HeaderSection>
+
+        <HelperBarInHeader />
+
         <HeaderSection className="gap-x-1">
           <Boxed
             alternative={<EndTour />}
@@ -531,30 +302,7 @@ export function EditorHeader() {
           >
             <RealtimeAppEditors applicationId={applicationId} />
             <ToggleModeButton />
-            {applicationId && (
-              <Tooltip
-                content={
-                  filteredSharedUserList.length
-                    ? createMessage(
-                        SHARE_BUTTON_TOOLTIP_WITH_USER(
-                          filteredSharedUserList.length,
-                        ),
-                      )
-                    : createMessage(SHARE_BUTTON_TOOLTIP)
-                }
-                placement="bottom"
-              >
-                <Button
-                  className="t--application-share-btn"
-                  kind="tertiary"
-                  onClick={() => setShowModal(true)}
-                  size="md"
-                  startIcon="share-line"
-                >
-                  {createMessage(EDITOR_HEADER.share)}
-                </Button>
-              </Tooltip>
-            )}
+            {applicationId && <EditorShareButton setShowModal={setShowModal} />}
             <Modal
               onOpenChange={(isOpen) => setShowModal(isOpen)}
               open={showModal}
@@ -582,7 +330,7 @@ export function EditorHeader() {
                       {featureFlags.release_show_publish_app_to_community_enabled &&
                         cloudHosting && (
                           <Tab data-testid="t--tab-PUBLISH" value="publish">
-                            {createMessage(COMMUNITY_TEMPLATES.publish)}
+                            {createMessage(COMMUNITY_TEMPLATES.tabTitle)}
                           </Tab>
                         )}
                     </TabsList>
@@ -640,14 +388,7 @@ export function EditorHeader() {
             </div>
           </Boxed>
         </HeaderSection>
-        <Suspense fallback={<span />}>
-          <GlobalSearch />
-        </Suspense>
-        {isSnipingMode && (
-          <BindingBanner className="t--sniping-mode-banner">
-            Select a widget to bind
-          </BindingBanner>
-        )}
+        <Omnibar />
       </HeaderWrapper>
     </ThemeProvider>
   );
diff --git a/app/client/src/pages/Editor/EditorShareButton.tsx b/app/client/src/pages/Editor/EditorShareButton.tsx
new file mode 100644
index 0000000000..ffc8004334
--- /dev/null
+++ b/app/client/src/pages/Editor/EditorShareButton.tsx
@@ -0,0 +1,45 @@
+import React from "react";
+import { Button, Tooltip } from "design-system";
+import {
+  EDITOR_HEADER,
+  SHARE_BUTTON_TOOLTIP,
+  SHARE_BUTTON_TOOLTIP_WITH_USER,
+  createMessage,
+} from "@appsmith/constants/messages";
+import { getCurrentUser } from "selectors/usersSelectors";
+import { getAllUsers } from "@appsmith/selectors/workspaceSelectors";
+import { useSelector } from "react-redux";
+
+export const EditorShareButton = ({
+  setShowModal,
+}: {
+  setShowModal: (val: boolean) => void;
+}) => {
+  const sharedUserList = useSelector(getAllUsers);
+  const currentUser = useSelector(getCurrentUser);
+  const filteredSharedUserList = sharedUserList.filter(
+    (user) => user.username !== currentUser?.username,
+  );
+  return (
+    <Tooltip
+      content={
+        filteredSharedUserList.length
+          ? createMessage(
+              SHARE_BUTTON_TOOLTIP_WITH_USER(filteredSharedUserList.length),
+            )
+          : createMessage(SHARE_BUTTON_TOOLTIP)
+      }
+      placement="bottom"
+    >
+      <Button
+        className="t--application-share-btn"
+        kind="tertiary"
+        onClick={() => setShowModal(true)}
+        size="md"
+        startIcon="share-line"
+      >
+        {createMessage(EDITOR_HEADER.share)}
+      </Button>
+    </Tooltip>
+  );
+};
diff --git a/app/client/src/pages/Editor/EntityNavigation/JSObjectsPane/index.ts b/app/client/src/pages/Editor/EntityNavigation/JSObjectsPane/index.ts
index 83afc4c5f5..a66d6b42bd 100644
--- a/app/client/src/pages/Editor/EntityNavigation/JSObjectsPane/index.ts
+++ b/app/client/src/pages/Editor/EntityNavigation/JSObjectsPane/index.ts
@@ -6,7 +6,7 @@ import PaneNavigation from "../PaneNavigation";
 import type { JSCollection } from "entities/JSCollection";
 import { call, delay, put, select } from "redux-saga/effects";
 import history from "utils/history";
-import { jsCollectionIdURL } from "RouteBuilder";
+import { jsCollectionIdURL } from "@appsmith/RouteBuilder";
 import type { EntityInfo, IJSPaneNavigationConfig } from "../types";
 import { setJsPaneConfigSelectedTab } from "actions/jsPaneActions";
 import { JSEditorTab } from "reducers/uiReducers/jsPaneReducer";
diff --git a/app/client/src/pages/Editor/EntityNavigation/PropertyPane/utils.ts b/app/client/src/pages/Editor/EntityNavigation/PropertyPane/utils.ts
index 231e8e58cc..4e7b4e5bdf 100644
--- a/app/client/src/pages/Editor/EntityNavigation/PropertyPane/utils.ts
+++ b/app/client/src/pages/Editor/EntityNavigation/PropertyPane/utils.ts
@@ -78,14 +78,13 @@ export const getSectionId = (
   // "boxShadow" and "resetButtonStyles.boxShadow"
   // The intendened match is "resetButtonStyles.boxShadow".
   // So we aggregrate matches and find the best match which is the longest string
-  const bestMatchedSection = matchedSections.reduce(function (
-    sectiona,
-    sectionb,
-  ) {
-    return sectiona.propertyName.length > sectionb.propertyName.length
-      ? sectiona
-      : sectionb;
-  });
+  const bestMatchedSection = matchedSections.reduce(
+    function (sectiona, sectionb) {
+      return sectiona.propertyName.length > sectionb.propertyName.length
+        ? sectiona
+        : sectionb;
+    },
+  );
 
   return bestMatchedSection.id;
 };
diff --git a/app/client/src/pages/Editor/EntityNotFoundPane.tsx b/app/client/src/pages/Editor/EntityNotFoundPane.tsx
index c9657595bc..f008c8de4c 100644
--- a/app/client/src/pages/Editor/EntityNotFoundPane.tsx
+++ b/app/client/src/pages/Editor/EntityNotFoundPane.tsx
@@ -51,9 +51,9 @@ const Wrapper = styled.div`
   }
 `;
 
-type Props = {
+interface Props {
   goBackFn?: () => void; // custom function for returning to any declared route.
-};
+}
 
 function EntityNotFoundPane(props: Props) {
   const history = useHistory();
diff --git a/app/client/src/pages/Editor/Explorer/Actions/ActionEntity.tsx b/app/client/src/pages/Editor/Explorer/Actions/ActionEntity.tsx
index a31039393b..0ce5a5c676 100644
--- a/app/client/src/pages/Editor/Explorer/Actions/ActionEntity.tsx
+++ b/app/client/src/pages/Editor/Explorer/Actions/ActionEntity.tsx
@@ -31,13 +31,13 @@ const getUpdateActionNameReduxAction = (id: string, name: string) => {
   return saveActionName({ id, name });
 };
 
-type ExplorerActionEntityProps = {
+interface ExplorerActionEntityProps {
   step: number;
   searchKeyword?: string;
   id: string;
   type: PluginType;
   isActive: boolean;
-};
+}
 
 export const ExplorerActionEntity = memo((props: ExplorerActionEntityProps) => {
   const pageId = useSelector(getCurrentPageId);
diff --git a/app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.tsx b/app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.tsx
index 1d527c7e4b..6b607c032d 100644
--- a/app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.tsx
+++ b/app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.tsx
@@ -24,20 +24,20 @@ import {
   CONTEXT_SHOW_BINDING,
   createMessage,
 } from "@appsmith/constants/messages";
-import { builderURL } from "RouteBuilder";
+import { builderURL } from "@appsmith/RouteBuilder";
 import { getCurrentPageId } from "selectors/editorSelectors";
 
 import ContextMenu from "pages/Editor/Explorer/ContextMenu";
 import type { TreeDropdownOption } from "pages/Editor/Explorer/ContextMenu";
 
-type EntityContextMenuProps = {
+interface EntityContextMenuProps {
   id: string;
   name: string;
   className?: string;
   pageId: string;
   canManageAction?: boolean;
   canDeleteAction?: boolean;
-};
+}
 export function ActionEntityContextMenu(props: EntityContextMenuProps) {
   const { canDeleteAction = false, canManageAction = false } = props;
   const nextEntityName = useNewActionName();
diff --git a/app/client/src/pages/Editor/Explorer/Actions/MoreActionsMenu.tsx b/app/client/src/pages/Editor/Explorer/Actions/MoreActionsMenu.tsx
index a52a07e07f..836446f2d4 100644
--- a/app/client/src/pages/Editor/Explorer/Actions/MoreActionsMenu.tsx
+++ b/app/client/src/pages/Editor/Explorer/Actions/MoreActionsMenu.tsx
@@ -31,14 +31,14 @@ import {
 } from "design-system";
 import { useToggle } from "@mantine/hooks";
 
-type EntityContextMenuProps = {
+interface EntityContextMenuProps {
   id: string;
   name: string;
   className?: string;
   pageId: string;
   isChangePermitted?: boolean;
   isDeletePermitted?: boolean;
-};
+}
 
 export function MoreActionsMenu(props: EntityContextMenuProps) {
   const [isMenuOpen, toggleMenuOpen] = useToggle([false, true]);
diff --git a/app/client/src/pages/Editor/Explorer/Actions/helpers.tsx b/app/client/src/pages/Editor/Explorer/Actions/helpers.tsx
index 5587dab081..84b1e657b1 100644
--- a/app/client/src/pages/Editor/Explorer/Actions/helpers.tsx
+++ b/app/client/src/pages/Editor/Explorer/Actions/helpers.tsx
@@ -19,12 +19,12 @@ import {
   apiEditorIdURL,
   queryEditorIdURL,
   saasEditorApiIdURL,
-} from "RouteBuilder";
+} from "@appsmith/RouteBuilder";
 import { getAssetUrl } from "@appsmith/utils/airgapHelpers";
 
 // TODO [new_urls] update would break for existing paths
 // using a common todo, this needs to be fixed
-export type ActionGroupConfig = {
+export interface ActionGroupConfig {
   groupName: string;
   types: PluginType[];
   icon: JSX.Element;
@@ -36,7 +36,7 @@ export type ActionGroupConfig = {
     plugin?: Plugin,
   ) => string;
   getIcon: (action: any, plugin: Plugin, remoteIcon?: boolean) => ReactNode;
-};
+}
 
 // When we have new action plugins, we can just add it to this map
 // There should be no other place where we refer to the PluginType in entity explorer.
@@ -97,8 +97,9 @@ export const ACTION_PLUGIN_MAP: Array<ActionGroupConfig | undefined> = [
 ];
 
 export const getActionConfig = (type: PluginType) =>
-  ACTION_PLUGIN_MAP.find((configByType: ActionGroupConfig | undefined) =>
-    configByType?.types.includes(type),
+  ACTION_PLUGIN_MAP.find(
+    (configByType: ActionGroupConfig | undefined) =>
+      configByType?.types.includes(type),
   );
 
 export const useNewActionName = () => {
diff --git a/app/client/src/pages/Editor/Explorer/Common/EntityExplorerResizeHandler.tsx b/app/client/src/pages/Editor/Explorer/Common/EntityExplorerResizeHandler.tsx
new file mode 100644
index 0000000000..9e4fb680ca
--- /dev/null
+++ b/app/client/src/pages/Editor/Explorer/Common/EntityExplorerResizeHandler.tsx
@@ -0,0 +1,42 @@
+import { tailwindLayers } from "constants/Layers";
+import React from "react";
+import styled from "styled-components";
+import type { CallbackResponseType } from "utils/hooks/useResize";
+import useResize, { DIRECTION } from "utils/hooks/useResize";
+
+const ResizeHandler = styled.div`
+  &:hover {
+    background-color: var(--ads-v2-color-border);
+  }
+`;
+
+export const EntityExplorerResizeHandler = ({
+  resizeRef,
+  storedHeightKey,
+}: {
+  resizeRef: React.RefObject<HTMLDivElement>;
+  storedHeightKey: string;
+}) => {
+  const resizeAfterCallback = (data: CallbackResponseType) => {
+    localStorage.setItem(storedHeightKey, data.height.toString());
+  };
+
+  const { mouseDown, setMouseDown } = useResize(
+    resizeRef,
+    DIRECTION.vertical,
+    resizeAfterCallback,
+  );
+
+  return (
+    <div
+      className={`absolute -bottom-2 left-0 w-full h-2 group cursor-ns-resize ${tailwindLayers.resizer}`}
+      onMouseDown={() => setMouseDown(true)}
+    >
+      <ResizeHandler
+        className={`w-full h-1 bg-transparent hover:bg-transparent transform transition
+          ${mouseDown ? "" : ""}
+          `}
+      />
+    </div>
+  );
+};
diff --git a/app/client/src/pages/Editor/Explorer/Common/EntityExplorerWrapper.tsx b/app/client/src/pages/Editor/Explorer/Common/EntityExplorerWrapper.tsx
new file mode 100644
index 0000000000..2866dc162b
--- /dev/null
+++ b/app/client/src/pages/Editor/Explorer/Common/EntityExplorerWrapper.tsx
@@ -0,0 +1,25 @@
+import React from "react";
+import styled from "styled-components";
+
+const Wrapper = styled.div`
+  height: 100%;
+  overflow-y: auto;
+  -ms-overflow-style: none;
+`;
+
+export const EntityExplorerWrapper = (props: {
+  children: React.ReactNode;
+  explorerRef: React.RefObject<HTMLDivElement>;
+  isActive: boolean;
+}) => {
+  return (
+    <Wrapper
+      className={`t--entity-explorer-wrapper relative overflow-y-auto ${
+        props.isActive ? "" : "hidden"
+      }`}
+      ref={props.explorerRef}
+    >
+      {props.children}
+    </Wrapper>
+  );
+};
diff --git a/app/client/src/pages/Editor/Explorer/Common/ExplorerWrapper.tsx b/app/client/src/pages/Editor/Explorer/Common/ExplorerWrapper.tsx
new file mode 100644
index 0000000000..01c292f6cc
--- /dev/null
+++ b/app/client/src/pages/Editor/Explorer/Common/ExplorerWrapper.tsx
@@ -0,0 +1,10 @@
+import React from "react";
+import { tailwindLayers } from "constants/Layers";
+
+export const ExplorerWrapper = (props: { children: React.ReactNode }) => (
+  <div
+    className={`flex-1 flex flex-col overflow-hidden ${tailwindLayers.entityExplorer}`}
+  >
+    {props.children}
+  </div>
+);
diff --git a/app/client/src/pages/Editor/Explorer/Common/components.tsx b/app/client/src/pages/Editor/Explorer/Common/components.tsx
new file mode 100644
index 0000000000..4e3c9fa099
--- /dev/null
+++ b/app/client/src/pages/Editor/Explorer/Common/components.tsx
@@ -0,0 +1,35 @@
+import styled from "styled-components";
+import Entity, { EntityClassNames } from "../Entity";
+
+export const ENTITY_HEIGHT = 36;
+export const MIN_PAGES_HEIGHT = 60;
+
+export const RelativeContainer = styled.div`
+  position: relative;
+`;
+
+export const StyledEntity = styled(Entity)<{ entitySize?: number }>`
+  &.pages > div:not(.t--entity-item) > div > div,
+  &.query-modules > div:not(.t--entity-item) > div > div {
+      max-height: 40vh;
+      min-height: ${({ entitySize }) =>
+        entitySize && entitySize > MIN_PAGES_HEIGHT
+          ? MIN_PAGES_HEIGHT
+          : entitySize}px;
+      height: ${({ entitySize }) =>
+        entitySize && entitySize > 128 ? 128 : entitySize}px;
+      overflow-y: auto;
+    }
+  }
+
+  &.page .${EntityClassNames.PRE_RIGHT_ICON} {
+    width: 20px;
+    right: 0;
+  }
+
+  &.page:hover {
+    & .${EntityClassNames.PRE_RIGHT_ICON} {
+      display: none;
+    }
+  }
+`;
diff --git a/app/client/src/pages/Editor/Explorer/ContextMenu.tsx b/app/client/src/pages/Editor/Explorer/ContextMenu.tsx
index 3a528a9268..8965dd14a5 100644
--- a/app/client/src/pages/Editor/Explorer/ContextMenu.tsx
+++ b/app/client/src/pages/Editor/Explorer/ContextMenu.tsx
@@ -17,7 +17,7 @@ import {
 import { AddButtonWrapper, EntityClassNames } from "./Entity";
 import styled from "styled-components";
 
-export type TreeDropdownOption = {
+export interface TreeDropdownOption {
   label: string;
   value: string;
   children?: TreeDropdownOption[];
@@ -26,16 +26,16 @@ export type TreeDropdownOption = {
   confirmDelete?: boolean;
   intent?: string;
   disabled?: boolean;
-};
+}
 type Setter = (value: TreeDropdownOption, defaultVal?: string) => void;
 
-type TreeDropdownProps = {
+interface TreeDropdownProps {
   toggle?: React.ReactNode;
   optionTree: TreeDropdownOption[];
   className?: string;
   triggerId?: string;
   setConfirmDelete?: (val: boolean) => void;
-};
+}
 
 const StyledMenuSubContent = styled(MenuSubContent)`
   max-height: 350px;
diff --git a/app/client/src/pages/Editor/Explorer/Datasources.tsx b/app/client/src/pages/Editor/Explorer/Datasources.tsx
index 2a0c508a20..1cb85cc757 100644
--- a/app/client/src/pages/Editor/Explorer/Datasources.tsx
+++ b/app/client/src/pages/Editor/Explorer/Datasources.tsx
@@ -1,20 +1,6 @@
-import React, { useCallback, useContext } from "react";
-import {
-  useAppWideAndOtherDatasource,
-  useDatasourceSuggestions,
-} from "./hooks";
-import type { Datasource } from "entities/Datasource";
-import ExplorerDatasourceEntity from "./Datasources/DatasourceEntity";
+import React from "react";
 import { useSelector } from "react-redux";
-import {
-  getCurrentApplicationId,
-  getCurrentPageId,
-} from "selectors/editorSelectors";
-import { getPlugins } from "@appsmith/selectors/entitiesSelector";
-import { keyBy } from "lodash";
 import Entity from "./Entity";
-import history from "utils/history";
-import { INTEGRATION_TABS } from "constants/routes";
 import {
   ADD_DATASOURCE_BUTTON,
   createMessage,
@@ -23,45 +9,53 @@ import {
   EMPTY_DATASOURCE_MAIN_TEXT,
 } from "@appsmith/constants/messages";
 import styled from "styled-components";
-import {
-  useDatasourceIdFromURL,
-  getExplorerStatus,
-  saveExplorerStatus,
-} from "@appsmith/pages/Editor/Explorer/helpers";
 import { Icon, Button } from "design-system";
 import { AddEntity, EmptyComponent } from "./common";
-import { integrationEditorURL } from "RouteBuilder";
 import { getCurrentAppWorkspace } from "@appsmith/selectors/workspaceSelectors";
 
 import type { AppState } from "@appsmith/reducers";
 import { DatasourceCreateEntryPoints } from "constants/Datasource";
-import AnalyticsUtil from "utils/AnalyticsUtil";
-import WalkthroughContext from "components/featureWalkthrough/walkthroughContext";
 import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import {
   getHasCreateDatasourcePermission,
   getHasManageDatasourcePermission,
 } from "@appsmith/utils/BusinessFeatures/permissionPageHelpers";
+import {
+  useAppWideAndOtherDatasource,
+  useDatasourceSuggestions,
+} from "./hooks";
+import { getPlugins } from "@appsmith/selectors/entitiesSelector";
+import { keyBy } from "lodash";
+import { useDatasourceIdFromURL } from "@appsmith/pages/Editor/Explorer/helpers";
+import type { Datasource } from "entities/Datasource";
+import ExplorerDatasourceEntity from "./Datasources/DatasourceEntity";
+
+interface DatasourcesProps {
+  isDatasourcesOpen: boolean | null;
+  addDatasource: (source: string) => void;
+  onDatasourcesToggle: (isOpen: boolean) => void;
+  listDatasource: () => void;
+  entityId: string;
+}
 
 const ShowAllButton = styled(Button)`
   margin: 0.25rem 1.5rem;
 `;
 
-const Datasources = React.memo(() => {
+const Datasources = React.memo((props: DatasourcesProps) => {
   const { appWideDS, otherDS } = useAppWideAndOtherDatasource();
-  const pageId = useSelector(getCurrentPageId) || "";
-  const plugins = useSelector(getPlugins);
-  const applicationId = useSelector(getCurrentApplicationId);
-  const isDatasourcesOpen = getExplorerStatus(applicationId, "datasource");
-  const pluginGroups = React.useMemo(() => keyBy(plugins, "id"), [plugins]);
-  const { isOpened: isWalkthroughOpened, popFeature } =
-    useContext(WalkthroughContext) || {};
-
+  const {
+    addDatasource,
+    isDatasourcesOpen,
+    listDatasource,
+    onDatasourcesToggle,
+  } = props;
   const userWorkspacePermissions = useSelector(
     (state: AppState) => getCurrentAppWorkspace(state).userPermissions ?? [],
   );
-
+  const plugins = useSelector(getPlugins);
+  const pluginGroups = React.useMemo(() => keyBy(plugins, "id"), [plugins]);
   const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
 
   const canCreateDatasource = getHasCreateDatasourcePermission(
@@ -69,37 +63,9 @@ const Datasources = React.memo(() => {
     userWorkspacePermissions,
   );
 
-  const closeWalkthrough = useCallback(() => {
-    if (isWalkthroughOpened && popFeature) {
-      popFeature("EXPLORER_DATASOURCE_ADD");
-    }
-  }, [isWalkthroughOpened, popFeature]);
-
-  const addDatasource = (entryPoint: string) => {
-    history.push(
-      integrationEditorURL({
-        pageId,
-        selectedTab: INTEGRATION_TABS.NEW,
-      }),
-    );
-    // Event for datasource creation click
-    AnalyticsUtil.logEvent("NAVIGATE_TO_CREATE_NEW_DATASOURCE_PAGE", {
-      entryPoint,
-    });
-    closeWalkthrough();
-  };
   const activeDatasourceId = useDatasourceIdFromURL();
   const datasourceSuggestions = useDatasourceSuggestions();
 
-  const listDatasource = useCallback(() => {
-    history.push(
-      integrationEditorURL({
-        pageId,
-        selectedTab: INTEGRATION_TABS.ACTIVE,
-      }),
-    );
-  }, [pageId]);
-
   const datasourceElements = React.useMemo(
     () =>
       appWideDS.concat(datasourceSuggestions).map((datasource: Datasource) => {
@@ -113,23 +79,16 @@ const Datasources = React.memo(() => {
           <ExplorerDatasourceEntity
             canManageDatasource={canManageDatasource}
             datasource={datasource}
+            entityId={props.entityId}
             isActive={datasource.id === activeDatasourceId}
             key={datasource.id}
-            pageId={pageId}
             plugin={pluginGroups[datasource.pluginId]}
             searchKeyword={""}
             step={1}
           />
         );
       }),
-    [appWideDS, pageId, activeDatasourceId],
-  );
-
-  const onDatasourcesToggle = useCallback(
-    (isOpen: boolean) => {
-      saveExplorerStatus(applicationId, "datasource", isOpen);
-    },
-    [applicationId],
+    [appWideDS, props.entityId, activeDatasourceId],
   );
 
   return (
diff --git a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceEntity.tsx b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceEntity.tsx
index 6851110e34..b491af8555 100644
--- a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceEntity.tsx
+++ b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceEntity.tsx
@@ -24,9 +24,8 @@ import {
 import {
   datasourcesEditorIdURL,
   saasEditorDatasourceIdURL,
-} from "RouteBuilder";
+} from "@appsmith/RouteBuilder";
 import { inGuidedTour } from "selectors/onboardingSelectors";
-import { getCurrentPageId } from "selectors/editorSelectors";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import { useLocation } from "react-router";
 import omit from "lodash/omit";
@@ -34,15 +33,15 @@ import { getQueryParams } from "utils/URLUtils";
 import { debounce } from "lodash";
 import styled from "styled-components";
 
-type ExplorerDatasourceEntityProps = {
+interface ExplorerDatasourceEntityProps {
   plugin: Plugin;
   datasource: Datasource;
   step: number;
   searchKeyword?: string;
-  pageId: string;
+  entityId: string;
   isActive: boolean;
   canManageDatasource?: boolean;
-};
+}
 
 const MAX_HEIGHT_LIST_WRAPPER = 300;
 
@@ -57,16 +56,16 @@ const DataStructureListWrapper = styled.div<{ height: number }>`
 
 const ExplorerDatasourceEntity = React.memo(
   (props: ExplorerDatasourceEntityProps) => {
+    const { entityId } = props;
     const guidedTourEnabled = useSelector(inGuidedTour);
     const dispatch = useDispatch();
-    const pageId = useSelector(getCurrentPageId);
     const icon = getPluginIcon(props.plugin);
     const location = useLocation();
     const switchDatasource = useCallback(() => {
       let url;
       if (props.plugin && props.plugin.type === PluginType.SAAS) {
         url = saasEditorDatasourceIdURL({
-          pageId,
+          pageId: entityId,
           pluginPackageName: props.plugin.packageName,
           datasourceId: props.datasource.id,
           params: {
@@ -75,7 +74,7 @@ const ExplorerDatasourceEntity = React.memo(
         });
       } else {
         url = datasourcesEditorIdURL({
-          pageId,
+          pageId: entityId,
           datasourceId: props.datasource.id,
           params: omit(getQueryParams(), "viewMode"),
         });
@@ -88,7 +87,12 @@ const ExplorerDatasourceEntity = React.memo(
         name: props.datasource.name,
       });
       history.push(url, { invokedBy: NavigationMethod.EntityExplorer });
-    }, [props.datasource.id, props.datasource.name, location.pathname, pageId]);
+    }, [
+      props.datasource.id,
+      props.datasource.name,
+      location.pathname,
+      entityId,
+    ]);
 
     const queryId = getQueryIdFromURL();
     const queryAction = useSelector((state: AppState) =>
diff --git a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceField.tsx b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceField.tsx
index a6c7d9c9f0..6c92c40754 100644
--- a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceField.tsx
+++ b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceField.tsx
@@ -50,10 +50,10 @@ const Content = styled.div`
   justify-content: space-between;
 `;
 
-type DatabaseFieldProps = {
+interface DatabaseFieldProps {
   field: DatasourceColumns | DatasourceKeys;
   step: number;
-};
+}
 
 export function DatabaseColumns(props: DatabaseFieldProps) {
   const field = props.field;
diff --git a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructure.tsx b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructure.tsx
index 5ecd6fcdf0..a4abb6ba0e 100644
--- a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructure.tsx
+++ b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructure.tsx
@@ -29,7 +29,7 @@ export enum DatasourceStructureContext {
   API_EDITOR = "api-editor",
 }
 
-type DatasourceStructureItemProps = {
+interface DatasourceStructureItemProps {
   dbStructure: DatasourceTable;
   step: number;
   datasourceId: string;
@@ -39,7 +39,7 @@ type DatasourceStructureItemProps = {
   currentActionId: string;
   onEntityTableClick?: (table: string) => void;
   tableName?: string;
-};
+}
 
 const StyledMenuContent = styled(MenuContent)`
   min-width: 220px;
diff --git a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructureContainer.tsx b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructureContainer.tsx
index 0de35525f8..ff27843321 100644
--- a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructureContainer.tsx
+++ b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructureContainer.tsx
@@ -25,7 +25,7 @@ import { setFeatureWalkthroughShown } from "utils/storage";
 import { FEATURE_WALKTHROUGH_KEYS } from "constants/WalkthroughConstants";
 import { SCHEMA_SECTION_ID } from "entities/Action";
 
-type Props = {
+interface Props {
   datasourceId: string;
   datasourceStructure?: DatasourceStructureType;
   step: number;
@@ -35,7 +35,7 @@ type Props = {
   onEntityTableClick?: (table: string) => void;
   tableName?: string;
   customEditDatasourceFn?: () => void;
-};
+}
 
 // leaving out DynamoDB and Firestore because they have a schema but not templates
 export const SCHEMALESS_PLUGINS: Array<string> = [
diff --git a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructureHeader.tsx b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructureHeader.tsx
index 812f25ef81..5a4283e6a2 100644
--- a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructureHeader.tsx
+++ b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructureHeader.tsx
@@ -6,10 +6,10 @@ import { refreshDatasourceStructure } from "actions/datasourceActions";
 import { SCHEMA_LABEL, createMessage } from "@appsmith/constants/messages";
 import { DatasourceStructureContext } from "./DatasourceStructure";
 
-type Props = {
+interface Props {
   datasourceId: string;
   onRefreshCallback?: () => void;
-};
+}
 
 const HeaderWrapper = styled.div`
   display: flex;
diff --git a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructureNotFound.tsx b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructureNotFound.tsx
index e4e2f43848..4523741dfe 100644
--- a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructureNotFound.tsx
+++ b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructureNotFound.tsx
@@ -8,18 +8,18 @@ import AnalyticsUtil from "utils/AnalyticsUtil";
 import { DatasourceEditEntryPoints } from "constants/Datasource";
 import history from "utils/history";
 import { getQueryParams } from "utils/URLUtils";
-import { datasourcesEditorIdURL } from "RouteBuilder";
+import { datasourcesEditorIdURL } from "@appsmith/RouteBuilder";
 import { omit } from "lodash";
 import { getCurrentPageId } from "selectors/editorSelectors";
 import { DatasourceStructureContext } from "./DatasourceStructure";
 
-export type Props = {
+export interface Props {
   error: APIResponseError | { message: string } | undefined;
   datasourceId: string;
   pluginName?: string;
   customEditDatasourceFn?: () => void;
   context: DatasourceStructureContext;
-};
+}
 
 const NotFoundContainer = styled.div`
   display: flex;
diff --git a/app/client/src/pages/Editor/Explorer/Datasources/QueryTemplates.tsx b/app/client/src/pages/Editor/Explorer/Datasources/QueryTemplates.tsx
index fba16fbd4d..50abb05202 100644
--- a/app/client/src/pages/Editor/Explorer/Datasources/QueryTemplates.tsx
+++ b/app/client/src/pages/Editor/Explorer/Datasources/QueryTemplates.tsx
@@ -16,7 +16,7 @@ import {
   getDatasource,
   getPlugin,
 } from "@appsmith/selectors/entitiesSelector";
-import { integrationEditorURL } from "RouteBuilder";
+import { integrationEditorURL } from "@appsmith/RouteBuilder";
 import { MenuItem, Tag } from "design-system";
 import type { Plugin } from "api/PluginApi";
 import { DatasourceStructureContext } from "./DatasourceStructure";
@@ -32,13 +32,13 @@ import { FEATURE_WALKTHROUGH_KEYS } from "constants/WalkthroughConstants";
 import { SUGGESTED_TAG, createMessage } from "@appsmith/constants/messages";
 import { transformTextToSentenceCase } from "pages/Editor/utils";
 
-type QueryTemplatesProps = {
+interface QueryTemplatesProps {
   templates: QueryTemplate[];
   datasourceId: string;
   onSelect: () => void;
   context: DatasourceStructureContext;
   currentActionId: string;
-};
+}
 
 enum QueryTemplatesEvent {
   EXPLORER_TEMPLATE = "explorer-template",
diff --git a/app/client/src/pages/Editor/Explorer/Entity/EntityProperty.tsx b/app/client/src/pages/Editor/Explorer/Entity/EntityProperty.tsx
index 20f12a2d09..cd3f968084 100644
--- a/app/client/src/pages/Editor/Explorer/Entity/EntityProperty.tsx
+++ b/app/client/src/pages/Editor/Explorer/Entity/EntityProperty.tsx
@@ -105,12 +105,12 @@ const StyledHighlightedCode = styled(HighlightedCode)`
   padding-bottom: 4px;
 `;
 
-export type EntityPropertyProps = {
+export interface EntityPropertyProps {
   propertyName: string;
   entityName: string;
   value: string;
   step?: number;
-};
+}
 
 /* eslint-disable react/display-name */
 export const EntityProperty = memo((props: any) => {
diff --git a/app/client/src/pages/Editor/Explorer/Entity/index.tsx b/app/client/src/pages/Editor/Explorer/Entity/index.tsx
index baeecc6969..49856c7872 100644
--- a/app/client/src/pages/Editor/Explorer/Entity/index.tsx
+++ b/app/client/src/pages/Editor/Explorer/Entity/index.tsx
@@ -218,7 +218,7 @@ const SubItemWrapper = styled.div`
   margin-right: 4px;
 `;
 
-export type EntityProps = {
+export interface EntityProps {
   entityId: string;
   showAddButton?: boolean;
   className?: string;
@@ -250,7 +250,7 @@ export type EntityProps = {
   collapseRef?: RefObject<HTMLDivElement> | null;
   customAddButton?: ReactNode;
   forceExpand?: boolean;
-};
+}
 
 export const Entity = forwardRef(
   (props: EntityProps, ref: React.Ref<HTMLDivElement>) => {
diff --git a/app/client/src/pages/Editor/Explorer/EntityExplorer.test.tsx b/app/client/src/pages/Editor/Explorer/EntityExplorer.test.tsx
index ae8802e60e..72fdb5a1a5 100644
--- a/app/client/src/pages/Editor/Explorer/EntityExplorer.test.tsx
+++ b/app/client/src/pages/Editor/Explorer/EntityExplorer.test.tsx
@@ -11,7 +11,7 @@ import Datasources from "./Datasources";
 import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 import { mockDatasources } from "./mockTestData";
 import { updateCurrentPage } from "actions/pageActions";
-import urlBuilder from "entities/URLRedirect/URLAssembly";
+import urlBuilder from "@appsmith/entities/URLRedirect/URLAssembly";
 import * as helpers from "@appsmith/pages/Editor/Explorer/helpers";
 import * as explorerSelector from "selectors/explorerSelector";
 import * as permissionPageHelpers from "@appsmith/utils/BusinessFeatures/permissionPageHelpers";
@@ -57,6 +57,12 @@ jest
   .spyOn(explorerSelector, "getExplorerWidth")
   .mockImplementation(() => DEFAULT_ENTITY_EXPLORER_WIDTH);
 
+const addDatasource = jest.fn();
+const listDatasource = jest.fn();
+const onDatasourcesToggle = jest.fn();
+const isDatasourcesOpen = true;
+const entityId = "pageId";
+
 describe("Entity Explorer tests", () => {
   beforeAll(() => {
     runSagaMiddleware();
@@ -89,7 +95,15 @@ describe("Entity Explorer tests", () => {
       .spyOn(permissionPageHelpers, "getHasCreateDatasourcePermission")
       .mockReturnValue(true);
     store.dispatch(updateCurrentPage("pageId"));
-    const component = render(<Datasources />);
+    const component = render(
+      <Datasources
+        addDatasource={addDatasource}
+        entityId={entityId}
+        isDatasourcesOpen={isDatasourcesOpen}
+        listDatasource={listDatasource}
+        onDatasourcesToggle={onDatasourcesToggle}
+      />,
+    );
     expect(component.container.getElementsByClassName("t--entity").length).toBe(
       5,
     );
@@ -105,7 +119,15 @@ describe("Entity Explorer tests", () => {
     const mockExplorerState = jest.spyOn(helpers, "getExplorerStatus");
     mockExplorerState.mockImplementationOnce(() => true);
     store.dispatch(updateCurrentPage("pageId"));
-    const component = render(<Datasources />);
+    const component = render(
+      <Datasources
+        addDatasource={addDatasource}
+        entityId={entityId}
+        isDatasourcesOpen={isDatasourcesOpen}
+        listDatasource={listDatasource}
+        onDatasourcesToggle={onDatasourcesToggle}
+      />,
+    );
     expect(component.container.getElementsByClassName("t--entity").length).toBe(
       4,
     );
@@ -114,37 +136,6 @@ describe("Entity Explorer tests", () => {
     );
     expect(addDatasourceEntity).toBeNull();
   });
-  it("should hide delete & edit of datasource if the user don't have valid permissions", async () => {
-    store.dispatch({
-      type: ReduxActionTypes.FETCH_DATASOURCES_SUCCESS,
-      payload: mockDatasources,
-    });
-    jest
-      .spyOn(permissionPageHelpers, "getHasCreateDatasourcePermission")
-      .mockReturnValue(true);
-    jest
-      .spyOn(permissionPageHelpers, "getHasManageDatasourcePermission")
-      .mockReturnValue(false);
-    jest
-      .spyOn(permissionPageHelpers, "getHasDeleteDatasourcePermission")
-      .mockReturnValue(false);
-    const mockExplorerState = jest.spyOn(helpers, "getExplorerStatus");
-    mockExplorerState.mockImplementationOnce(() => true);
-    store.dispatch(updateCurrentPage("pageId"));
-    const { container } = render(<Datasources />);
-    const target = container.getElementsByClassName("t--context-menu");
-    await userEvent.click(target[2]);
-    const deleteOption = document.getElementsByClassName(
-      "t--datasource-delete",
-    );
-    const editOption = document.getElementsByClassName("t--datasource-rename");
-    const refreshOption = document.getElementsByClassName(
-      "t--datasource-refresh",
-    );
-    expect(deleteOption.length).toBe(0);
-    expect(editOption.length).toBe(0);
-    expect(refreshOption.length).toBe(1);
-  });
   it("Should render Widgets tree in entity explorer", () => {
     const children: any = buildChildren([{ type: "TABS_WIDGET" }]);
     const dsl: any = widgetCanvasFactory.build({
@@ -410,4 +401,44 @@ describe("Entity Explorer tests", () => {
       );
     });
   });
+
+  it("should hide delete & edit of datasource if the user don't have valid permissions", async () => {
+    store.dispatch({
+      type: ReduxActionTypes.FETCH_DATASOURCES_SUCCESS,
+      payload: mockDatasources,
+    });
+    jest
+      .spyOn(permissionPageHelpers, "getHasCreateDatasourcePermission")
+      .mockReturnValue(true);
+    jest
+      .spyOn(permissionPageHelpers, "getHasManageDatasourcePermission")
+      .mockReturnValue(false);
+    jest
+      .spyOn(permissionPageHelpers, "getHasDeleteDatasourcePermission")
+      .mockReturnValue(false);
+    const mockExplorerState = jest.spyOn(helpers, "getExplorerStatus");
+    mockExplorerState.mockImplementationOnce(() => true);
+    store.dispatch(updateCurrentPage("pageId"));
+    const { container } = render(
+      <Datasources
+        addDatasource={addDatasource}
+        entityId={entityId}
+        isDatasourcesOpen={isDatasourcesOpen}
+        listDatasource={listDatasource}
+        onDatasourcesToggle={onDatasourcesToggle}
+      />,
+    );
+    const target = container.getElementsByClassName("t--context-menu");
+    await userEvent.click(target[2]);
+    const deleteOption = document.getElementsByClassName(
+      "t--datasource-delete",
+    );
+    const editOption = document.getElementsByClassName("t--datasource-rename");
+    const refreshOption = document.getElementsByClassName(
+      "t--datasource-refresh",
+    );
+    expect(deleteOption.length).toBe(0);
+    expect(editOption.length).toBe(0);
+    expect(refreshOption.length).toBe(1);
+  });
 });
diff --git a/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx b/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx
index 0df2e113b4..c6063b928b 100644
--- a/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx
+++ b/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx
@@ -1,4 +1,4 @@
-import React, { useRef, useCallback, useEffect } from "react";
+import React, { useRef, useCallback, useEffect, useContext } from "react";
 import styled from "styled-components";
 import { NonIdealState, Classes } from "@blueprintjs/core";
 import JSDependencies from "./Libraries";
@@ -16,24 +16,27 @@ import { forceOpenWidgetPanel } from "actions/widgetSidebarActions";
 import Datasources from "./Datasources";
 import Files from "./Files";
 import ExplorerWidgetGroup from "./Widgets/WidgetGroup";
-import { builderURL } from "RouteBuilder";
+import { builderURL } from "@appsmith/RouteBuilder";
 import history from "utils/history";
 import { getCurrentPageId } from "selectors/editorSelectors";
 import { fetchWorkspace } from "@appsmith/actions/workspaceActions";
 import { getCurrentWorkspaceId } from "@appsmith/selectors/workspaceSelectors";
 import { importSvg } from "design-system-old";
 import AnalyticsUtil from "utils/AnalyticsUtil";
+import { EntityExplorerWrapper } from "./Common/EntityExplorerWrapper";
+import { getCurrentApplicationId } from "selectors/editorSelectors";
+import { INTEGRATION_TABS } from "constants/routes";
+import {
+  getExplorerStatus,
+  saveExplorerStatus,
+} from "@appsmith/pages/Editor/Explorer/helpers";
+import { integrationEditorURL } from "@appsmith/RouteBuilder";
+import WalkthroughContext from "components/featureWalkthrough/walkthroughContext";
 
 const NoEntityFoundSvg = importSvg(
   async () => import("assets/svg/no_entities_found.svg"),
 );
 
-const Wrapper = styled.div`
-  height: 100%;
-  overflow-y: auto;
-  -ms-overflow-style: none;
-`;
-
 const NoResult = styled(NonIdealState)`
   &.${Classes.NON_IDEAL_STATE} {
     height: auto;
@@ -87,13 +90,52 @@ function EntityExplorer({ isActive }: { isActive: boolean }) {
     dispatch(fetchWorkspace(currentWorkspaceId));
   }, [currentWorkspaceId]);
 
+  const { isOpened: isWalkthroughOpened, popFeature } =
+    useContext(WalkthroughContext) || {};
+  const applicationId = useSelector(getCurrentApplicationId);
+  const isDatasourcesOpen = getExplorerStatus(applicationId, "datasource");
+
+  const closeWalkthrough = useCallback(() => {
+    if (isWalkthroughOpened && popFeature) {
+      popFeature("EXPLORER_DATASOURCE_ADD");
+    }
+  }, [isWalkthroughOpened, popFeature]);
+
+  const addDatasource = useCallback(
+    (entryPoint: string) => {
+      history.push(
+        integrationEditorURL({
+          pageId,
+          selectedTab: INTEGRATION_TABS.NEW,
+        }),
+      );
+      // Event for datasource creation click
+      AnalyticsUtil.logEvent("NAVIGATE_TO_CREATE_NEW_DATASOURCE_PAGE", {
+        entryPoint,
+      });
+      closeWalkthrough();
+    },
+    [pageId, closeWalkthrough],
+  );
+
+  const listDatasource = useCallback(() => {
+    history.push(
+      integrationEditorURL({
+        pageId,
+        selectedTab: INTEGRATION_TABS.ACTIVE,
+      }),
+    );
+  }, [pageId]);
+
+  const onDatasourcesToggle = useCallback(
+    (isOpen: boolean) => {
+      saveExplorerStatus(applicationId, "datasource", isOpen);
+    },
+    [applicationId],
+  );
+
   return (
-    <Wrapper
-      className={`t--entity-explorer-wrapper relative overflow-y-auto ${
-        isActive ? "" : "hidden"
-      }`}
-      ref={explorerRef}
-    >
+    <EntityExplorerWrapper explorerRef={explorerRef} isActive={isActive}>
       <ExplorerWidgetGroup
         addWidgetsFn={showWidgetsSidebar}
         searchKeyword=""
@@ -108,9 +150,15 @@ function EntityExplorer({ isActive }: { isActive: boolean }) {
           title="No entities found"
         />
       )}
-      <Datasources />
+      <Datasources
+        addDatasource={addDatasource}
+        entityId={pageId}
+        isDatasourcesOpen={isDatasourcesOpen}
+        listDatasource={listDatasource}
+        onDatasourcesToggle={onDatasourcesToggle}
+      />
       <JSDependencies />
-    </Wrapper>
+    </EntityExplorerWrapper>
   );
 }
 
diff --git a/app/client/src/pages/Editor/Explorer/ExplorerIcons.tsx b/app/client/src/pages/Editor/Explorer/ExplorerIcons.tsx
index 74302035e9..c3fe873fdf 100644
--- a/app/client/src/pages/Editor/Explorer/ExplorerIcons.tsx
+++ b/app/client/src/pages/Editor/Explorer/ExplorerIcons.tsx
@@ -154,11 +154,11 @@ export const SortFileIcon = (
  * Entity Icon components
  */
 
-type EntityTextIconProps = {
+interface EntityTextIconProps {
   children: React.ReactNode;
   textColor?: string;
   fontSize?: number;
-};
+}
 
 const EntityTextIconWrapper = styled.div<{ fontSize?: number; color?: string }>`
   color: ${({ color }) => (color ? color : "var(--ads-v2-color-fg)")};
@@ -213,7 +213,7 @@ const EntityIconWrapper = styled.div<{
   }
 `;
 
-type EntityIconType = {
+interface EntityIconType {
   children: React.ReactNode;
   borderColor?: string;
   width?: string;
@@ -221,7 +221,7 @@ type EntityIconType = {
   noBorder?: boolean;
   noBackground?: boolean;
   bgColor?: string;
-};
+}
 
 function EntityIcon(props: EntityIconType): JSX.Element {
   return (
diff --git a/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx b/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx
index 5eec0a7d87..faf77cb149 100644
--- a/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx
+++ b/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx
@@ -7,10 +7,7 @@ import {
   SEARCH_ITEM_TYPES,
 } from "components/editorComponents/GlobalSearch/utils";
 import { useDispatch, useSelector } from "react-redux";
-import {
-  getCurrentPageId,
-  getPagePermissions,
-} from "selectors/editorSelectors";
+import { getCurrentPageId } from "selectors/editorSelectors";
 import EntityAddButton from "../Entity/AddButton";
 import keyBy from "lodash/keyBy";
 import type { AppState } from "@appsmith/reducers";
@@ -32,9 +29,6 @@ import {
   Text,
 } from "design-system";
 import { DatasourceCreateEntryPoints } from "constants/Datasource";
-import { getHasCreateActionPermission } from "@appsmith/utils/BusinessFeatures/permissionPageHelpers";
-import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
-import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
 
 const SubMenuContainer = styled.div`
   width: 250px;
@@ -46,13 +40,15 @@ const SubMenuContainer = styled.div`
   }
 `;
 
-type SubMenuProps = {
+interface SubMenuProps {
+  canCreateActions: boolean;
   className: string;
   openMenu: boolean;
   onMenuClose: () => void;
-};
+}
 
 export default function ExplorerSubMenu({
+  canCreateActions,
   className,
   onMenuClose,
   openMenu,
@@ -73,15 +69,6 @@ export default function ExplorerSubMenu({
   useEffect(() => handleOpenChange(openMenu), [openMenu]);
   useCloseMenuOnScroll(SIDEBAR_ID, show, () => handleOpenChange(false));
 
-  const pagePermissions = useSelector(getPagePermissions);
-
-  const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
-
-  const canCreateActions = getHasCreateActionPermission(
-    isFeatureEnabled,
-    pagePermissions,
-  );
-
   useEffect(() => {
     setQuery("");
   }, [show]);
diff --git a/app/client/src/pages/Editor/Explorer/Files/SubmenuHotkeys.tsx b/app/client/src/pages/Editor/Explorer/Files/SubmenuHotkeys.tsx
index 8d15fc8278..3d1f0751cd 100644
--- a/app/client/src/pages/Editor/Explorer/Files/SubmenuHotkeys.tsx
+++ b/app/client/src/pages/Editor/Explorer/Files/SubmenuHotkeys.tsx
@@ -2,12 +2,12 @@ import React from "react";
 import { Hotkey, Hotkeys, HotkeysTarget } from "@blueprintjs/core";
 import type { SelectEvent } from "components/editorComponents/GlobalSearch/utils";
 
-type Props = {
+interface Props {
   handleUpKey: () => void;
   handleDownKey: () => void;
   handleSubmitKey: (e: SelectEvent) => void;
   children: React.ReactNode;
-};
+}
 
 @HotkeysTarget
 class SubmenuHotKeys extends React.Component<Props> {
diff --git a/app/client/src/pages/Editor/Explorer/Files/index.tsx b/app/client/src/pages/Editor/Explorer/Files/index.tsx
index 9ab0f2a651..fb270f8fe4 100644
--- a/app/client/src/pages/Editor/Explorer/Files/index.tsx
+++ b/app/client/src/pages/Editor/Explorer/Files/index.tsx
@@ -120,6 +120,7 @@ function Files() {
       className={`group files`}
       customAddButton={
         <ExplorerSubMenu
+          canCreateActions={canCreateActions}
           className={`${EntityClassNames.ADD_BUTTON} group files`}
           onMenuClose={onMenuClose}
           openMenu={isMenuOpen}
diff --git a/app/client/src/pages/Editor/Explorer/JSActions/JSActionContextMenu.tsx b/app/client/src/pages/Editor/Explorer/JSActions/JSActionContextMenu.tsx
index c7c05b9506..40a182567c 100644
--- a/app/client/src/pages/Editor/Explorer/JSActions/JSActionContextMenu.tsx
+++ b/app/client/src/pages/Editor/Explorer/JSActions/JSActionContextMenu.tsx
@@ -25,14 +25,14 @@ import { getPageListAsOptions } from "@appsmith/selectors/entitiesSelector";
 import ContextMenu from "pages/Editor/Explorer/ContextMenu";
 import type { TreeDropdownOption } from "pages/Editor/Explorer/ContextMenu";
 
-type EntityContextMenuProps = {
+interface EntityContextMenuProps {
   id: string;
   name: string;
   className?: string;
   pageId: string;
   canManage?: boolean;
   canDelete?: boolean;
-};
+}
 export function JSCollectionEntityContextMenu(props: EntityContextMenuProps) {
   const { canDelete = false, canManage = false } = props;
   const [confirmDelete, setConfirmDelete] = useState(false);
diff --git a/app/client/src/pages/Editor/Explorer/JSActions/JSActionEntity.tsx b/app/client/src/pages/Editor/Explorer/JSActions/JSActionEntity.tsx
index ea3e880202..8084e5b39c 100644
--- a/app/client/src/pages/Editor/Explorer/JSActions/JSActionEntity.tsx
+++ b/app/client/src/pages/Editor/Explorer/JSActions/JSActionEntity.tsx
@@ -10,7 +10,7 @@ import type { AppState } from "@appsmith/reducers";
 import type { JSCollection } from "entities/JSCollection";
 import { JsFileIconV2 } from "../ExplorerIcons";
 import type { PluginType } from "entities/Action";
-import { jsCollectionIdURL } from "RouteBuilder";
+import { jsCollectionIdURL } from "@appsmith/RouteBuilder";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import { useLocation } from "react-router";
 import {
@@ -20,13 +20,13 @@ import {
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
 
-type ExplorerJSCollectionEntityProps = {
+interface ExplorerJSCollectionEntityProps {
   step: number;
   searchKeyword?: string;
   id: string;
   isActive: boolean;
   type: PluginType;
-};
+}
 
 const getUpdateJSObjectName = (id: string, name: string) => {
   return saveJSObjectName({ id, name });
diff --git a/app/client/src/pages/Editor/Explorer/JSActions/MoreJSActionsMenu.tsx b/app/client/src/pages/Editor/Explorer/JSActions/MoreJSActionsMenu.tsx
index 328179681d..e58e9d0496 100644
--- a/app/client/src/pages/Editor/Explorer/JSActions/MoreJSActionsMenu.tsx
+++ b/app/client/src/pages/Editor/Explorer/JSActions/MoreJSActionsMenu.tsx
@@ -34,14 +34,14 @@ import {
   Text,
 } from "design-system";
 
-type EntityContextMenuProps = {
+interface EntityContextMenuProps {
   id: string;
   name: string;
   className?: string;
   pageId: string;
   isChangePermitted?: boolean;
   isDeletePermitted?: boolean;
-};
+}
 
 const prettifyCodeKeyboardShortCut = getAutoIndentShortcutKeyText();
 
@@ -188,10 +188,10 @@ export function MoreJSCollectionsMenu(props: EntityContextMenuProps) {
         />
       </MenuTrigger>
       <MenuContent avoidCollisions>
-        {options.map((option) => {
+        {options.map((option, index) => {
           if (option.children) {
             return (
-              <MenuSub>
+              <MenuSub key={index}>
                 <MenuSubTrigger startIcon={option.icon}>
                   {option.label}
                 </MenuSubTrigger>
diff --git a/app/client/src/pages/Editor/Explorer/Libraries/index.tsx b/app/client/src/pages/Editor/Explorer/Libraries/index.tsx
index 2d3ba566d8..7e502331be 100644
--- a/app/client/src/pages/Editor/Explorer/Libraries/index.tsx
+++ b/app/client/src/pages/Editor/Explorer/Libraries/index.tsx
@@ -46,10 +46,13 @@ import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
 import { getHasCreateActionPermission } from "@appsmith/utils/BusinessFeatures/permissionPageHelpers";
 
-const docsURLMap = recommendedLibraries.reduce((acc, lib) => {
-  acc[lib.url] = lib.docsURL;
-  return acc;
-}, {} as Record<string, string>);
+const docsURLMap = recommendedLibraries.reduce(
+  (acc, lib) => {
+    acc[lib.url] = lib.docsURL;
+    return acc;
+  },
+  {} as Record<string, string>,
+);
 
 const Library = styled.li`
   list-style: none;
diff --git a/app/client/src/pages/Editor/Explorer/Pages/AddPageContextMenu.tsx b/app/client/src/pages/Editor/Explorer/Pages/AddPageContextMenu.tsx
index b41cdc59f9..b61721d129 100644
--- a/app/client/src/pages/Editor/Explorer/Pages/AddPageContextMenu.tsx
+++ b/app/client/src/pages/Editor/Explorer/Pages/AddPageContextMenu.tsx
@@ -3,7 +3,7 @@ import { AddButtonWrapper, EntityClassNames } from "../Entity";
 import EntityAddButton from "../Entity/AddButton";
 import styled from "styled-components";
 import history from "utils/history";
-import { generateTemplateFormURL } from "RouteBuilder";
+import { generateTemplateFormURL } from "@appsmith/RouteBuilder";
 import { useParams } from "react-router";
 import { useDispatch } from "react-redux";
 import type { ExplorerURLParams } from "@appsmith/pages/Editor/Explorer/helpers";
@@ -40,12 +40,12 @@ const Wrapper = styled.div`
   }
 `;
 
-type SubMenuProps = {
+interface SubMenuProps {
   className: string;
   openMenu: boolean;
   onMenuClose: () => void;
   createPageCallback: () => void;
-};
+}
 
 function AddPageContextMenu({
   className,
diff --git a/app/client/src/pages/Editor/Explorer/Pages/PageEntity.tsx b/app/client/src/pages/Editor/Explorer/Pages/PageEntity.tsx
index e184b5a61e..30278059b6 100644
--- a/app/client/src/pages/Editor/Explorer/Pages/PageEntity.tsx
+++ b/app/client/src/pages/Editor/Explorer/Pages/PageEntity.tsx
@@ -2,11 +2,11 @@ import React from "react";
 import ExplorerWidgetGroup from "../Widgets/WidgetGroup";
 import Files from "../Files";
 
-type ExplorerPageEntityProps = {
+interface ExplorerPageEntityProps {
   step: number;
   searchKeyword?: string;
   showWidgetsSidebar: () => void;
-};
+}
 
 export function ExplorerPageEntity(props: ExplorerPageEntityProps) {
   return (
diff --git a/app/client/src/pages/Editor/Explorer/Pages/index.tsx b/app/client/src/pages/Editor/Explorer/Pages/index.tsx
index 65df2d0d5d..2cff6dfb1c 100644
--- a/app/client/src/pages/Editor/Explorer/Pages/index.tsx
+++ b/app/client/src/pages/Editor/Explorer/Pages/index.tsx
@@ -11,27 +11,23 @@ import {
   getCurrentApplicationId,
   getCurrentPageId,
 } from "selectors/editorSelectors";
-import Entity, { EntityClassNames } from "../Entity";
+import { EntityClassNames } from "../Entity";
 import history, { NavigationMethod } from "utils/history";
 import { createNewPageFromEntities, updatePage } from "actions/pageActions";
 import { defaultPageIcon, pageIcon } from "../ExplorerIcons";
 import { ADD_PAGE_TOOLTIP, createMessage } from "@appsmith/constants/messages";
 import type { Page } from "@appsmith/constants/ReduxActionConstants";
 import { getNextEntityName } from "utils/AppsmithUtils";
-import styled from "styled-components";
 import PageContextMenu from "./PageContextMenu";
 import { resolveAsSpaceChar } from "utils/helpers";
 import { getExplorerPinned } from "selectors/explorerSelector";
 import { setExplorerPinnedAction } from "actions/explorerActions";
 import { selectAllPages } from "@appsmith/selectors/entitiesSelector";
-import { builderURL } from "RouteBuilder";
+import { builderURL } from "@appsmith/RouteBuilder";
 import {
   getExplorerStatus,
   saveExplorerStatus,
 } from "@appsmith/pages/Editor/Explorer/helpers";
-import { tailwindLayers } from "constants/Layers";
-import type { CallbackResponseType } from "utils/hooks/useResize";
-import useResize, { DIRECTION } from "utils/hooks/useResize";
 import AddPageContextMenu from "./AddPageContextMenu";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import { useLocation } from "react-router";
@@ -45,45 +41,12 @@ import {
   getHasCreatePagePermission,
   getHasManagePagePermission,
 } from "@appsmith/utils/BusinessFeatures/permissionPageHelpers";
-
-const ENTITY_HEIGHT = 36;
-const MIN_PAGES_HEIGHT = 60;
-
-const StyledEntity = styled(Entity)<{ pagesSize?: number }>`
-  &.pages {
-    & > div:not(.t--entity-item) > div > div {
-      max-height: 40vh;
-      min-height: ${(props) =>
-        props.pagesSize && props.pagesSize > MIN_PAGES_HEIGHT
-          ? MIN_PAGES_HEIGHT
-          : props.pagesSize}px;
-      height: ${(props) =>
-        props.pagesSize && props.pagesSize > 128 ? 128 : props.pagesSize}px;
-      overflow-y: auto;
-    }
-  }
-
-  &.page .${EntityClassNames.PRE_RIGHT_ICON} {
-    width: 20px;
-    right: 0;
-  }
-
-  &.page:hover {
-    & .${EntityClassNames.PRE_RIGHT_ICON} {
-      display: none;
-    }
-  }
-`;
-
-const RelativeContainer = styled.div`
-  position: relative;
-`;
-
-const ResizeHandler = styled.div`
-  &:hover {
-    background-color: var(--ads-v2-color-border);
-  }
-`;
+import {
+  ENTITY_HEIGHT,
+  RelativeContainer,
+  StyledEntity,
+} from "../Common/components";
+import { EntityExplorerResizeHandler } from "../Common/EntityExplorerResizeHandler";
 
 function Pages() {
   const applicationId = useSelector(getCurrentApplicationId);
@@ -97,16 +60,6 @@ function Pages() {
   const storedHeight = localStorage.getItem(storedHeightKey);
   const location = useLocation();
 
-  const resizeAfterCallback = (data: CallbackResponseType) => {
-    localStorage.setItem(storedHeightKey, data.height.toString());
-  };
-
-  const { mouseDown, setMouseDown } = useResize(
-    pageResizeRef,
-    DIRECTION.vertical,
-    resizeAfterCallback,
-  );
-
   useEffect(() => {
     if ((isPagesOpen === null ? true : isPagesOpen) && pageResizeRef.current) {
       pageResizeRef.current.style.height = storedHeight + "px";
@@ -229,11 +182,11 @@ function Pages() {
   );
 
   return (
-    <RelativeContainer>
+    <RelativeContainer className="border-b pb-1">
       <StyledEntity
         addButtonHelptext={createMessage(ADD_PAGE_TOOLTIP)}
         alwaysShowRightIcon
-        className="p-3 pb-0 group pages"
+        className="pb-0 group pages"
         collapseRef={pageResizeRef}
         customAddButton={
           <AddPageContextMenu
@@ -244,6 +197,7 @@ function Pages() {
           />
         }
         entityId="Pages"
+        entitySize={ENTITY_HEIGHT * pages.length}
         icon={""}
         isDefaultExpanded={
           isPagesOpen === null || isPagesOpen === undefined ? true : isPagesOpen
@@ -251,23 +205,16 @@ function Pages() {
         name="Pages"
         onClickPreRightIcon={onPin}
         onToggle={onPageToggle}
-        pagesSize={ENTITY_HEIGHT * pages.length}
         searchKeyword={""}
         showAddButton={canCreatePages}
         step={0}
       >
         {pageElements}
       </StyledEntity>
-      <div
-        className={`absolute -bottom-2 left-0 w-full h-2 group cursor-ns-resize ${tailwindLayers.resizer}`}
-        onMouseDown={() => setMouseDown(true)}
-      >
-        <ResizeHandler
-          className={`w-full h-1 bg-transparent hover:bg-transparent transform transition
-          ${mouseDown ? "" : ""}
-          `}
-        />
-      </div>
+      <EntityExplorerResizeHandler
+        resizeRef={pageResizeRef}
+        storedHeightKey={storedHeightKey}
+      />
     </RelativeContainer>
   );
 }
diff --git a/app/client/src/pages/Editor/Explorer/TreeDropdown.tsx b/app/client/src/pages/Editor/Explorer/TreeDropdown.tsx
index 991b29a9eb..a60cd9fbc6 100644
--- a/app/client/src/pages/Editor/Explorer/TreeDropdown.tsx
+++ b/app/client/src/pages/Editor/Explorer/TreeDropdown.tsx
@@ -32,7 +32,7 @@ export type TreeDropdownOption = DropdownOption & {
 
 type Setter = (value: TreeDropdownOption, defaultVal?: string) => void;
 
-type TreeDropdownProps = {
+interface TreeDropdownProps {
   optionTree: TreeDropdownOption[];
   selectedValue: string;
   getDefaults?: (value: any) => any;
@@ -52,7 +52,7 @@ type TreeDropdownProps = {
   icon?: React.ReactNode;
   editorPage?: boolean;
   menuWidth?: number;
-};
+}
 
 export const StyledPopover = styled(Popover)<{
   children?: React.ReactNode;
diff --git a/app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx b/app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx
index fdb35922b7..e66d809e30 100644
--- a/app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx
+++ b/app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx
@@ -10,7 +10,7 @@ import { getLastSelectedWidget, getSelectedWidgets } from "selectors/ui";
 import { useNavigateToWidget } from "./useNavigateToWidget";
 import WidgetIcon from "./WidgetIcon";
 import AnalyticsUtil from "utils/AnalyticsUtil";
-import { builderURL } from "RouteBuilder";
+import { builderURL } from "@appsmith/RouteBuilder";
 import { useLocation } from "react-router";
 import { getPagePermissions } from "selectors/editorSelectors";
 import { NavigationMethod } from "utils/history";
@@ -60,7 +60,7 @@ const useWidget = (
   };
 };
 
-export type WidgetEntityProps = {
+export interface WidgetEntityProps {
   widgetId: string;
   widgetName: string;
   widgetType: WidgetType;
@@ -71,7 +71,7 @@ export type WidgetEntityProps = {
   searchKeyword?: string;
   isDefaultExpanded?: boolean;
   widgetsInStep: string[];
-};
+}
 
 export const WidgetEntity = memo((props: WidgetEntityProps) => {
   const widgetsToExpand = useSelector(getEntityExplorerWidgetsToExpand);
diff --git a/app/client/src/pages/Editor/Explorer/Widgets/WidgetGroup.tsx b/app/client/src/pages/Editor/Explorer/Widgets/WidgetGroup.tsx
index c9c4a82353..87599b5c41 100644
--- a/app/client/src/pages/Editor/Explorer/Widgets/WidgetGroup.tsx
+++ b/app/client/src/pages/Editor/Explorer/Widgets/WidgetGroup.tsx
@@ -27,11 +27,11 @@ import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
 import { getHasManagePagePermission } from "@appsmith/utils/BusinessFeatures/permissionPageHelpers";
 
-type ExplorerWidgetGroupProps = {
+interface ExplorerWidgetGroupProps {
   step: number;
   searchKeyword?: string;
   addWidgetsFn?: () => void;
-};
+}
 
 export const ExplorerWidgetGroup = memo((props: ExplorerWidgetGroupProps) => {
   const applicationId = useSelector(getCurrentApplicationId);
diff --git a/app/client/src/pages/Editor/Explorer/Widgets/utils.ts b/app/client/src/pages/Editor/Explorer/Widgets/utils.ts
index a1438a6f7d..bbe4395106 100644
--- a/app/client/src/pages/Editor/Explorer/Widgets/utils.ts
+++ b/app/client/src/pages/Editor/Explorer/Widgets/utils.ts
@@ -1,4 +1,4 @@
-import { builderURL } from "RouteBuilder";
+import { builderURL } from "@appsmith/RouteBuilder";
 import history from "utils/history";
 
 export const navigateToCanvas = (pageId: string) => {
diff --git a/app/client/src/pages/Editor/Explorer/hooks.ts b/app/client/src/pages/Editor/Explorer/hooks.ts
index c8a8ff5828..d0068e4bd8 100644
--- a/app/client/src/pages/Editor/Explorer/hooks.ts
+++ b/app/client/src/pages/Editor/Explorer/hooks.ts
@@ -123,15 +123,17 @@ export const useAppWideAndOtherDatasource = () => {
   const otherDatasourceInWorkspace = useOtherDatasourcesInWorkspace();
   const appWideDS = useMemo(
     () =>
-      [...datasourcesUsedInApplication].sort((ds1, ds2) =>
-        ds1.name?.toLowerCase()?.localeCompare(ds2.name?.toLowerCase()),
+      [...datasourcesUsedInApplication].sort(
+        (ds1, ds2) =>
+          ds1.name?.toLowerCase()?.localeCompare(ds2.name?.toLowerCase()),
       ),
     [datasourcesUsedInApplication],
   );
   const otherDS = useMemo(
     () =>
-      [...otherDatasourceInWorkspace].sort((ds1, ds2) =>
-        ds1.name?.toLowerCase()?.localeCompare(ds2.name?.toLowerCase()),
+      [...otherDatasourceInWorkspace].sort(
+        (ds1, ds2) =>
+          ds1.name?.toLowerCase()?.localeCompare(ds2.name?.toLowerCase()),
       ),
     [otherDatasourceInWorkspace],
   );
@@ -249,8 +251,9 @@ export const usePageIds = (searchKeyword?: string) => {
 };
 
 export const useEntityUpdateState = (entityId: string) => {
-  return useSelector((state: AppState) =>
-    get(state, "ui.explorer.entity.updatingEntity")?.includes(entityId),
+  return useSelector(
+    (state: AppState) =>
+      get(state, "ui.explorer.entity.updatingEntity")?.includes(entityId),
   );
 };
 
diff --git a/app/client/src/pages/Editor/Explorer/index.tsx b/app/client/src/pages/Editor/Explorer/index.tsx
index 8e11e960a7..716f6ef166 100644
--- a/app/client/src/pages/Editor/Explorer/index.tsx
+++ b/app/client/src/pages/Editor/Explorer/index.tsx
@@ -2,11 +2,10 @@ import React, { useContext, useEffect } from "react";
 import { toggleInOnboardingWidgetSelection } from "actions/onboardingActions";
 import { forceOpenWidgetPanel } from "actions/widgetSidebarActions";
 import { SegmentedControl } from "design-system";
-import { tailwindLayers } from "constants/Layers";
 import { useDispatch, useSelector } from "react-redux";
 import { useLocation } from "react-router";
 import type { AppState } from "@appsmith/reducers";
-import { builderURL } from "RouteBuilder";
+import { builderURL } from "@appsmith/RouteBuilder";
 import { getCurrentPageId } from "selectors/editorSelectors";
 import { getIsFirstTimeUserOnboardingEnabled } from "selectors/onboardingSelectors";
 import AnalyticsUtil from "utils/AnalyticsUtil";
@@ -25,6 +24,7 @@ import {
   widgetsExistCurrentPage,
 } from "@appsmith/selectors/entitiesSelector";
 import { SignpostingWalkthroughConfig } from "../FirstTimeUserOnboarding/Utils";
+import { ExplorerWrapper } from "./Common/ExplorerWrapper";
 
 const selectForceOpenWidgetPanel = (state: AppState) =>
   state.ui.onBoarding.forceOpenWidgetPanel;
@@ -91,6 +91,7 @@ function ExplorerContent() {
     popFeature,
     pushFeature,
   } = useContext(WalkthroughContext) || {};
+
   const handleCloseWalkthrough = () => {
     if (isWalkthroughOpened && popFeature) {
       popFeature();
@@ -128,11 +129,9 @@ function ExplorerContent() {
   ]);
 
   return (
-    <div
-      className={`flex-1 flex flex-col overflow-hidden ${tailwindLayers.entityExplorer}`}
-    >
+    <ExplorerWrapper>
       <div
-        className="flex-shrink-0 p-3 pb-2 mt-1 border-t"
+        className="flex-shrink-0 p-3 pb-2"
         data-testid="explorer-tab-options"
         id="explorer-tab-options"
       >
@@ -146,7 +145,7 @@ function ExplorerContent() {
       <WidgetSidebarWithTags isActive={activeOption === "widgets"} />
 
       <EntityExplorer isActive={activeOption === "explorer"} />
-    </div>
+    </ExplorerWrapper>
   );
 }
 
diff --git a/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.test.tsx b/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.test.tsx
index c3c775b98c..0f594240ec 100644
--- a/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.test.tsx
+++ b/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.test.tsx
@@ -2,7 +2,7 @@ const history = jest.fn();
 const dispatch = jest.fn();
 
 import { bindDataOnCanvas } from "actions/pluginActionActions";
-import { builderURL, integrationEditorURL } from "RouteBuilder";
+import { builderURL, integrationEditorURL } from "@appsmith/RouteBuilder";
 import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 import { INTEGRATION_TABS } from "constants/routes";
 import React from "react";
@@ -10,7 +10,7 @@ import { Provider } from "react-redux";
 import { fireEvent, render, screen } from "test/testUtils";
 import OnboardingChecklist from "./Checklist";
 import { getStore, initialState } from "./testUtils";
-import urlBuilder from "entities/URLRedirect/URLAssembly";
+import urlBuilder from "@appsmith/entities/URLRedirect/URLAssembly";
 import "@testing-library/jest-dom";
 import * as onboardingSelectors from "selectors/onboardingSelectors";
 
diff --git a/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx b/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx
index 3a08512878..c82ab6a603 100644
--- a/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx
+++ b/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx
@@ -47,7 +47,7 @@ import type { Datasource } from "entities/Datasource";
 import type { ActionDataState } from "@appsmith/reducers/entityReducers/actionsReducer";
 import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
 import { SIGNPOSTING_STEP, SignpostingWalkthroughConfig } from "./Utils";
-import { builderURL, integrationEditorURL } from "RouteBuilder";
+import { builderURL, integrationEditorURL } from "@appsmith/RouteBuilder";
 import { DatasourceCreateEntryPoints } from "constants/Datasource";
 import classNames from "classnames";
 import lazyLottie from "utils/lazyLottie";
diff --git a/app/client/src/pages/Editor/FirstTimeUserOnboarding/HelpMenu.tsx b/app/client/src/pages/Editor/FirstTimeUserOnboarding/HelpMenu.tsx
index 4984182786..42c9b327fe 100644
--- a/app/client/src/pages/Editor/FirstTimeUserOnboarding/HelpMenu.tsx
+++ b/app/client/src/pages/Editor/FirstTimeUserOnboarding/HelpMenu.tsx
@@ -16,12 +16,12 @@ import AnalyticsUtil from "utils/AnalyticsUtil";
 import { DOCS_BASE_URL } from "constants/ThirdPartyConstants";
 const { appVersion, cloudHosting, intercomAppID } = getAppsmithConfigs();
 
-type HelpItem = {
+interface HelpItem {
   label: string;
   link?: string;
   id?: string;
   icon: string;
-};
+}
 const HELP_MENU_ITEMS: HelpItem[] = [
   {
     icon: "book-line",
@@ -78,7 +78,7 @@ function HelpMenu(props: {
           >
             Help & Resources
           </Text>
-          <div className="flex gap-2 flex-wrap mt-2">
+          <div className="flex flex-wrap gap-2 mt-2">
             <Button
               data-testid="editor-welcome-tour"
               kind="secondary"
@@ -126,7 +126,6 @@ function HelpMenu(props: {
               APPSMITH_DISPLAY_VERSION,
               appVersion.edition,
               appVersion.id,
-              cloudHosting,
             )}
           </StyledText>
           <StyledText color="var(--ads-v2-color-fg-muted)" kind={"action-s"}>
diff --git a/app/client/src/pages/Editor/GeneratePage/components/CrudInfoModal.tsx b/app/client/src/pages/Editor/GeneratePage/components/CrudInfoModal.tsx
index 4922abd613..fb9670a87e 100644
--- a/app/client/src/pages/Editor/GeneratePage/components/CrudInfoModal.tsx
+++ b/app/client/src/pages/Editor/GeneratePage/components/CrudInfoModal.tsx
@@ -28,10 +28,10 @@ import {
 import SuccessTick from "pages/common/SuccessTick";
 import { getAssetUrl } from "@appsmith/utils/airgapHelpers";
 
-type Props = {
+interface Props {
   crudInfoModalOpen: boolean;
   generateCRUDSuccessInfo: GenerateCRUDSuccessInfoData | null;
-};
+}
 
 const Content = styled.div`
   display: flex;
diff --git a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx
index 93d2477c79..a6b183636a 100644
--- a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx
+++ b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx
@@ -23,7 +23,7 @@ import DataSourceOption, {
   CONNECT_NEW_DATASOURCE_OPTION_ID,
   DatasourceImage,
 } from "../DataSourceOption";
-import { getQueryStringfromObject } from "RouteBuilder";
+import { getQueryStringfromObject } from "@appsmith/entities/URLRedirect/URLAssembly";
 import type { DropdownOption } from "design-system-old";
 import { Button, Icon, Text, Select, Option, Tooltip } from "design-system";
 import GoogleSheetForm from "./GoogleSheetForm";
@@ -56,7 +56,10 @@ import { Bold, Label, SelectWrapper } from "./styles";
 import type { GeneratePagePayload } from "./types";
 import { getCurrentApplicationId } from "selectors/editorSelectors";
 
-import { datasourcesEditorIdURL, integrationEditorURL } from "RouteBuilder";
+import {
+  datasourcesEditorIdURL,
+  integrationEditorURL,
+} from "@appsmith/RouteBuilder";
 import { PluginPackageName } from "entities/Action";
 import { getCurrentAppWorkspace } from "@appsmith/selectors/workspaceSelectors";
 import { getPluginImages } from "@appsmith/selectors/entitiesSelector";
diff --git a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GoogleSheetForm.tsx b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GoogleSheetForm.tsx
index ebfbbc9f51..701929e765 100644
--- a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GoogleSheetForm.tsx
+++ b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GoogleSheetForm.tsx
@@ -25,7 +25,7 @@ import {
 } from "@appsmith/constants/messages";
 import { Icon, Option, Select, Input, Tooltip } from "design-system";
 
-type Props = {
+interface Props {
   googleSheetPluginId: string;
   selectedDatasource: DropdownOption;
   selectedSpreadsheet: DropdownOption;
@@ -42,7 +42,7 @@ type Props = {
   sheetsListProps: UseSheetListReturn;
   spreadSheetsProps: UseSpreadSheetsReturn;
   sheetColumnsHeaderProps: UseSheetColumnHeadersReturn;
-};
+}
 
 // styles
 
diff --git a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/hooks.ts b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/hooks.ts
index 2a76a2bc53..30aff49151 100644
--- a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/hooks.ts
+++ b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/hooks.ts
@@ -109,20 +109,20 @@ export const useDatasourceOptions = ({
 //   deleteFormat: "SHEET",
 // };
 
-type FetchAllSpreadSheets = {
+interface FetchAllSpreadSheets {
   selectedDatasourceId: string;
   pluginId: string;
   requestObject?: Record<any, string>;
-};
+}
 
-export type UseSpreadSheetsReturn = {
+export interface UseSpreadSheetsReturn {
   fetchAllSpreadsheets: ({
     requestObject,
     selectedDatasourceId,
   }: FetchAllSpreadSheets) => void;
   isFetchingSpreadsheets: boolean;
   failedFetchingSpreadsheets: boolean;
-};
+}
 
 export const useSpreadSheets = ({
   setSelectedDatasourceIsInvalid,
@@ -234,22 +234,22 @@ export type Sheets = Sheet[];
 export const getSheetUrl = (sheetId: string): string =>
   `https://docs.google.com/spreadsheets/d/${sheetId}/edit#gid=0`;
 
-export type FetchSheetsList = {
+export interface FetchSheetsList {
   selectedDatasourceId: string;
   selectedSpreadsheetUrl: string;
   pluginId: string;
   requestObject?: Record<any, string>;
-};
+}
 
-export type FetchSheetData = {
+export interface FetchSheetData {
   selectedDatasourceId: string;
   selectedSpreadsheetUrl: string;
   selectedSheetName: string;
   pluginId: string;
   requestObject?: Record<any, string>;
-};
+}
 
-export type UseSheetListReturn = {
+export interface UseSheetListReturn {
   sheetsList: DropdownOption[];
   isFetchingSheetsList: boolean;
   failedFetchingSheetsList: boolean;
@@ -258,9 +258,9 @@ export type UseSheetListReturn = {
     selectedDatasourceId,
     selectedSpreadsheetUrl,
   }: FetchSheetsList) => void;
-};
+}
 
-export type UseSheetDataReturn = {
+export interface UseSheetDataReturn {
   sheetData: Array<any>;
   isFetchingSheetData: boolean;
   failedFetchingSheetData: boolean;
@@ -270,7 +270,7 @@ export type UseSheetDataReturn = {
     selectedSheetName,
     selectedSpreadsheetUrl,
   }: FetchSheetData) => void;
-};
+}
 
 export const useSheetsList = (): UseSheetListReturn => {
   const dispatch = useDispatch();
@@ -439,16 +439,16 @@ export const useSheetData = (): UseSheetDataReturn => {
   };
 };
 
-export type FetchColumnHeaderListParams = {
+export interface FetchColumnHeaderListParams {
   selectedDatasourceId: string;
   selectedSpreadsheetUrl: string;
   sheetName: string;
   pluginId: string;
   tableHeaderIndex: string;
   requestObject?: Record<any, string>; //possily unneccesary
-};
+}
 
-export type UseSheetColumnHeadersReturn = {
+export interface UseSheetColumnHeadersReturn {
   columnHeaderList: DropdownOption[];
   isFetchingColumnHeaderList: boolean;
   errorFetchingColumnHeaderList: string;
@@ -458,7 +458,7 @@ export type UseSheetColumnHeadersReturn = {
     sheetName,
     tableHeaderIndex,
   }: FetchColumnHeaderListParams) => void;
-};
+}
 
 export const useSheetColumnHeaders = () => {
   const dispatch = useDispatch();
diff --git a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/types.ts b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/types.ts
index a57f200be9..d3d177d21e 100644
--- a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/types.ts
+++ b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/types.ts
@@ -1,6 +1,6 @@
-export type GeneratePagePayload = {
+export interface GeneratePagePayload {
   tableName: string;
   columns?: string[];
   searchColumn?: string;
   pluginSpecificParams?: Record<any, any>;
-};
+}
diff --git a/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.tsx b/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.tsx
index 04268b0a13..c713735888 100644
--- a/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.tsx
+++ b/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.tsx
@@ -50,7 +50,7 @@ import { showDebuggerFlag } from "selectors/debuggerSelectors";
 import { getIsFirstTimeUserOnboardingEnabled } from "selectors/onboardingSelectors";
 import WalkthroughContext from "components/featureWalkthrough/walkthroughContext";
 
-type Props = {
+interface Props {
   copySelectedWidget: () => void;
   pasteCopiedWidget: (mouseLocation: { x: number; y: number }) => void;
   deleteSelectedWidget: () => void;
@@ -79,7 +79,7 @@ type Props = {
   showCommitModal: () => void;
   getMousePosition: () => { x: number; y: number };
   hideInstaller: () => void;
-};
+}
 
 @HotkeysTarget
 class GlobalHotKeys extends React.Component<Props> {
diff --git a/app/client/src/pages/Editor/GuidedTour/Boxed.tsx b/app/client/src/pages/Editor/GuidedTour/Boxed.tsx
index 0563230e0e..ef25ea334e 100644
--- a/app/client/src/pages/Editor/GuidedTour/Boxed.tsx
+++ b/app/client/src/pages/Editor/GuidedTour/Boxed.tsx
@@ -7,13 +7,13 @@ import {
   inGuidedTour,
 } from "selectors/onboardingSelectors";
 
-type BoxedProps = {
+interface BoxedProps {
   alternative?: JSX.Element;
   children: ReactNode;
   step: number;
   // under which condition do you want to show an alternative or nothing(meaning hide)
   show: boolean;
-};
+}
 
 // Boxed(or hidden).
 function Boxed(props: BoxedProps): JSX.Element | null {
diff --git a/app/client/src/pages/Editor/GuidedTour/Guide.tsx b/app/client/src/pages/Editor/GuidedTour/Guide.tsx
index ee5cb493ca..db3e44dd12 100644
--- a/app/client/src/pages/Editor/GuidedTour/Guide.tsx
+++ b/app/client/src/pages/Editor/GuidedTour/Guide.tsx
@@ -323,10 +323,10 @@ function GuideStepsContent(props: {
   );
 }
 
-type CompletionContentProps = {
+interface CompletionContentProps {
   step: number;
   showInfoMessage: boolean;
-};
+}
 
 function CompletionContent(props: CompletionContentProps) {
   const [showSuccess, setShowSuccess] = useState(!props.showInfoMessage);
@@ -421,11 +421,11 @@ function CompletionContent(props: CompletionContentProps) {
   }
 }
 
-export type GuideBody = {
+export interface GuideBody {
   exploring: boolean;
   step: number;
   showInfoMessage: boolean;
-};
+}
 
 function GuideBody(props: GuideBody) {
   const successMessage = useSelector(showSuccessMessage);
@@ -449,9 +449,9 @@ function GuideBody(props: GuideBody) {
   }
 }
 
-type GuideProps = {
+interface GuideProps {
   className?: string;
-};
+}
 // Guided tour steps
 function Guide(props: GuideProps) {
   const exploring = useSelector(isExploringSelector);
diff --git a/app/client/src/pages/Editor/GuidedTour/constants.tsx b/app/client/src/pages/Editor/GuidedTour/constants.tsx
index 7f45cef1ca..c3a75de3ee 100644
--- a/app/client/src/pages/Editor/GuidedTour/constants.tsx
+++ b/app/client/src/pages/Editor/GuidedTour/constants.tsx
@@ -229,7 +229,7 @@ export const onboardingContainerBlueprint = {
   ],
 };
 
-type Step = {
+interface Step {
   title: string;
   description?: string;
   elementSelector?: string;
@@ -254,7 +254,7 @@ type Step = {
     onClick: (dispatch: Dispatch<any>) => void;
     buttonText?: string;
   };
-};
+}
 type StepsType = Record<number, Step>;
 
 export const Steps: StepsType = {
diff --git a/app/client/src/pages/Editor/HelpBarInHeader.tsx b/app/client/src/pages/Editor/HelpBarInHeader.tsx
new file mode 100644
index 0000000000..ff7f169bc0
--- /dev/null
+++ b/app/client/src/pages/Editor/HelpBarInHeader.tsx
@@ -0,0 +1,23 @@
+import React from "react";
+import classNames from "classnames";
+import HelpBar from "components/editorComponents/GlobalSearch/HelpBar";
+import { HeaderSection } from "./commons/EditorHeaderComponents";
+
+export const HelperBarInHeader = ({
+  isPreviewMode = false,
+}: {
+  isPreviewMode?: boolean;
+}) => {
+  return (
+    <HeaderSection
+      className={classNames({
+        "-translate-y-full opacity-0": isPreviewMode,
+        "translate-y-0 opacity-100": !isPreviewMode,
+        "transition-all transform duration-400": true,
+        "help-bar": "true",
+      })}
+    >
+      <HelpBar />
+    </HeaderSection>
+  );
+};
diff --git a/app/client/src/pages/Editor/HelpButton.tsx b/app/client/src/pages/Editor/HelpButton.tsx
index 2700500469..5f4b2ba6a6 100644
--- a/app/client/src/pages/Editor/HelpButton.tsx
+++ b/app/client/src/pages/Editor/HelpButton.tsx
@@ -68,12 +68,12 @@ const ActionsRow = styled.div`
   margin-bottom: 8px;
 `;
 
-type HelpItem = {
+interface HelpItem {
   label: string;
   link?: string;
   id?: string;
   icon: string;
-};
+}
 
 const HELP_MENU_ITEMS: HelpItem[] = [
   {
@@ -299,7 +299,6 @@ function HelpButton() {
                       APPSMITH_DISPLAY_VERSION,
                       appVersion.edition,
                       appVersion.id,
-                      cloudHosting,
                     )}
                   </span>
                   <span>
diff --git a/app/client/src/pages/Editor/IntegrationEditor/ActiveDataSources.tsx b/app/client/src/pages/Editor/IntegrationEditor/ActiveDataSources.tsx
index c13f574dc0..9aee10841e 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/ActiveDataSources.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/ActiveDataSources.tsx
@@ -40,7 +40,7 @@ const EmptyActiveDatasource = styled.div`
   gap: 1rem;
 `;
 
-type ActiveDataSourcesProps = {
+interface ActiveDataSourcesProps {
   dataSources: Datasource[];
   pageId: string;
   location: {
@@ -51,7 +51,7 @@ type ActiveDataSourcesProps = {
     push: (data: string) => void;
   };
   onCreateNew: () => void;
-};
+}
 
 function ActiveDataSources(props: ActiveDataSourcesProps) {
   const { dataSources } = props;
diff --git a/app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx b/app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx
index 9ed3ccb628..b10ea63310 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx
@@ -23,7 +23,7 @@ import {
   datasourcesEditorIdURL,
   generateTemplateFormURL,
   saasEditorDatasourceIdURL,
-} from "RouteBuilder";
+} from "@appsmith/RouteBuilder";
 import {
   CONTEXT_DELETE,
   CONFIRM_CONTEXT_DELETE,
@@ -135,10 +135,10 @@ const CollapseComponentWrapper = styled.div`
   width: fit-content;
 `;
 
-type DatasourceCardProps = {
+interface DatasourceCardProps {
   datasource: Datasource;
   plugin: Plugin;
-};
+}
 
 function DatasourceCard(props: DatasourceCardProps) {
   const dispatch = useDispatch();
diff --git a/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx b/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx
index 886f9878ee..3f715ddc99 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx
@@ -25,7 +25,7 @@ import UnsupportedPluginDialog from "./UnsupportedPluginDialog";
 import { getQueryParams } from "utils/URLUtils";
 import { getIsGeneratePageInitiator } from "utils/GenerateCrudUtil";
 import { getCurrentApplicationId } from "selectors/editorSelectors";
-import { integrationEditorURL } from "RouteBuilder";
+import { integrationEditorURL } from "@appsmith/RouteBuilder";
 import { getCurrentAppWorkspace } from "@appsmith/selectors/workspaceSelectors";
 
 import { Tab, TabPanel, Tabs, TabsList } from "design-system";
@@ -99,7 +99,7 @@ const NewIntegrationsContainer = styled.div`
   }
 `;
 
-type IntegrationsHomeScreenProps = {
+interface IntegrationsHomeScreenProps {
   pageId: string;
   selectedTab: string;
   location: {
@@ -116,14 +116,14 @@ type IntegrationsHomeScreenProps = {
   applicationId: string;
   canCreateDatasource?: boolean;
   showDebugger: boolean;
-};
+}
 
-type IntegrationsHomeScreenState = {
+interface IntegrationsHomeScreenState {
   page: number;
   activePrimaryMenuId: string;
   activeSecondaryMenuId: number;
   unsupportedPluginDialogVisible: boolean;
-};
+}
 
 type Props = IntegrationsHomeScreenProps &
   InjectedFormProps<{ category: string }, IntegrationsHomeScreenProps>;
diff --git a/app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx b/app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx
index 3acad070a4..479f0060e9 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx
@@ -87,10 +87,10 @@ const DatasourceNameWrapper = styled.div`
   flex-direction: column;
 `;
 
-type MockDatasourceCardProps = {
+interface MockDatasourceCardProps {
   datasource: MockDatasource;
   workspaceId: string;
-};
+}
 
 function MockDatasourceCard(props: MockDatasourceCardProps) {
   const { datasource, workspaceId } = props;
diff --git a/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx b/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx
index 0a5f3a0de8..40678b8df1 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx
@@ -17,7 +17,7 @@ import { PluginPackageName, PluginType } from "entities/Action";
 import { getQueryParams } from "utils/URLUtils";
 import { getGenerateCRUDEnabledPluginMap } from "@appsmith/selectors/entitiesSelector";
 import { getIsGeneratePageInitiator } from "utils/GenerateCrudUtil";
-import { curlImportPageURL } from "RouteBuilder";
+import { curlImportPageURL } from "@appsmith/RouteBuilder";
 import { getAssetUrl } from "@appsmith/utils/airgapHelpers";
 import { Spinner } from "design-system";
 
@@ -117,7 +117,7 @@ const CardContentWrapper = styled.div`
   padding-left: 13.5px;
 `;
 
-type ApiHomeScreenProps = {
+interface ApiHomeScreenProps {
   createNewApiAction: (
     pageId: string,
     from: EventLocation,
@@ -137,7 +137,7 @@ type ApiHomeScreenProps = {
   showUnsupportedPluginDialog: (callback: any) => void;
   createTempDatasourceFromForm: (data: any) => void;
   showSaasAPIs: boolean; // If this is true, only SaaS APIs will be shown
-};
+}
 
 type Props = ApiHomeScreenProps;
 
diff --git a/app/client/src/pages/Editor/IntegrationEditor/NewQuery.tsx b/app/client/src/pages/Editor/IntegrationEditor/NewQuery.tsx
index 4598422bfc..93aa709633 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/NewQuery.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/NewQuery.tsx
@@ -13,7 +13,7 @@ const QueryHomePage = styled.div`
   }
 `;
 
-type QueryHomeScreenProps = {
+interface QueryHomeScreenProps {
   pageId: string;
   isCreating: boolean;
   location: {
@@ -24,7 +24,7 @@ type QueryHomeScreenProps = {
     push: (data: string) => void;
   };
   showUnsupportedPluginDialog: (callback: any) => void;
-};
+}
 
 class QueryHomeScreen extends React.Component<QueryHomeScreenProps> {
   render() {
diff --git a/app/client/src/pages/Editor/IntegrationEditor/UnsupportedPluginDialog.tsx b/app/client/src/pages/Editor/IntegrationEditor/UnsupportedPluginDialog.tsx
index 4eda24d7db..3f11764083 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/UnsupportedPluginDialog.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/UnsupportedPluginDialog.tsx
@@ -15,11 +15,11 @@ import {
   UNSUPPORTED_PLUGIN_DIALOG_SUBTITLE,
 } from "@appsmith/constants/messages";
 
-type Props = {
+interface Props {
   isModalOpen: boolean;
   onClose: () => void;
   onContinue: () => void;
-};
+}
 
 // Unsupported Plugin for gen CRUD page
 function UnsupportedPluginDialog(props: Props) {
diff --git a/app/client/src/pages/Editor/JSEditor/Form.tsx b/app/client/src/pages/Editor/JSEditor/Form.tsx
index eb5674b906..468e065f6c 100644
--- a/app/client/src/pages/Editor/JSEditor/Form.tsx
+++ b/app/client/src/pages/Editor/JSEditor/Form.tsx
@@ -373,6 +373,7 @@ function JSEditorForm({ jsCollection: currentJSCollection }: Props) {
                     <TabPanel value={JSEditorTab.CODE}>
                       <div className="js-editor-tab">
                         <LazyCodeEditor
+                          AIAssisted
                           blockCompletions={blockCompletions}
                           border={CodeEditorBorder.NONE}
                           borderLess
diff --git a/app/client/src/pages/Editor/JSEditor/JSFunctionRun.tsx b/app/client/src/pages/Editor/JSEditor/JSFunctionRun.tsx
index 45b031a1c7..e87679fa20 100644
--- a/app/client/src/pages/Editor/JSEditor/JSFunctionRun.tsx
+++ b/app/client/src/pages/Editor/JSEditor/JSFunctionRun.tsx
@@ -10,7 +10,7 @@ import {
 import type { JSActionDropdownOption } from "./utils";
 import { RUN_BUTTON_DEFAULTS, testLocators } from "./constants";
 
-type Props = {
+interface Props {
   disabled: boolean;
   isLoading: boolean;
   jsCollection: JSCollection;
@@ -19,11 +19,11 @@ type Props = {
   options: JSActionDropdownOption[];
   selected: JSActionDropdownOption;
   showTooltip: boolean;
-};
+}
 
-export type DropdownWithCTAWrapperProps = {
+export interface DropdownWithCTAWrapperProps {
   isDisabled: boolean;
-};
+}
 
 const DropdownWithCTAWrapper = styled.div<DropdownWithCTAWrapperProps>`
   display: flex;
diff --git a/app/client/src/pages/Editor/JSEditor/JSFunctionSettings.tsx b/app/client/src/pages/Editor/JSEditor/JSFunctionSettings.tsx
index 8ccb5eb120..fab2cdcaa8 100644
--- a/app/client/src/pages/Editor/JSEditor/JSFunctionSettings.tsx
+++ b/app/client/src/pages/Editor/JSEditor/JSFunctionSettings.tsx
@@ -12,22 +12,22 @@ import { RADIO_OPTIONS, SETTINGS_HEADINGS } from "./constants";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import { Icon, Radio, RadioGroup, Tooltip } from "design-system";
 
-type SettingsHeadingProps = {
+interface SettingsHeadingProps {
   text: string;
   hasInfo?: boolean;
   info?: string;
   grow: boolean;
-};
+}
 
-type SettingsItemProps = {
+interface SettingsItemProps {
   action: JSAction;
   disabled?: boolean;
-};
+}
 
-type JSFunctionSettingsProps = {
+interface JSFunctionSettingsProps {
   actions: JSAction[];
   disabled?: boolean;
-};
+}
 
 const SettingRow = styled.div<{ isHeading?: boolean; noBorder?: boolean }>`
   display: flex;
diff --git a/app/client/src/pages/Editor/JSEditor/JSObjectHotKeys.tsx b/app/client/src/pages/Editor/JSEditor/JSObjectHotKeys.tsx
index 5aae8de46a..0ea77b166b 100644
--- a/app/client/src/pages/Editor/JSEditor/JSObjectHotKeys.tsx
+++ b/app/client/src/pages/Editor/JSEditor/JSObjectHotKeys.tsx
@@ -2,10 +2,10 @@ import React from "react";
 import { Hotkey, Hotkeys, HotkeysTarget } from "@blueprintjs/core";
 import { JS_OBJECT_HOTKEYS_CLASSNAME } from "./constants";
 
-type Props = {
+interface Props {
   runActiveJSFunction: (e: KeyboardEvent) => void;
   children: React.ReactNode;
-};
+}
 
 @HotkeysTarget
 class JSObjectHotKeys extends React.Component<Props> {
diff --git a/app/client/src/pages/Editor/JSEditor/JSObjectNameEditor.tsx b/app/client/src/pages/Editor/JSEditor/JSObjectNameEditor.tsx
index 2030faf6ff..320863f08f 100644
--- a/app/client/src/pages/Editor/JSEditor/JSObjectNameEditor.tsx
+++ b/app/client/src/pages/Editor/JSEditor/JSObjectNameEditor.tsx
@@ -48,7 +48,7 @@ const JSObjectNameWrapper = styled.div<{ page?: string }>`
       : null}
 `;
 
-type JSObjectNameEditorProps = {
+interface JSObjectNameEditorProps {
   /*
     This prop checks if page is API Pane or Query Pane or Curl Pane
     So, that we can toggle between ads editable-text component and existing editable-text component
@@ -57,7 +57,7 @@ type JSObjectNameEditorProps = {
   */
   page?: string;
   disabled?: boolean;
-};
+}
 
 const IconContainer = styled.div`
   height: 34px;
diff --git a/app/client/src/pages/Editor/JSEditor/utils.ts b/app/client/src/pages/Editor/JSEditor/utils.ts
index 767247a921..112b6cfbf1 100644
--- a/app/client/src/pages/Editor/JSEditor/utils.ts
+++ b/app/client/src/pages/Editor/JSEditor/utils.ts
@@ -19,6 +19,8 @@ import {
   SourceType,
 } from "@shared/ast";
 import type { EventLocation } from "@appsmith/utils/analyticsUtilTypes";
+import log from "loglevel";
+import type CodeMirror from "codemirror";
 
 export interface JSActionDropdownOption extends DropdownOption {
   data: JSAction | null;
@@ -45,6 +47,49 @@ export const isCursorWithinNode = (
 const getNameFromPropertyNode = (node: PropertyNode): string =>
   isLiteralNode(node.key) ? String(node.key.value) : node.key.name;
 
+export const getJSFunctionLocationFromCursor = (
+  code: string,
+  currentCursor: CodeMirror.Position,
+): {
+  cursorLineNumber: number;
+  functionString: string;
+  functionName: string;
+} => {
+  let functionString = "";
+  let cursorLineNumber = 0;
+  let functionName = "";
+
+  try {
+    const ast = getAST(code, SourceType.module);
+
+    ancestor(ast, {
+      Property(node, ancestors: Node[]) {
+        // We are only interested in identifiers at this depth (exported object keys)
+        const depth = ancestors.length - 3;
+        if (
+          isPropertyNode(node) &&
+          (node.value.type === NodeTypes.ArrowFunctionExpression ||
+            node.value.type === NodeTypes.FunctionExpression) &&
+          node.loc &&
+          isCursorWithinNode(node.loc, currentCursor.line + 1) &&
+          ancestors[depth] &&
+          ancestors[depth].type === NodeTypes.ExportDefaultDeclaration
+        ) {
+          functionString = code.slice(node.start, node.end);
+          // +1 for adjusting the 0 based and 1 based line numbers
+          // +1 for counting the function name line, therefor we need to add +2
+          cursorLineNumber = currentCursor.line - node.loc.start.line + 2;
+          functionName = getNameFromPropertyNode(node);
+        }
+      },
+    });
+  } catch (e) {
+    log.error(e);
+  }
+
+  return { cursorLineNumber, functionName, functionString };
+};
+
 // Function to get start line of js function from code, returns null if function not found
 export const getJSFunctionStartLineFromCode = (
   code: string,
diff --git a/app/client/src/pages/Editor/NavigationSettings/LogoInput.tsx b/app/client/src/pages/Editor/NavigationSettings/LogoInput.tsx
index 4105fc5c4e..3bd42699c5 100644
--- a/app/client/src/pages/Editor/NavigationSettings/LogoInput.tsx
+++ b/app/client/src/pages/Editor/NavigationSettings/LogoInput.tsx
@@ -19,10 +19,10 @@ import { getTenantConfig } from "@appsmith/selectors/tenantSelectors";
 import { getAppsmithConfigs } from "@appsmith/configs";
 import { DeleteLogoButton } from "@appsmith/pages/Editor/NavigationSettings/DeleteLogoButton";
 
-export type ButtonGroupSettingProps = {
+export interface ButtonGroupSettingProps {
   updateSetting: UpdateSetting;
   navigationSetting: NavigationSetting;
-};
+}
 
 export const { cloudHosting } = getAppsmithConfigs();
 
diff --git a/app/client/src/pages/Editor/Popper.tsx b/app/client/src/pages/Editor/Popper.tsx
index 4a94460835..e6aa61c6ed 100644
--- a/app/client/src/pages/Editor/Popper.tsx
+++ b/app/client/src/pages/Editor/Popper.tsx
@@ -9,7 +9,7 @@ import styled, { ThemeProvider } from "styled-components";
 import { generateReactKey } from "utils/generators";
 import { draggableElement } from "./utils";
 
-export type PopperProps = {
+export interface PopperProps {
   boundaryParent?: Element | PopperJS.Boundary;
   parentElement?: Element | null;
   zIndex: number;
@@ -43,7 +43,7 @@ export type PopperProps = {
   customParent?: Element | undefined;
   editorRef?: React.RefObject<HTMLDivElement>;
   // DraggableNode?: any;
-};
+}
 
 const PopperWrapper = styled.div<{ zIndex: number; borderRadius?: string }>`
   z-index: ${(props) => props.zIndex};
@@ -75,7 +75,9 @@ const DragHandleBlock = styled.div`
   }
 `;
 
-type PopperDragHandleProps = { dragFn?: (val: boolean) => void };
+interface PopperDragHandleProps {
+  dragFn?: (val: boolean) => void;
+}
 
 /* eslint-disable react/display-name */
 export default (props: PopperProps) => {
@@ -104,14 +106,14 @@ export default (props: PopperProps) => {
 
   const {
     boundaryParent = "viewport",
-    isDraggable = false,
+    cypressSelectorDragHandle,
     disablePopperEvents = false,
+    isDraggable = false,
+    onPositionChange = onPositionChangeFn,
     position,
     renderDragBlock,
-    onPositionChange = onPositionChangeFn,
-    themeMode = props.themeMode || ThemeMode.LIGHT,
     renderDragBlockPositions,
-    cypressSelectorDragHandle,
+    themeMode = props.themeMode || ThemeMode.LIGHT,
   } = props;
 
   // Memoizing to avoid rerender of draggable icon.
diff --git a/app/client/src/pages/Editor/PropertyPane/ConnectDataCTA.tsx b/app/client/src/pages/Editor/PropertyPane/ConnectDataCTA.tsx
index 11a862a051..38dd36c546 100644
--- a/app/client/src/pages/Editor/PropertyPane/ConnectDataCTA.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/ConnectDataCTA.tsx
@@ -7,7 +7,7 @@ import { INTEGRATION_EDITOR_MODES, INTEGRATION_TABS } from "constants/routes";
 import history from "utils/history";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import type { WidgetType } from "constants/WidgetConstants";
-import { integrationEditorURL } from "RouteBuilder";
+import { integrationEditorURL } from "@appsmith/RouteBuilder";
 import { getCurrentPageId } from "selectors/editorSelectors";
 import { DocsLink, openDoc } from "../../../constants/DocumentationLinks";
 import { DatasourceCreateEntryPoints } from "constants/Datasource";
@@ -26,11 +26,11 @@ const Container = styled.div`
 export const actionsExist = (state: AppState): boolean =>
   !!state.entities.actions.length;
 
-type ConnectDataCTAProps = {
+interface ConnectDataCTAProps {
   widgetTitle: string;
   widgetId?: string;
   widgetType?: WidgetType;
-};
+}
 
 function ConnectDataCTA(props: ConnectDataCTAProps) {
   const pageId: string = useSelector(getCurrentPageId);
diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyControlsGenerator.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyControlsGenerator.tsx
index 204451536b..307f4326be 100644
--- a/app/client/src/pages/Editor/PropertyPane/PropertyControlsGenerator.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/PropertyControlsGenerator.tsx
@@ -20,7 +20,7 @@ import type { EnhancementFns } from "selectors/widgetEnhancementSelectors";
 import { getWidgetEnhancementSelector } from "selectors/widgetEnhancementSelectors";
 import equal from "fast-deep-equal/es6";
 
-export type PropertyControlsGeneratorProps = {
+export interface PropertyControlsGeneratorProps {
   id: string;
   config: readonly PropertyPaneConfig[];
   type: WidgetType;
@@ -29,7 +29,7 @@ export type PropertyControlsGeneratorProps = {
   isPanelProperty?: boolean;
   theme: EditorTheme;
   searchQuery?: string;
-};
+}
 
 const generatePropertyControl = (
   propertyPaneConfig: readonly PropertyPaneConfig[],
diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyHelpLabel.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyHelpLabel.tsx
index b9b86d868b..d757008259 100644
--- a/app/client/src/pages/Editor/PropertyPane/PropertyHelpLabel.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/PropertyHelpLabel.tsx
@@ -12,7 +12,7 @@ const Label = styled.label`
   user-select: none;
 `;
 
-type Props = {
+interface Props {
   className?: string;
   tooltip?: string;
   label: string;
@@ -20,7 +20,7 @@ type Props = {
   maxWidth?: string;
   lineHeight?: string;
   onClick?: () => void;
-};
+}
 
 function PropertyHelpLabel(props: Props) {
   const toolTipDefined = props.tooltip !== undefined;
diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx
index 14702836a4..e6c7935163 100644
--- a/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx
@@ -40,11 +40,11 @@ import {
   Tooltip,
 } from "design-system";
 
-type DropdownOption = {
+interface DropdownOption {
   label?: string;
   value?: string;
   id?: string;
-};
+}
 
 const TopLayer = styled.div`
   display: flex;
@@ -72,12 +72,12 @@ const OptionContentWrapper = styled.div<{
   gap: 10px;
 `;
 
-type PropertyPaneConnectionsProps = {
+interface PropertyPaneConnectionsProps {
   widgetName: string;
   widgetType: string;
-};
+}
 
-type TriggerNodeProps = {
+interface TriggerNodeProps {
   entityCount: number;
   iconAlignment: "LEFT" | "RIGHT";
   connectionType: "INCOMING" | "OUTGOING";
@@ -85,7 +85,7 @@ type TriggerNodeProps = {
   justifyContent: string;
   tooltipPosition?: TooltipPlacement;
   disabled?: boolean;
-};
+}
 
 const doConnectionsHaveErrors = (
   options: DropdownOption[],
diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyPaneHelperText.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyPaneHelperText.tsx
index 54f7b664e2..ff9bbe3c09 100644
--- a/app/client/src/pages/Editor/PropertyPane/PropertyPaneHelperText.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/PropertyPaneHelperText.tsx
@@ -2,9 +2,9 @@ import { Text, TextType } from "design-system-old";
 import React from "react";
 import styled from "styled-components";
 
-type Props = {
+interface Props {
   helperText?: string;
-};
+}
 const StyledHelperText = styled(Text)`
   font-size: 12px;
   color: var(--ads-v2-color-fg-muted);
diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyPaneSearchInput.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyPaneSearchInput.tsx
index be61ec2456..e656bf7d50 100644
--- a/app/client/src/pages/Editor/PropertyPane/PropertyPaneSearchInput.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/PropertyPaneSearchInput.tsx
@@ -37,10 +37,10 @@ const StyledSearchInput = styled(SearchInput)`
   }
 `;
 
-type PropertyPaneSearchInputProps = {
+interface PropertyPaneSearchInputProps {
   onTextChange: (text: string) => void;
   isPanel?: boolean;
-};
+}
 
 export function PropertyPaneSearchInput(props: PropertyPaneSearchInputProps) {
   const inputRef = useRef<HTMLInputElement>(null);
diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyPaneTab.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyPaneTab.tsx
index 798b234b6c..a603d8845c 100644
--- a/app/client/src/pages/Editor/PropertyPane/PropertyPaneTab.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/PropertyPaneTab.tsx
@@ -7,12 +7,12 @@ import { getSelectedPropertyTabIndex } from "selectors/editorContextSelectors";
 import { setSelectedPropertyTabIndex } from "actions/editorContextActions";
 import type { AppState } from "@appsmith/reducers";
 
-type PropertyPaneTabProps = {
+interface PropertyPaneTabProps {
   styleComponent: JSX.Element | null;
   contentComponent: JSX.Element | null;
   isPanelProperty?: boolean;
   panelPropertyPath?: string;
-};
+}
 
 const tabs = ["content", "style"];
 
diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyPaneTitle.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyPaneTitle.tsx
index f4e7095480..51b914806a 100644
--- a/app/client/src/pages/Editor/PropertyPane/PropertyPaneTitle.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/PropertyPaneTitle.tsx
@@ -23,7 +23,7 @@ import { toggleShowDeviationDialog } from "actions/onboardingActions";
 import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 import { getIsCurrentWidgetRecentlyAdded } from "selectors/propertyPaneSelectors";
 
-type PropertyPaneTitleProps = {
+interface PropertyPaneTitleProps {
   title: string;
   widgetId?: string;
   widgetType?: WidgetType;
@@ -35,7 +35,7 @@ type PropertyPaneTitleProps = {
     icon: ReactElement;
     tooltipPosition?: TooltipPlacement;
   }>;
-};
+}
 
 const StyledEditableContainer = styled.div`
   max-width: calc(100% - 52px);
diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyPaneView.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyPaneView.tsx
index 485f46bdfe..a0a6987c7e 100644
--- a/app/client/src/pages/Editor/PropertyPane/PropertyPaneView.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/PropertyPaneView.tsx
@@ -138,7 +138,7 @@ function PropertyPaneView(
             `#${CSS.escape(widgetId)}`,
             `#${PROPERTY_PANE_ID}`,
           ],
-          delay: 5000,
+          delay: 2500,
           runBeforeWalkthrough: () => {
             try {
               selectWidget(SelectionRequestType.One, [widgetId]);
diff --git a/app/client/src/pages/Editor/PropertyPane/PropertySection.tsx b/app/client/src/pages/Editor/PropertyPane/PropertySection.tsx
index fa31e46272..df51d240de 100644
--- a/app/client/src/pages/Editor/PropertyPane/PropertySection.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/PropertySection.tsx
@@ -72,7 +72,7 @@ const SectionWrapper = styled.div`
   }
 `;
 
-type PropertySectionProps = {
+interface PropertySectionProps {
   id: string;
   name: string;
   childrenId?: string;
@@ -85,7 +85,7 @@ type PropertySectionProps = {
   propertyPath?: string;
   tag?: string; // Used to show a tag on the section title on search results
   panelPropertyPath?: string;
-};
+}
 
 const areEqual = (prev: PropertySectionProps, next: PropertySectionProps) => {
   return prev.id === next.id && prev.childrenId === next.childrenId;
diff --git a/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx b/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
index 6433a5f133..56ed44c91b 100644
--- a/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
@@ -335,7 +335,7 @@ export const SegmentedControlContainer = styled.div`
   overflow-x: scroll;
 `;
 
-type QueryFormProps = {
+interface QueryFormProps {
   onDeleteClick: () => void;
   onRunClick: () => void;
   onCreateDatasourceClick: () => void;
@@ -368,15 +368,15 @@ type QueryFormProps = {
     value,
   }: UpdateActionPropertyActionPayload) => void;
   datasourceId: string;
-};
+}
 
-type ReduxProps = {
+interface ReduxProps {
   actionName: string;
   plugin?: Plugin;
   pluginId: string;
   documentationLink: string | undefined;
   formEvaluationState: FormEvalOutput;
-};
+}
 
 export type EditorJSONtoFormProps = QueryFormProps & ReduxProps;
 
@@ -849,11 +849,11 @@ export function EditorJSONtoForm(props: Props) {
 
   const pluginImages = useSelector(getPluginImages);
 
-  type DATASOURCES_OPTIONS_TYPE = {
+  interface DATASOURCES_OPTIONS_TYPE {
     label: string;
     value: string;
     image: string;
-  };
+  }
 
   // Filtering the datasources for listing the similar datasources only rather than having all the active datasources in the list, which on switching resulted in error.
   const DATASOURCES_OPTIONS: Array<DATASOURCES_OPTIONS_TYPE> =
diff --git a/app/client/src/pages/Editor/QueryEditor/JSONViewer.tsx b/app/client/src/pages/Editor/QueryEditor/JSONViewer.tsx
index 89d703531c..0677531e33 100644
--- a/app/client/src/pages/Editor/QueryEditor/JSONViewer.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/JSONViewer.tsx
@@ -22,9 +22,9 @@ const Record = styled(Card)`
   }
 `;
 
-type JSONOutputProps = {
+interface JSONOutputProps {
   src: Record<string, any>[];
-};
+}
 
 type Props = JSONOutputProps;
 
diff --git a/app/client/src/pages/Editor/QueryEditor/TemplateMenu.tsx b/app/client/src/pages/Editor/QueryEditor/TemplateMenu.tsx
index 5eb865b184..685b32817f 100644
--- a/app/client/src/pages/Editor/QueryEditor/TemplateMenu.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/TemplateMenu.tsx
@@ -47,9 +47,9 @@ interface TemplateMenuProps {
   pluginId: string;
 }
 
-type ReduxProps = {
+interface ReduxProps {
   allPluginTemplates: Record<string, any>;
-};
+}
 
 type Props = TemplateMenuProps & ReduxProps;
 
diff --git a/app/client/src/pages/Editor/QueryEditor/index.tsx b/app/client/src/pages/Editor/QueryEditor/index.tsx
index 10ad38b2a0..3e12a871a6 100644
--- a/app/client/src/pages/Editor/QueryEditor/index.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/index.tsx
@@ -45,7 +45,7 @@ import { getUIComponent } from "./helpers";
 import type { Diff } from "deep-diff";
 import { diff } from "deep-diff";
 import EntityNotFoundPane from "pages/Editor/EntityNotFoundPane";
-import { integrationEditorURL } from "RouteBuilder";
+import { integrationEditorURL } from "@appsmith/RouteBuilder";
 import { getConfigInitialValues } from "components/formControls/utils";
 import { merge } from "lodash";
 import { getPathAndValueFromActionDiffObject } from "../../../utils/getPathAndValueFromActionDiffObject";
@@ -62,7 +62,7 @@ const LoadingContainer = styled(CenteredWrapper)`
   height: 50%;
 `;
 
-type ReduxDispatchProps = {
+interface ReduxDispatchProps {
   runAction: (actionId: string) => void;
   deleteAction: (id: string, name: string) => void;
   changeQueryPage: (queryId: string) => void;
@@ -81,9 +81,9 @@ type ReduxDispatchProps = {
     propertyName: string,
     value: string,
   ) => void;
-};
+}
 
-type ReduxStateProps = {
+interface ReduxStateProps {
   plugins: Plugin[];
   dataSources: Datasource[];
   isRunning: boolean;
@@ -105,7 +105,7 @@ type ReduxStateProps = {
   datasourceId?: string;
   currentEnvironmentId: string;
   currentEnvironmentName: string;
-};
+}
 
 type StateAndRouteProps = RouteComponentProps<QueryEditorRouteParams>;
 
diff --git a/app/client/src/pages/Editor/RealtimeAppEditors.tsx b/app/client/src/pages/Editor/RealtimeAppEditors.tsx
index 128fa0878d..4cbed5aef4 100644
--- a/app/client/src/pages/Editor/RealtimeAppEditors.tsx
+++ b/app/client/src/pages/Editor/RealtimeAppEditors.tsx
@@ -41,9 +41,9 @@ const UserImageContainer = styled.div`
   }
 `;
 
-type RealtimeAppEditorsProps = {
+interface RealtimeAppEditorsProps {
   applicationId?: string;
-};
+}
 
 export function useEditAppCollabEvents(applicationId?: string) {
   const dispatch = useDispatch();
diff --git a/app/client/src/pages/Editor/RequestConfirmationModal.tsx b/app/client/src/pages/Editor/RequestConfirmationModal.tsx
index 677f7f831e..8f9bfdd7b6 100644
--- a/app/client/src/pages/Editor/RequestConfirmationModal.tsx
+++ b/app/client/src/pages/Editor/RequestConfirmationModal.tsx
@@ -21,10 +21,10 @@ import {
 } from "@appsmith/constants/messages";
 import type { ModalInfo } from "reducers/uiReducers/modalActionReducer";
 
-type Props = {
+interface Props {
   modals: ModalInfo[];
   dispatch: any;
-};
+}
 
 class RequestConfirmationModal extends React.Component<Props> {
   addEventListener = () => {
diff --git a/app/client/src/pages/Editor/SaaSEditor/DatasourceCard.tsx b/app/client/src/pages/Editor/SaaSEditor/DatasourceCard.tsx
index 861d3eb266..427a212dbf 100644
--- a/app/client/src/pages/Editor/SaaSEditor/DatasourceCard.tsx
+++ b/app/client/src/pages/Editor/SaaSEditor/DatasourceCard.tsx
@@ -16,7 +16,7 @@ import history from "utils/history";
 
 import RenderDatasourceInformation from "pages/Editor/DataSourceEditor/DatasourceSection";
 import { BaseButton } from "components/designSystems/appsmith/BaseButton";
-import { saasEditorDatasourceIdURL } from "RouteBuilder";
+import { saasEditorDatasourceIdURL } from "@appsmith/RouteBuilder";
 import { getAssetUrl } from "@appsmith/utils/airgapHelpers";
 import { Button } from "design-system";
 
@@ -81,10 +81,10 @@ const ButtonsWrapper = styled.div`
   gap: 10px;
 `;
 
-type DatasourceCardProps = {
+interface DatasourceCardProps {
   datasource: Datasource;
   onCreate: (datasource: Datasource) => void;
-};
+}
 
 // TODO: This is largely a quick copy pasta and edit of QueryEditor/DatasourceCard.tsx
 // When we move Google Sheets over to regular oauth2 integrations, we will need to refactor this.
diff --git a/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx b/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx
index 0b08e25d83..c98b4a839e 100644
--- a/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx
+++ b/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx
@@ -160,30 +160,30 @@ type Props = DatasourceSaaSEditorProps &
   unblock: on blocking routes using history.block, it returns a function which can be used to unblock the routes
   navigation: function that navigates to path that we want to transition to, after discard action on datasource discard dialog popup
 */
-type State = {
+interface State {
   showDialog: boolean;
   routesBlocked: boolean;
   readUrlParams: boolean;
   filterParams: DatasourceFilterState;
   unblock(): void;
   navigation(): void;
-};
+}
 
 type SaasEditorWrappperProps = RouteProps & {
   hiddenHeader?: boolean; // for reconnect modal
   isInsideReconnectModal?: boolean; // for reconnect modal
   currentEnvironment: string;
 };
-type RouteProps = {
+interface RouteProps {
   datasourceId: string;
   pageId: string;
   pluginPackageName: string;
-};
+}
 
-type SaasEditorWrappperState = {
+interface SaasEditorWrappperState {
   requiredFields: Record<string, ControlProps>;
   configDetails: Record<string, string>;
-};
+}
 class SaasEditorWrapper extends React.Component<
   SaasEditorWrappperProps,
   SaasEditorWrappperState
diff --git a/app/client/src/pages/Editor/SaaSEditor/GoogleSheetSchema.tsx b/app/client/src/pages/Editor/SaaSEditor/GoogleSheetSchema.tsx
index d6feb5155c..8e1c1aef05 100644
--- a/app/client/src/pages/Editor/SaaSEditor/GoogleSheetSchema.tsx
+++ b/app/client/src/pages/Editor/SaaSEditor/GoogleSheetSchema.tsx
@@ -103,10 +103,10 @@ const SelectListWrapper = styled.div`
   }
 `;
 
-type Props = {
+interface Props {
   datasourceId: string;
   pluginId?: string;
-};
+}
 
 const MAX_SHEET_ROWS_LENGTH = 12;
 
diff --git a/app/client/src/pages/Editor/SaaSEditor/ListView.tsx b/app/client/src/pages/Editor/SaaSEditor/ListView.tsx
index 78928395b9..6a32f496fd 100644
--- a/app/client/src/pages/Editor/SaaSEditor/ListView.tsx
+++ b/app/client/src/pages/Editor/SaaSEditor/ListView.tsx
@@ -26,7 +26,7 @@ import {
   selectURLSlugs,
 } from "selectors/editorSelectors";
 import { INTEGRATION_TABS } from "constants/routes";
-import { integrationEditorURL } from "RouteBuilder";
+import { integrationEditorURL } from "@appsmith/RouteBuilder";
 
 const IntegrationHomePage = styled.div`
   padding: 20px;
diff --git a/app/client/src/pages/Editor/WidgetCard.tsx b/app/client/src/pages/Editor/WidgetCard.tsx
index 2b3e8c0db2..5455824145 100644
--- a/app/client/src/pages/Editor/WidgetCard.tsx
+++ b/app/client/src/pages/Editor/WidgetCard.tsx
@@ -9,9 +9,9 @@ import { IconWrapper } from "constants/IconConstants";
 import { Text } from "design-system";
 import WalkthroughContext from "components/featureWalkthrough/walkthroughContext";
 
-type CardProps = {
+interface CardProps {
   details: WidgetCardProps;
-};
+}
 
 export const Wrapper = styled.div`
   border-radius: var(--ads-v2-border-radius);
diff --git a/app/client/src/pages/Editor/WidgetCardsPane.tsx b/app/client/src/pages/Editor/WidgetCardsPane.tsx
index 2b8314bf02..a848a3f69b 100644
--- a/app/client/src/pages/Editor/WidgetCardsPane.tsx
+++ b/app/client/src/pages/Editor/WidgetCardsPane.tsx
@@ -4,9 +4,9 @@ import styled from "styled-components";
 import type { WidgetCardProps } from "widgets/BaseWidget";
 import PaneWrapper from "pages/common/PaneWrapper";
 
-type WidgetCardPaneProps = {
+interface WidgetCardPaneProps {
   cards?: { [id: string]: WidgetCardProps[] };
-};
+}
 
 const CardsWrapper = styled.div`
   display: grid;
diff --git a/app/client/src/pages/Editor/WidgetsEditor/EmptyCanvasPrompts.tsx b/app/client/src/pages/Editor/WidgetsEditor/EmptyCanvasPrompts.tsx
index ea5dff5d62..5cc9936791 100644
--- a/app/client/src/pages/Editor/WidgetsEditor/EmptyCanvasPrompts.tsx
+++ b/app/client/src/pages/Editor/WidgetsEditor/EmptyCanvasPrompts.tsx
@@ -8,7 +8,7 @@ import {
 } from "selectors/editorSelectors";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import history from "utils/history";
-import { generateTemplateFormURL } from "RouteBuilder";
+import { generateTemplateFormURL } from "@appsmith/RouteBuilder";
 import { useParams } from "react-router";
 import type { ExplorerURLParams } from "@appsmith/pages/Editor/Explorer/helpers";
 import { showTemplatesModal as showTemplatesModalAction } from "actions/templateActions";
@@ -67,20 +67,20 @@ const Content = styled.div`
   padding-left: ${(props) => props.theme.spaces[7]}px;
 `;
 
-type routeId = {
+interface routeId {
   applicationSlug: string;
   pageId: string;
   pageSlug: string;
-};
+}
 
 const goToGenPageForm = ({ pageId }: routeId): void => {
   AnalyticsUtil.logEvent("GEN_CRUD_PAGE_ACTION_CARD_CLICK");
   history.push(generateTemplateFormURL({ pageId }));
 };
 
-type EmptyCanvasPromptsProps = {
+interface EmptyCanvasPromptsProps {
   isPreviewMode: boolean;
-};
+}
 
 /**
  * OldName: CanvasTopSection
diff --git a/app/client/src/pages/Editor/WidgetsEditor/MainContainerWrapper.tsx b/app/client/src/pages/Editor/WidgetsEditor/MainContainerWrapper.tsx
index f0eba8c409..ab954c83e3 100644
--- a/app/client/src/pages/Editor/WidgetsEditor/MainContainerWrapper.tsx
+++ b/app/client/src/pages/Editor/WidgetsEditor/MainContainerWrapper.tsx
@@ -40,13 +40,13 @@ import {
 import { CANVAS_VIEWPORT } from "constants/componentClassNameConstants";
 import { MainContainerResizer } from "layoutSystems/common/mainContainerResizer/MainContainerResizer";
 
-type MainCanvasWrapperProps = {
+interface MainCanvasWrapperProps {
   isPreviewMode: boolean;
   shouldShowSnapShotBanner: boolean;
   navigationHeight?: number;
   isAppSettingsPaneWithNavigationTabOpen?: boolean;
   currentPageId: string;
-};
+}
 
 const Wrapper = styled.section<{
   $enableMainCanvasResizer: boolean;
diff --git a/app/client/src/pages/Editor/WidgetsEditorWrapper.tsx b/app/client/src/pages/Editor/WidgetsEditorWrapper.tsx
index 9ebc351f02..f0ac582932 100644
--- a/app/client/src/pages/Editor/WidgetsEditorWrapper.tsx
+++ b/app/client/src/pages/Editor/WidgetsEditorWrapper.tsx
@@ -17,6 +17,7 @@ import EditorsRouter from "./routes";
 import EditorWrapperBody from "./commons/EditorWrapperBody";
 import WidgetsEditorEntityExplorer from "./WidgetsEditorEntityExplorer";
 import EditorWrapperContainer from "./commons/EditorWrapperContainer";
+import Sidebar from "components/Sidebar";
 
 const SentryRoute = Sentry.withSentryRouting(Route);
 
@@ -30,6 +31,7 @@ function WidgetsEditorWrapper() {
   return (
     <>
       <EditorWrapperContainer>
+        <Sidebar />
         <WidgetsEditorEntityExplorer />
         <EditorWrapperBody id="app-body">
           <Switch key={BUILDER_PATH}>
diff --git a/app/client/src/pages/Editor/commons/EditorHeaderComponents.tsx b/app/client/src/pages/Editor/commons/EditorHeaderComponents.tsx
new file mode 100644
index 0000000000..d37d9089fc
--- /dev/null
+++ b/app/client/src/pages/Editor/commons/EditorHeaderComponents.tsx
@@ -0,0 +1,52 @@
+import styled from "styled-components";
+import { Profile } from "pages/common/ProfileImage";
+import { getTypographyByKey } from "design-system-old";
+
+export const HeaderWrapper = styled.div`
+  width: 100%;
+  display: flex;
+  align-items: center;
+  background-color: var(--ads-v2-color-bg);
+  flex-direction: row;
+  box-shadow: none;
+  border-bottom: 1px solid var(--ads-v2-color-border);
+  height: ${(props) => props.theme.smallHeaderHeight};
+  & .editable-application-name {
+    ${getTypographyByKey("h4")}
+    color: ${(props) => props.theme.colors.header.appName};
+  }
+  & ${Profile} {
+    width: 24px;
+    height: 24px;
+  }
+
+  @media only screen and (max-width: 900px) {
+    & .help-bar {
+      display: none;
+    }
+  }
+
+  @media only screen and (max-width: 700px) {
+    & .app-realtime-editors {
+      display: none;
+    }
+  }
+`;
+
+export const HeaderSection = styled.div`
+  position: relative;
+  display: flex;
+  flex: 1;
+  overflow: visible;
+  align-items: center;
+  :nth-child(1) {
+    justify-content: flex-start;
+    max-width: 30%;
+  }
+  :nth-child(2) {
+    justify-content: center;
+  }
+  :nth-child(3) {
+    justify-content: flex-end;
+  }
+`;
diff --git a/app/client/src/pages/Editor/commons/EditorWrapperBody.tsx b/app/client/src/pages/Editor/commons/EditorWrapperBody.tsx
index 296f792ca6..f332957faf 100644
--- a/app/client/src/pages/Editor/commons/EditorWrapperBody.tsx
+++ b/app/client/src/pages/Editor/commons/EditorWrapperBody.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 
-type EditorWrapperBodyProps = {
+interface EditorWrapperBodyProps {
   children: React.ReactNode;
   id: string;
-};
+}
 
 function EditorWrapperBody({ children, id }: EditorWrapperBodyProps) {
   return (
diff --git a/app/client/src/pages/Editor/commons/EditorWrapperContainer.tsx b/app/client/src/pages/Editor/commons/EditorWrapperContainer.tsx
index 4ceeec2f54..5b87906d35 100644
--- a/app/client/src/pages/Editor/commons/EditorWrapperContainer.tsx
+++ b/app/client/src/pages/Editor/commons/EditorWrapperContainer.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import styled from "styled-components";
 
-type EditorWrapperContainerProps = {
+interface EditorWrapperContainerProps {
   children: React.ReactNode;
-};
+}
 
 const Wrapper = styled.div`
   display: flex;
diff --git a/app/client/src/pages/Editor/commons/LockEntityExplorer.tsx b/app/client/src/pages/Editor/commons/LockEntityExplorer.tsx
new file mode 100644
index 0000000000..c1c8d1d418
--- /dev/null
+++ b/app/client/src/pages/Editor/commons/LockEntityExplorer.tsx
@@ -0,0 +1,107 @@
+import React, { useCallback } from "react";
+import { Button, Icon, Tooltip } from "design-system";
+import {
+  CLOSE_ENTITY_EXPLORER_MESSAGE,
+  LOCK_ENTITY_EXPLORER_MESSAGE,
+  createMessage,
+} from "@appsmith/constants/messages";
+import { modText } from "utils/helpers";
+import classNames from "classnames";
+import {
+  setExplorerActiveAction,
+  setExplorerPinnedAction,
+} from "actions/explorerActions";
+import { getExplorerPinned } from "selectors/explorerSelector";
+import { useDispatch, useSelector } from "react-redux";
+import styled from "styled-components";
+
+export const SidebarNavButton = styled(Button)`
+  .ads-v2-button__content {
+    padding: 0;
+  }
+  .group {
+    height: 36px;
+    width: 36px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+`;
+
+export const LockEntityExplorer = ({
+  isPreviewingApp = false,
+}: {
+  isPreviewingApp?: boolean;
+}) => {
+  const pinned = useSelector(getExplorerPinned);
+  const dispatch = useDispatch();
+
+  /**
+   * on hovering the menu, make the explorer active
+   */
+  const onMenuHover = useCallback(() => {
+    dispatch(setExplorerActiveAction(true));
+  }, [setExplorerActiveAction]);
+
+  /**
+   * toggles the pinned state of sidebar
+   */
+  const onPin = useCallback(() => {
+    dispatch(setExplorerPinnedAction(!pinned));
+  }, [pinned, dispatch, setExplorerPinnedAction]);
+
+  return (
+    <Tooltip
+      content={
+        <div className="flex items-center justify-between">
+          <span>
+            {!pinned
+              ? createMessage(LOCK_ENTITY_EXPLORER_MESSAGE)
+              : createMessage(CLOSE_ENTITY_EXPLORER_MESSAGE)}
+          </span>
+          <span className="ml-4">{modText()} /</span>
+        </div>
+      }
+      placement="bottomLeft"
+    >
+      <SidebarNavButton
+        className={classNames({
+          "transition-all transform duration-400": true,
+          "-translate-x-full opacity-0": isPreviewingApp,
+          "translate-x-0 opacity-100": !isPreviewingApp,
+        })}
+        data-testid="sidebar-nav-button"
+        kind="tertiary"
+        onClick={onPin}
+        size="md"
+      >
+        <div
+          className="t--pin-entity-explorer group relative"
+          onMouseEnter={onMenuHover}
+        >
+          <Icon
+            className="absolute transition-opacity group-hover:opacity-0"
+            name="hamburger"
+            size="md"
+          />
+          {pinned && (
+            <Icon
+              className="absolute transition-opacity opacity-0 group-hover:opacity-100"
+              name="menu-fold"
+              onClick={onPin}
+              size="md"
+            />
+          )}
+          {!pinned && (
+            <Icon
+              className="absolute transition-opacity opacity-0 group-hover:opacity-100"
+              name="menu-unfold"
+              onClick={onPin}
+              size="md"
+            />
+          )}
+        </div>
+      </SidebarNavButton>
+    </Tooltip>
+  );
+};
diff --git a/app/client/src/pages/Editor/commons/Omnibar.tsx b/app/client/src/pages/Editor/commons/Omnibar.tsx
new file mode 100644
index 0000000000..291286023b
--- /dev/null
+++ b/app/client/src/pages/Editor/commons/Omnibar.tsx
@@ -0,0 +1,52 @@
+import React, { Suspense, lazy } from "react";
+import styled from "styled-components";
+import { snipingModeSelector } from "selectors/editorSelectors";
+import { retryPromise } from "utils/AppsmithUtils";
+import { useSelector } from "react-redux";
+
+const BindingBanner = styled.div`
+  position: fixed;
+  width: 199px;
+  height: 36px;
+  left: 50%;
+  top: ${(props) => props.theme.smallHeaderHeight};
+  transform: translate(-50%, 0);
+  text-align: center;
+  background: var(--ads-v2-color-fg-information);
+  color: var(--ads-v2-color-white);
+  border-radius: var(--ads-v2-border-radius);
+  font-weight: 500;
+  font-size: 15px;
+  line-height: 20px;
+  /* Depth: 01 */
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-shadow: var(--ads-v2-shadow-popovers);
+  z-index: 9999;
+`;
+
+const GlobalSearch = lazy(async () => {
+  return retryPromise(
+    async () =>
+      import(
+        /* webpackChunkName: "global-search" */ "components/editorComponents/GlobalSearch"
+      ),
+  );
+});
+
+export const Omnibar = () => {
+  const isSnipingMode = useSelector(snipingModeSelector);
+  return (
+    <>
+      <Suspense fallback={<span />}>
+        <GlobalSearch />
+      </Suspense>
+      {isSnipingMode && (
+        <BindingBanner className="t--sniping-mode-banner">
+          Select a widget to bind
+        </BindingBanner>
+      )}
+    </>
+  );
+};
diff --git a/app/client/src/pages/Editor/gitSync/Menu.tsx b/app/client/src/pages/Editor/gitSync/Menu.tsx
index a0107d679f..24b57486af 100644
--- a/app/client/src/pages/Editor/gitSync/Menu.tsx
+++ b/app/client/src/pages/Editor/gitSync/Menu.tsx
@@ -1,11 +1,11 @@
 import React from "react";
 import { Tab, Tabs, TabsList } from "design-system";
 
-type Props = {
+interface Props {
   activeTabKey: string;
   onSelect: (key: string) => void;
   options: Array<{ key: string; title: string }>;
-};
+}
 
 export default function Menu(props: Props) {
   return (
diff --git a/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx b/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx
index fc2b065375..8dd000e614 100644
--- a/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx
+++ b/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx
@@ -40,7 +40,7 @@ import AnalyticsUtil from "utils/AnalyticsUtil";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
 
-type QuickActionButtonProps = {
+interface QuickActionButtonProps {
   className?: string;
   count?: number;
   disabled?: boolean;
@@ -48,7 +48,7 @@ type QuickActionButtonProps = {
   loading?: boolean;
   onClick: () => void;
   tooltipText: string;
-};
+}
 
 const SpinnerContainer = styled.div`
   padding: 0 10px;
diff --git a/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx b/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx
index df4fb44d0b..ab172e91b0 100644
--- a/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx
+++ b/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx
@@ -52,7 +52,7 @@ import {
   getOAuthAccessToken,
   loadFilePickerAction,
 } from "actions/datasourceActions";
-import { builderURL } from "RouteBuilder";
+import { builderURL } from "@appsmith/RouteBuilder";
 import localStorage from "utils/localStorage";
 import {
   Modal,
diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitConnection.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitConnection.tsx
index d81f850709..8257e028c1 100644
--- a/app/client/src/pages/Editor/gitSync/Tabs/GitConnection.tsx
+++ b/app/client/src/pages/Editor/gitSync/Tabs/GitConnection.tsx
@@ -99,14 +99,14 @@ const RemoteUrlInfoWrapper = styled.div`
 // v1 only support SSH
 const selectedAuthType = AUTH_TYPE_OPTIONS[0];
 
-type AuthorInfo = {
+interface AuthorInfo {
   authorName: string;
   authorEmail: string;
-};
+}
 
-type Props = {
+interface Props {
   isImport?: boolean;
-};
+}
 
 function GitConnection({ isImport }: Props) {
   const placeholderText = createMessage(REMOTE_URL_INPUT_PLACEHOLDER);
diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/AddDeployKey.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/AddDeployKey.tsx
index be6208e8e7..bca05c7d55 100644
--- a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/AddDeployKey.tsx
+++ b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/AddDeployKey.tsx
@@ -147,11 +147,11 @@ interface AddDeployKeyProps {
 }
 
 function AddDeployKey({
+  connectLoading = false,
+  errorData,
+  isImport = false,
   onChange = noop,
   value = {},
-  isImport = false,
-  errorData,
-  connectLoading = false,
 }: AddDeployKeyProps) {
   const isModalOpen = useSelector(getIsGitSyncModalOpen);
   const [fetched, setFetched] = useState(false);
diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/ChooseGitProvider.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/ChooseGitProvider.tsx
index f0ec3289b6..00d6829500 100644
--- a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/ChooseGitProvider.tsx
+++ b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/ChooseGitProvider.tsx
@@ -66,9 +66,9 @@ interface ChooseGitProviderProps {
 }
 
 function ChooseGitProvider({
+  isImport = false,
   onChange = noop,
   value = {},
-  isImport = false,
 }: ChooseGitProviderProps) {
   const workspace = useSelector(getCurrentAppWorkspace);
   const isMobile = useIsMobileDevice();
diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/GenerateSSH.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/GenerateSSH.tsx
index ce194d6001..181d900723 100644
--- a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/GenerateSSH.tsx
+++ b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/GenerateSSH.tsx
@@ -44,9 +44,9 @@ interface GenerateSSHProps {
 }
 
 function GenerateSSH({
+  errorData,
   onChange = noop,
   value = {},
-  errorData,
 }: GenerateSSHProps) {
   const [isTouched, setIsTouched] = useState(false);
   const isInvalid =
diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/Steps.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/Steps.tsx
index a621ae5188..e702e2ce3e 100644
--- a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/Steps.tsx
+++ b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/Steps.tsx
@@ -77,9 +77,9 @@ interface StepsProps {
 }
 
 function Steps({
-  steps = [],
   activeKey,
   onActiveKeyChange = noop,
+  steps = [],
 }: StepsProps) {
   const activeIndex = steps.findIndex((s) => s.key === activeKey);
 
diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitSettings/GitUserSettings.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitSettings/GitUserSettings.tsx
index e598ce05f9..b71b8bd994 100644
--- a/app/client/src/pages/Editor/gitSync/Tabs/GitSettings/GitUserSettings.tsx
+++ b/app/client/src/pages/Editor/gitSync/Tabs/GitSettings/GitUserSettings.tsx
@@ -124,11 +124,11 @@ const DummyField = () => {
   );
 };
 
-export type AuthorInfo = {
+export interface AuthorInfo {
   authorName: string;
   authorEmail: string;
   useGlobalProfile: boolean;
-};
+}
 
 const GitUserSettings = () => {
   const dispatch = useDispatch();
diff --git a/app/client/src/pages/Editor/gitSync/components/BranchListHotkeys.tsx b/app/client/src/pages/Editor/gitSync/components/BranchListHotkeys.tsx
index df8979b610..9787aed808 100644
--- a/app/client/src/pages/Editor/gitSync/components/BranchListHotkeys.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/BranchListHotkeys.tsx
@@ -1,13 +1,13 @@
 import React from "react";
 import { Hotkey, Hotkeys, HotkeysTarget } from "@blueprintjs/core";
 
-type Props = {
+interface Props {
   handleUpKey: () => void;
   handleDownKey: () => void;
   handleSubmitKey: () => void;
   handleEscKey: () => void;
   children: React.ReactNode;
-};
+}
 @HotkeysTarget
 class GlobalSearchHotKeys extends React.Component<Props> {
   get hotKeysConfig() {
diff --git a/app/client/src/pages/Editor/gitSync/components/ConflictInfo.tsx b/app/client/src/pages/Editor/gitSync/components/ConflictInfo.tsx
index c4ddb3669b..ef0b0521e3 100644
--- a/app/client/src/pages/Editor/gitSync/components/ConflictInfo.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/ConflictInfo.tsx
@@ -18,10 +18,10 @@ const StyledButton = styled(Button)`
   margin-right: ${(props) => props.theme.spaces[3]}px;
 `;
 
-type Props = {
+interface Props {
   browserSupportedRemoteUrl: string;
   learnMoreLink: string;
-};
+}
 
 const ConflictInfoContainer = styled.div`
   margin-top: ${(props) => props.theme.spaces[7]}px;
diff --git a/app/client/src/pages/Editor/gitSync/components/CopyButton.tsx b/app/client/src/pages/Editor/gitSync/components/CopyButton.tsx
index 7bdbf5065d..1bceb97188 100644
--- a/app/client/src/pages/Editor/gitSync/components/CopyButton.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/CopyButton.tsx
@@ -21,11 +21,11 @@ interface CopyButtonProps {
 }
 
 export function CopyButton({
-  value,
   delay = 2000,
+  isDisabled = false,
   onCopy = noop,
   tooltipMessage,
-  isDisabled = false,
+  value,
 }: CopyButtonProps) {
   const timerRef = useRef<number>();
   const [showCopied, setShowCopied] = useState(false);
diff --git a/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx b/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx
index 6c84408da5..81ee3a17ea 100644
--- a/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx
@@ -14,7 +14,7 @@ import {
 import SuccessTick from "pages/common/SuccessTick";
 import { howMuchTimeBeforeText } from "utils/helpers";
 import AnalyticsUtil from "utils/AnalyticsUtil";
-import { viewerURL } from "RouteBuilder";
+import { viewerURL } from "@appsmith/RouteBuilder";
 import { Link, Text } from "design-system";
 import { importSvg } from "design-system-old";
 
diff --git a/app/client/src/pages/Editor/gitSync/components/GitChangesList.tsx b/app/client/src/pages/Editor/gitSync/components/GitChangesList.tsx
index ad6442b135..4ec197c22f 100644
--- a/app/client/src/pages/Editor/gitSync/components/GitChangesList.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/GitChangesList.tsx
@@ -62,11 +62,11 @@ export enum Kind {
   SETTINGS = "SETTINGS",
 }
 
-type GitStatusProps = {
+interface GitStatusProps {
   iconName: string;
   message: string;
   hasValue: boolean;
-};
+}
 
 type GitStatusMap = {
   [key in Kind]: (status: Partial<GitStatusData>) => GitStatusProps;
diff --git a/app/client/src/pages/Editor/gitSync/components/OptionSelector.tsx b/app/client/src/pages/Editor/gitSync/components/OptionSelector.tsx
index 2a2d638147..3d8b92ef1d 100644
--- a/app/client/src/pages/Editor/gitSync/components/OptionSelector.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/OptionSelector.tsx
@@ -45,11 +45,11 @@ const DropdownContainer = styled.div`
   }
 `;
 
-type OptionSelectorProps = {
+interface OptionSelectorProps {
   options: DropdownOption[];
   selected: DropdownOption;
   onSelect?: (value?: string, dropdownOption?: any) => void;
-};
+}
 
 function OptionSelector({ onSelect, options, selected }: OptionSelectorProps) {
   return (
diff --git a/app/client/src/pages/Editor/gitSync/components/Statusbar.tsx b/app/client/src/pages/Editor/gitSync/components/Statusbar.tsx
index 155f8439f7..a22b46c9e9 100644
--- a/app/client/src/pages/Editor/gitSync/components/Statusbar.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/Statusbar.tsx
@@ -2,12 +2,12 @@ import React, { useEffect, useState } from "react";
 import { Statusbar } from "design-system-old";
 import styled from "styled-components";
 
-type StatusbarProps = {
+interface StatusbarProps {
   completed: boolean;
   message?: string;
   period: number; // as seconds
   onHide?: () => void;
-};
+}
 
 export const StatusbarWrapper = styled.div`
   width: 252px;
@@ -27,9 +27,12 @@ export default function GitSyncStatusbar(props: StatusbarProps) {
       }
     } else {
       if (percentage < 90) {
-        const interval = setInterval(() => {
-          setPercentage((percentage) => percentage + 10);
-        }, (period * 1000) / 9);
+        const interval = setInterval(
+          () => {
+            setPercentage((percentage) => percentage + 10);
+          },
+          (period * 1000) / 9,
+        );
         return () => clearInterval(interval);
       }
     }
diff --git a/app/client/src/pages/Editor/gitSync/components/TabItem.tsx b/app/client/src/pages/Editor/gitSync/components/TabItem.tsx
index df4e428f3b..6bfe0aaf8f 100644
--- a/app/client/src/pages/Editor/gitSync/components/TabItem.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/TabItem.tsx
@@ -5,11 +5,11 @@ import type { TabProp } from "design-system-old";
 import { getTypographyByKey } from "design-system-old";
 import { Colors } from "constants/Colors";
 
-type WrapperProps = {
+interface WrapperProps {
   selected: boolean;
   vertical: boolean;
   theme: Theme;
-};
+}
 
 const getSelectedStyles = (props: WrapperProps) =>
   props.selected
diff --git a/app/client/src/pages/Editor/gitSync/components/UserGitProfileSettings.tsx b/app/client/src/pages/Editor/gitSync/components/UserGitProfileSettings.tsx
index 224b7a9ade..c56693d217 100644
--- a/app/client/src/pages/Editor/gitSync/components/UserGitProfileSettings.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/UserGitProfileSettings.tsx
@@ -35,7 +35,10 @@ const DefaultConfigContainer = styled.div`
   margin-left: 3px;
 `;
 
-type AuthorInfo = { authorName: string; authorEmail: string };
+interface AuthorInfo {
+  authorName: string;
+  authorEmail: string;
+}
 
 const AUTHOR_INFO_LABEL = {
   EMAIL: "authorEmail",
@@ -74,14 +77,14 @@ const setAuthorState = ({
 };
 
 // Component
-type UserGitProfileSettingsProps = {
+interface UserGitProfileSettingsProps {
   authType: string;
   authorInfo: AuthorInfo;
   setAuthorInfo: SetAuthorInfo;
   useGlobalConfig: boolean;
   toggleUseDefaultConfig: (useDefaultConfig: boolean) => void;
   triedSubmit: boolean;
-};
+}
 
 function UserGitProfileSettings({
   authorInfo,
diff --git a/app/client/src/pages/Editor/gitSync/components/ssh-key/index.tsx b/app/client/src/pages/Editor/gitSync/components/ssh-key/index.tsx
index b4abd2e1ed..5c6c43d0fa 100644
--- a/app/client/src/pages/Editor/gitSync/components/ssh-key/index.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/ssh-key/index.tsx
@@ -31,13 +31,13 @@ import {
   MenuGroupName,
 } from "design-system";
 
-type KeysProps = {
+interface KeysProps {
   copyToClipboard: () => void;
   deployKeyDocUrl: string;
   showCopied: boolean;
   SSHKeyPair: string;
   isImport?: boolean;
-};
+}
 
 const defaultKeyTypes: SSHKeyType[] = [
   {
diff --git a/app/client/src/pages/Editor/gitSync/hooks/useSSHKeyPair.ts b/app/client/src/pages/Editor/gitSync/hooks/useSSHKeyPair.ts
index 26684aba83..03073ab82f 100644
--- a/app/client/src/pages/Editor/gitSync/hooks/useSSHKeyPair.ts
+++ b/app/client/src/pages/Editor/gitSync/hooks/useSSHKeyPair.ts
@@ -23,7 +23,7 @@ export const useSSHKeyPair = () => {
   const [failedGeneratingSSHKey, setFailedGeneratingSSHKey] = useState(false);
 
   const fetchSSHKeyPair = useCallback(
-    ({ onSuccessCallback = noop, onErrorCallback = noop } = {}) => {
+    ({ onErrorCallback = noop, onSuccessCallback = noop } = {}) => {
       setIsFetchingSSHKeyPair(true);
       dispatch(
         getSSHKeyPair({
@@ -44,7 +44,7 @@ export const useSSHKeyPair = () => {
   const generateSSHKey = useCallback(
     (
       keyType = "ECDSA",
-      { onSuccessCallback = noop, onErrorCallback = noop } = {},
+      { onErrorCallback = noop, onSuccessCallback = noop } = {},
     ) => {
       // if (currentApplication?.id) {
       setIsGeneratingSSHKey(true);
diff --git a/app/client/src/pages/Editor/index.tsx b/app/client/src/pages/Editor/index.tsx
index 572f8e98fc..d50b644a0d 100644
--- a/app/client/src/pages/Editor/index.tsx
+++ b/app/client/src/pages/Editor/index.tsx
@@ -43,8 +43,9 @@ import SignpostingOverlay from "pages/Editor/FirstTimeUserOnboarding/Overlay";
 import { editorInitializer } from "../../utils/editor/EditorUtils";
 import { widgetInitialisationSuccess } from "../../actions/widgetActions";
 import { EnvDeployInfoModal } from "@appsmith/components/EnvDeployInfoModal";
+import urlBuilder from "@appsmith/entities/URLRedirect/URLAssembly";
 
-type EditorProps = {
+interface EditorProps {
   currentApplicationId?: string;
   currentApplicationName?: string;
   initEditor: (payload: InitializeEditorPayload) => void;
@@ -64,12 +65,15 @@ type EditorProps = {
   pageLevelSocketRoomId: string;
   isMultiPane: boolean;
   widgetConfigBuildSuccess: () => void;
-};
+}
 
 type Props = EditorProps & RouteComponentProps<BuilderRouteParams>;
 
 class Editor extends Component<Props> {
   componentDidMount() {
+    const { pageId } = this.props.match.params || {};
+    urlBuilder.setCurrentPageId(pageId);
+
     editorInitializer().then(() => {
       this.props.widgetConfigBuildSuccess();
     });
@@ -131,12 +135,14 @@ class Editor extends Component<Props> {
       if (prevPageId && pageId && isPageIdUpdated) {
         this.props.updateCurrentPage(pageId);
         this.props.fetchPage(pageId);
+        urlBuilder.setCurrentPageId(pageId);
       }
     }
   }
 
   componentWillUnmount() {
     this.props.resetEditorRequest();
+    urlBuilder.setCurrentPageId(null);
   }
 
   public render() {
@@ -155,7 +161,7 @@ class Editor extends Component<Props> {
           <Helmet>
             <meta charSet="utf-8" />
             <title>
-              {`${this.props.currentApplicationName} |`} Editor | Appsmith
+              {`${this.props.currentApplicationName} | Editor | Appsmith`}
             </title>
           </Helmet>
           <GlobalHotKeys>
diff --git a/app/client/src/pages/Editor/utils.ts b/app/client/src/pages/Editor/utils.ts
index 1b223456ff..359c629a86 100644
--- a/app/client/src/pages/Editor/utils.ts
+++ b/app/client/src/pages/Editor/utils.ts
@@ -14,7 +14,7 @@ import {
   createMessage,
   WIDGET_DEPRECATION_MESSAGE,
 } from "@appsmith/constants/messages";
-import type { URLBuilderParams } from "RouteBuilder";
+import type { URLBuilderParams } from "@appsmith/entities/URLRedirect/URLAssembly";
 import { useSelector } from "react-redux";
 import { getCurrentPageId } from "selectors/editorSelectors";
 import type { WidgetCardProps } from "widgets/BaseWidget";
diff --git a/app/client/src/pages/Home/LeftPaneBottomSection.tsx b/app/client/src/pages/Home/LeftPaneBottomSection.tsx
index 69b595ac46..ce702d72ff 100644
--- a/app/client/src/pages/Home/LeftPaneBottomSection.tsx
+++ b/app/client/src/pages/Home/LeftPaneBottomSection.tsx
@@ -62,7 +62,7 @@ function LeftPaneBottomSection() {
   const dispatch = useDispatch();
   const onboardingWorkspaces = useSelector(getOnboardingWorkspaces);
   const isFetchingApplications = useSelector(getIsFetchingApplications);
-  const { appVersion, cloudHosting } = getAppsmithConfigs();
+  const { appVersion } = getAppsmithConfigs();
   const howMuchTimeBefore = howMuchTimeBeforeText(appVersion.releaseDate);
   const user = useSelector(getCurrentUser);
   const tenantPermissions = useSelector(getTenantPermissions);
@@ -141,7 +141,6 @@ function LeftPaneBottomSection() {
               APPSMITH_DISPLAY_VERSION,
               appVersion.edition,
               appVersion.id,
-              cloudHosting,
             )}
           </span>
           {howMuchTimeBefore !== "" && (
diff --git a/app/client/src/pages/Templates/Filters.tsx b/app/client/src/pages/Templates/Filters.tsx
index 3c7d06b3d7..606801bd3a 100644
--- a/app/client/src/pages/Templates/Filters.tsx
+++ b/app/client/src/pages/Templates/Filters.tsx
@@ -60,10 +60,10 @@ const FilterCategoryWrapper = styled.div`
   padding-bottom: ${(props) => props.theme.spaces[13] - 11}px;
 `;
 
-export type Filter = {
+export interface Filter {
   label: string;
   value?: string;
-};
+}
 
 interface FilterItemProps {
   item: Filter;
diff --git a/app/client/src/pages/Templates/LeftPaneTemplateList.tsx b/app/client/src/pages/Templates/LeftPaneTemplateList.tsx
index 4f9a6aeca2..8c95ab35a9 100644
--- a/app/client/src/pages/Templates/LeftPaneTemplateList.tsx
+++ b/app/client/src/pages/Templates/LeftPaneTemplateList.tsx
@@ -9,7 +9,7 @@ import LeftPaneBottomSection from "pages/Home/LeftPaneBottomSection";
 import { thinScrollbar } from "constants/DefaultTheme";
 import { Colors } from "constants/Colors";
 import { createMessage, TEMPLATES } from "@appsmith/constants/messages";
-import { templateIdUrl } from "RouteBuilder";
+import { templateIdUrl } from "@appsmith/RouteBuilder";
 
 const Wrapper = styled.div`
   width: ${(props) => props.theme.homePage.sidebar}px;
diff --git a/app/client/src/pages/Templates/Template/SimilarTemplates.tsx b/app/client/src/pages/Templates/Template/SimilarTemplates.tsx
index 55594b8a08..14e973eeff 100644
--- a/app/client/src/pages/Templates/Template/SimilarTemplates.tsx
+++ b/app/client/src/pages/Templates/Template/SimilarTemplates.tsx
@@ -41,7 +41,7 @@ export const SimilarTemplatesTitleWrapper = styled.div`
 //   ${(props) => props.width && `width: ${props.width};`}
 // `;
 
-type SimilarTemplatesProp = {
+interface SimilarTemplatesProp {
   similarTemplates: TemplateInterface[];
   onBackPress: (e: React.MouseEvent) => void;
   breakpointCols: MasonryProps["breakpointCols"];
@@ -49,7 +49,7 @@ type SimilarTemplatesProp = {
   onFork?: (template: TemplateInterface) => void;
   className?: string;
   isForkingEnabled: boolean;
-};
+}
 
 function SimilarTemplates(props: SimilarTemplatesProp) {
   if (!props.similarTemplates.length) {
diff --git a/app/client/src/pages/Templates/Template/TemplateDescription.tsx b/app/client/src/pages/Templates/Template/TemplateDescription.tsx
index 802a24d0c8..156a04b40b 100644
--- a/app/client/src/pages/Templates/Template/TemplateDescription.tsx
+++ b/app/client/src/pages/Templates/Template/TemplateDescription.tsx
@@ -62,9 +62,9 @@ export const TemplateDatasources = styled.div`
   gap: ${(props) => props.theme.spaces[4]}px;
 `;
 
-type TemplateDescriptionProps = {
+interface TemplateDescriptionProps {
   template: Template;
-};
+}
 
 function TemplateDescription(props: TemplateDescriptionProps) {
   const { template } = props;
diff --git a/app/client/src/pages/Templates/Template/index.tsx b/app/client/src/pages/Templates/Template/index.tsx
index 5bc21752a4..baa1972004 100644
--- a/app/client/src/pages/Templates/Template/index.tsx
+++ b/app/client/src/pages/Templates/Template/index.tsx
@@ -10,7 +10,7 @@ import {
   createMessage,
   FORK_THIS_TEMPLATE,
 } from "@appsmith/constants/messages";
-import { templateIdUrl } from "RouteBuilder";
+import { templateIdUrl } from "@appsmith/RouteBuilder";
 import { Position } from "@blueprintjs/core";
 
 const TemplateWrapper = styled.div`
diff --git a/app/client/src/pages/Templates/TemplateView.tsx b/app/client/src/pages/Templates/TemplateView.tsx
index bde92c63e0..0892fd7e35 100644
--- a/app/client/src/pages/Templates/TemplateView.tsx
+++ b/app/client/src/pages/Templates/TemplateView.tsx
@@ -22,7 +22,7 @@ import AnalyticsUtil from "utils/AnalyticsUtil";
 import ReconnectDatasourceModal from "pages/Editor/gitSync/ReconnectDatasourceModal";
 import TemplateDescription from "./Template/TemplateDescription";
 import SimilarTemplates from "./Template/SimilarTemplates";
-import { templateIdUrl } from "RouteBuilder";
+import { templateIdUrl } from "@appsmith/RouteBuilder";
 import TemplateViewHeader from "./TemplateViewHeader";
 
 const breakpointColumnsObject = {
@@ -52,7 +52,8 @@ export const IframeWrapper = styled.div`
 
   iframe {
     border-radius: 0px 0px 16px 16px;
-    box-shadow: 0px 20px 24px -4px rgba(16, 24, 40, 0.1),
+    box-shadow:
+      0px 20px 24px -4px rgba(16, 24, 40, 0.1),
       0px 8px 8px -4px rgba(16, 24, 40, 0.04);
     width: 100%;
     height: 734px;
diff --git a/app/client/src/pages/Templates/TemplateViewHeader.tsx b/app/client/src/pages/Templates/TemplateViewHeader.tsx
index 4f7f7d6cdc..b4b19ebc10 100644
--- a/app/client/src/pages/Templates/TemplateViewHeader.tsx
+++ b/app/client/src/pages/Templates/TemplateViewHeader.tsx
@@ -3,7 +3,7 @@ import {
   GO_BACK,
   createMessage,
 } from "@appsmith/constants/messages";
-import { templateIdUrl } from "RouteBuilder";
+import { templateIdUrl } from "@appsmith/RouteBuilder";
 import { Button, Link, Text } from "design-system";
 import { useQuery } from "pages/Editor/utils";
 import React from "react";
@@ -27,9 +27,9 @@ const Title = styled(Text)`
   color: var(--ads-v2-color-fg-emphasis-plus);
 `;
 
-type Props = {
+interface Props {
   templateId: string;
-};
+}
 const SHOW_FORK_MODAL_PARAM = "showForkTemplateModal";
 
 function TemplateViewHeader({ templateId }: Props) {
diff --git a/app/client/src/pages/Templates/TemplatesModal/Header.tsx b/app/client/src/pages/Templates/TemplatesModal/Header.tsx
index 84abfa6ccd..4fc210da9e 100644
--- a/app/client/src/pages/Templates/TemplatesModal/Header.tsx
+++ b/app/client/src/pages/Templates/TemplatesModal/Header.tsx
@@ -13,11 +13,11 @@ const HeaderWrapper = styled.div`
   }
 `;
 
-type TemplateModalHeaderProps = {
+interface TemplateModalHeaderProps {
   onBackPress?: () => void;
   hideBackButton?: boolean;
   className?: string;
-};
+}
 
 function TemplateModalHeader(props: TemplateModalHeaderProps) {
   return (
diff --git a/app/client/src/pages/Templates/TemplatesModal/LoadingScreen.tsx b/app/client/src/pages/Templates/TemplatesModal/LoadingScreen.tsx
index c6f141b9be..8ba9ed824a 100644
--- a/app/client/src/pages/Templates/TemplatesModal/LoadingScreen.tsx
+++ b/app/client/src/pages/Templates/TemplatesModal/LoadingScreen.tsx
@@ -11,9 +11,9 @@ const Wrapper = styled.div`
   gap: ${(props) => props.theme.spaces[9]}px;
 `;
 
-type LoadingScreenProps = {
+interface LoadingScreenProps {
   text: string;
-};
+}
 
 function LoadingScreen(props: LoadingScreenProps) {
   return (
diff --git a/app/client/src/pages/Templates/TemplatesModal/PageSelection.tsx b/app/client/src/pages/Templates/TemplatesModal/PageSelection.tsx
index b13c2755ea..677d097de9 100644
--- a/app/client/src/pages/Templates/TemplatesModal/PageSelection.tsx
+++ b/app/client/src/pages/Templates/TemplatesModal/PageSelection.tsx
@@ -59,11 +59,11 @@ const StyledButton = styled(Button)`
   margin-top: 12px;
 `;
 
-type PageSelectionProps = {
+interface PageSelectionProps {
   pages: ApplicationPagePayload[];
   template: Template;
   onPageSelection: (pageId: string) => void;
-};
+}
 
 function PageSelection(props: PageSelectionProps) {
   const dispatch = useDispatch();
diff --git a/app/client/src/pages/Templates/TemplatesModal/TemplateDetailedView.tsx b/app/client/src/pages/Templates/TemplatesModal/TemplateDetailedView.tsx
index 505ec952b3..f63349527a 100644
--- a/app/client/src/pages/Templates/TemplatesModal/TemplateDetailedView.tsx
+++ b/app/client/src/pages/Templates/TemplatesModal/TemplateDetailedView.tsx
@@ -61,11 +61,11 @@ const TemplateDescriptionWrapper = styled.div`
   padding-bottom: 52px;
 `;
 
-type TemplateDetailedViewProps = {
+interface TemplateDetailedViewProps {
   templateId: string;
   onBackPress: () => void;
   onClose: () => void;
-};
+}
 
 function TemplateDetailedView(props: TemplateDetailedViewProps) {
   const [currentTemplateId, setCurrentTemplateId] = useState(props.templateId);
diff --git a/app/client/src/pages/Templates/TemplatesModal/TemplateList.tsx b/app/client/src/pages/Templates/TemplatesModal/TemplateList.tsx
index c6a141609c..aaab4062c6 100644
--- a/app/client/src/pages/Templates/TemplatesModal/TemplateList.tsx
+++ b/app/client/src/pages/Templates/TemplatesModal/TemplateList.tsx
@@ -37,10 +37,10 @@ const ListWrapper = styled.div`
   width: 100%;
 `;
 
-type TemplateListProps = {
+interface TemplateListProps {
   onTemplateClick: (id: string) => void;
   onClose: () => void;
-};
+}
 
 function TemplateList(props: TemplateListProps) {
   const onForkTemplateClick = (template: Template) => {
diff --git a/app/client/src/pages/Templates/index.tsx b/app/client/src/pages/Templates/index.tsx
index af8c91cfc0..78ce662bfe 100644
--- a/app/client/src/pages/Templates/index.tsx
+++ b/app/client/src/pages/Templates/index.tsx
@@ -147,13 +147,13 @@ function TemplateRoutes() {
   );
 }
 
-type TemplatesContentProps = {
+interface TemplatesContentProps {
   onTemplateClick?: (id: string) => void;
   onForkTemplateClick?: (template: Template) => void;
   stickySearchBar?: boolean;
   isForkingEnabled: boolean;
   filterWithAllowPageImport?: boolean;
-};
+}
 const INPUT_DEBOUNCE_TIMER = 500;
 export function TemplatesContent(props: TemplatesContentProps) {
   const templateSearchQuery = useSelector(getTemplateSearchQuery);
diff --git a/app/client/src/pages/UserAuth/Container.tsx b/app/client/src/pages/UserAuth/Container.tsx
index 27f548023f..6b2173dd35 100644
--- a/app/client/src/pages/UserAuth/Container.tsx
+++ b/app/client/src/pages/UserAuth/Container.tsx
@@ -5,14 +5,14 @@ import FooterLinks from "./FooterLinks";
 import { getTenantConfig } from "@appsmith/selectors/tenantSelectors";
 import { getAssetUrl } from "@appsmith/utils/airgapHelpers";
 
-type ContainerProps = {
+interface ContainerProps {
   title: string;
   subtitle?: React.ReactNode;
   children: React.ReactNode;
   footer?: React.ReactNode;
   disabledLoginForm?: boolean;
   testId?: string;
-};
+}
 
 function Container(props: ContainerProps) {
   const { children, footer, subtitle, testId, title } = props;
diff --git a/app/client/src/pages/UserAuth/helpers.ts b/app/client/src/pages/UserAuth/helpers.ts
index cee2af3149..5a1f5c697f 100644
--- a/app/client/src/pages/UserAuth/helpers.ts
+++ b/app/client/src/pages/UserAuth/helpers.ts
@@ -6,29 +6,29 @@ import UserApi from "@appsmith/api/UserApi";
 import { toast } from "design-system";
 import type { ApiResponse } from "../../api/ApiResponses";
 
-export type LoginFormValues = {
+export interface LoginFormValues {
   username?: string;
   password?: string;
   remember?: string;
-};
+}
 
-export type SignupFormValues = {
+export interface SignupFormValues {
   email?: string;
   password?: string;
   name?: string;
-};
+}
 
-export type ResetPasswordFormValues = {
+export interface ResetPasswordFormValues {
   password?: string;
   token?: string;
   email?: string;
-};
+}
 
 export type CreatePasswordFormValues = ResetPasswordFormValues;
 
-export type ForgotPasswordFormValues = {
+export interface ForgotPasswordFormValues {
   email?: string;
-};
+}
 
 export const signupFormSubmitHandler = async (
   values: SignupFormValues,
diff --git a/app/client/src/pages/common/AppHeader.tsx b/app/client/src/pages/common/AppHeader.tsx
deleted file mode 100644
index 50fb2560a6..0000000000
--- a/app/client/src/pages/common/AppHeader.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import React from "react";
-import ReactDOM from "react-dom";
-import PageHeader from "pages/common/PageHeader";
-import { Route, Switch } from "react-router";
-import {
-  VIEWER_PATH,
-  BASE_URL,
-  BUILDER_PATH,
-  SETUP,
-  SIGNUP_SUCCESS_URL,
-  USER_AUTH_URL,
-  BUILDER_PATH_DEPRECATED,
-  VIEWER_PATH_DEPRECATED,
-  ADMIN_SETTINGS_CATEGORY_PATH,
-  VIEWER_CUSTOM_PATH,
-  BUILDER_CUSTOM_PATH,
-} from "constants/routes";
-import Navigation from "pages/AppViewer/Navigation";
-import type { RouteComponentProps } from "react-router";
-import { withRouter } from "react-router";
-import AppEditorHeader from "pages/Editor/EditorHeader";
-
-type Props = RouteComponentProps;
-
-const headerRoot = document.getElementById("header-root");
-
-class AppHeader extends React.Component<Props, any> {
-  private container = document.createElement("div");
-
-  componentDidMount() {
-    headerRoot?.appendChild(this.container);
-  }
-  componentWillUnmount() {
-    headerRoot?.removeChild(this.container);
-  }
-  get header() {
-    return (
-      <Switch>
-        <Route component={PageHeader} path={ADMIN_SETTINGS_CATEGORY_PATH} />
-        <Route component={undefined} path={USER_AUTH_URL} />
-        <Route path={SETUP} />
-        <Route path={SIGNUP_SUCCESS_URL} />
-        <Route component={AppEditorHeader} path={BUILDER_PATH_DEPRECATED} />
-        <Route component={Navigation} path={VIEWER_PATH_DEPRECATED} />
-        <Route component={AppEditorHeader} path={BUILDER_PATH} />
-        <Route component={AppEditorHeader} path={BUILDER_CUSTOM_PATH} />
-        <Route component={Navigation} path={VIEWER_PATH} />
-        <Route component={Navigation} path={VIEWER_CUSTOM_PATH} />
-        <Route component={PageHeader} path={BASE_URL} />
-      </Switch>
-    );
-  }
-  render() {
-    return ReactDOM.createPortal(this.header, this.container);
-  }
-}
-
-export default withRouter(AppHeader);
diff --git a/app/client/src/pages/common/AvatarComponent.tsx b/app/client/src/pages/common/AvatarComponent.tsx
index 97b99c81c0..c8bc0b8c22 100644
--- a/app/client/src/pages/common/AvatarComponent.tsx
+++ b/app/client/src/pages/common/AvatarComponent.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { Avatar } from "design-system";
 
-export type AvatarProps = {
+export interface AvatarProps {
   className?: string;
   commonName?: string;
   userName?: string;
@@ -9,7 +9,7 @@ export type AvatarProps = {
   source?: string;
   label?: string;
   isTooltipEnabled?: boolean;
-};
+}
 
 export function AvatarComponent(props: any) {
   const getInitials = (name: string) => {
diff --git a/app/client/src/pages/common/CustomizedDropdown/Badge.tsx b/app/client/src/pages/common/CustomizedDropdown/Badge.tsx
index 95f049f222..b9dda86ef3 100644
--- a/app/client/src/pages/common/CustomizedDropdown/Badge.tsx
+++ b/app/client/src/pages/common/CustomizedDropdown/Badge.tsx
@@ -30,11 +30,11 @@ const BadgeWrapper = styled.div`
   }
 `;
 
-type BadgeProps = {
+interface BadgeProps {
   imageURL?: string;
   text: string;
   subtext?: string;
-};
+}
 
 export function Badge(props: BadgeProps) {
   return (
diff --git a/app/client/src/pages/common/CustomizedDropdown/index.tsx b/app/client/src/pages/common/CustomizedDropdown/index.tsx
index f2b9b0ebe8..9a50e6c6e9 100644
--- a/app/client/src/pages/common/CustomizedDropdown/index.tsx
+++ b/app/client/src/pages/common/CustomizedDropdown/index.tsx
@@ -30,21 +30,21 @@ import {
 import type { ButtonProps } from "components/editorComponents/Button";
 import Button from "components/editorComponents/Button";
 
-export type CustomizedDropdownOptionSection = {
+export interface CustomizedDropdownOptionSection {
   isSticky?: boolean;
   options?: CustomizedDropdownOption[];
-};
+}
 
-export type CustomizedDropdownOption = {
+export interface CustomizedDropdownOption {
   content: ReactNode;
   active?: boolean;
   onSelect?: () => void;
   intent?: Intent;
   shouldCloseDropdown?: boolean;
   disabled?: boolean;
-};
+}
 
-export type CustomizedDropdownProps = {
+export interface CustomizedDropdownProps {
   sections: CustomizedDropdownOptionSection[];
   trigger: ButtonProps & {
     content?: ReactNode;
@@ -58,7 +58,7 @@ export type CustomizedDropdownProps = {
   borderRadius?: string;
   customizedDropdownId?: string;
   modifiers?: IPopoverSharedProps["modifiers"];
-};
+}
 
 const PopoverStyles = createGlobalStyle<{
   id?: string;
diff --git a/app/client/src/pages/common/ErrorPageHeader.tsx b/app/client/src/pages/common/ErrorPageHeader.tsx
index 1908070711..6abc1bfadd 100644
--- a/app/client/src/pages/common/ErrorPageHeader.tsx
+++ b/app/client/src/pages/common/ErrorPageHeader.tsx
@@ -40,12 +40,12 @@ const HeaderSection = styled.div`
 
 const StyledDropDownContainer = styled.div``;
 
-type ErrorPageHeaderProps = {
+interface ErrorPageHeaderProps {
   user?: User;
   flushErrors?: any;
   flushErrorsAndRedirect?: any;
   safeCrash: boolean;
-};
+}
 
 export function ErrorPageHeader(props: ErrorPageHeaderProps) {
   const { flushErrors, flushErrorsAndRedirect, safeCrash, user } = props;
diff --git a/app/client/src/pages/common/ErrorPages/Components/PageErrorMessage.tsx b/app/client/src/pages/common/ErrorPages/Components/PageErrorMessage.tsx
index 788e087213..8531ac1d1f 100644
--- a/app/client/src/pages/common/ErrorPages/Components/PageErrorMessage.tsx
+++ b/app/client/src/pages/common/ErrorPages/Components/PageErrorMessage.tsx
@@ -1,7 +1,7 @@
 import classNames from "classnames";
 import React from "react";
 
-export type PageErrorMessageProps = {
+export interface PageErrorMessageProps {
   text: string;
   links?: Array<{
     from: number;
@@ -9,7 +9,7 @@ export type PageErrorMessageProps = {
     href: string;
   }>;
   addNewLine?: boolean;
-};
+}
 
 export function PageErrorMessage(props: { data: PageErrorMessageProps }) {
   const errorMessage = props.data;
diff --git a/app/client/src/pages/common/ErrorPages/Page.tsx b/app/client/src/pages/common/ErrorPages/Page.tsx
index 2b7e36aca4..7bea60d6f8 100644
--- a/app/client/src/pages/common/ErrorPages/Page.tsx
+++ b/app/client/src/pages/common/ErrorPages/Page.tsx
@@ -16,7 +16,7 @@ const ErrorIconContainer = styled.div`
   }
 `;
 
-type PageProps = {
+interface PageProps {
   children?: React.ReactNode;
   errorCode?: string | number;
   errorIcon?: React.ReactNode;
@@ -25,7 +25,7 @@ type PageProps = {
   cta?: React.ReactNode;
   flushErrorsAndRedirect?: any;
   errorMessages?: PageErrorMessageProps[];
-};
+}
 
 function Page(props: PageProps) {
   const { cta, description, errorCode, errorIcon, title } = props;
diff --git a/app/client/src/pages/common/ErrorPages/PageNotFound.tsx b/app/client/src/pages/common/ErrorPages/PageNotFound.tsx
index 6573feb478..504ad25ed1 100644
--- a/app/client/src/pages/common/ErrorPages/PageNotFound.tsx
+++ b/app/client/src/pages/common/ErrorPages/PageNotFound.tsx
@@ -13,9 +13,9 @@ import AnalyticsUtil from "utils/AnalyticsUtil";
 
 import Page from "./Page";
 
-type Props = {
+interface Props {
   flushErrorsAndRedirect: any;
-};
+}
 
 function PageNotFound(props: Props) {
   const { flushErrorsAndRedirect } = props;
diff --git a/app/client/src/pages/common/MobileSidebar.tsx b/app/client/src/pages/common/MobileSidebar.tsx
index 1a8ea994bc..bd25d1bd37 100644
--- a/app/client/src/pages/common/MobileSidebar.tsx
+++ b/app/client/src/pages/common/MobileSidebar.tsx
@@ -25,12 +25,12 @@ import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
 import { getAdminSettingsPath } from "@appsmith/utils/BusinessFeatures/adminSettingsHelpers";
 
-type MobileSideBarProps = {
+interface MobileSideBarProps {
   name: string;
   isOpen: boolean;
   userName?: string;
   photoId?: string;
-};
+}
 
 const MainContainer = styled.div<{ isOpen: boolean }>`
   position: absolute;
@@ -86,7 +86,7 @@ const LeftPaneVersionData = styled.div`
 export default function MobileSideBar(props: MobileSideBarProps) {
   const user = useSelector(getCurrentUser);
   const tenantPermissions = useSelector(getTenantPermissions);
-  const { appVersion, cloudHosting } = getAppsmithConfigs();
+  const { appVersion } = getAppsmithConfigs();
   const howMuchTimeBefore = howMuchTimeBeforeText(appVersion.releaseDate);
   const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
 
@@ -156,7 +156,6 @@ export default function MobileSideBar(props: MobileSideBarProps) {
             APPSMITH_DISPLAY_VERSION,
             appVersion.edition,
             appVersion.id,
-            cloudHosting,
           )}
         </span>
         {howMuchTimeBefore !== "" && (
diff --git a/app/client/src/pages/common/PageHeader.tsx b/app/client/src/pages/common/PageHeader.tsx
index c365787e45..44f8e11f20 100644
--- a/app/client/src/pages/common/PageHeader.tsx
+++ b/app/client/src/pages/common/PageHeader.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useMemo, useEffect } from "react";
-import { Link, useLocation } from "react-router-dom";
+import { Link, useLocation, useRouteMatch } from "react-router-dom";
 import { connect, useDispatch, useSelector } from "react-redux";
 import { getCurrentUser } from "selectors/usersSelectors";
 import styled from "styled-components";
@@ -22,7 +22,10 @@ import ProfileDropdown from "./ProfileDropdown";
 import { useIsMobileDevice } from "utils/hooks/useDeviceDetect";
 import MobileSideBar from "./MobileSidebar";
 import { getTemplateNotificationSeenAction } from "actions/templateActions";
-import { getTenantConfig } from "@appsmith/selectors/tenantSelectors";
+import {
+  getTenantConfig,
+  shouldShowLicenseBanner,
+} from "@appsmith/selectors/tenantSelectors";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import { Button } from "design-system";
 import { getSelectedAppTheme } from "selectors/appThemingSelectors";
@@ -30,12 +33,14 @@ import { getCurrentApplication } from "selectors/editorSelectors";
 import { get } from "lodash";
 import { NAVIGATION_SETTINGS } from "constants/AppConstants";
 import { getAssetUrl, isAirgapped } from "@appsmith/utils/airgapHelpers";
+import { Banner } from "@appsmith/utils/licenseHelpers";
 
 const StyledPageHeader = styled(StyledHeader)<{
   hideShadow?: boolean;
   isMobile?: boolean;
   showSeparator?: boolean;
   showingTabs: boolean;
+  isBannerVisible?: boolean;
 }>`
   justify-content: normal;
   background: var(--ads-v2-color-bg);
@@ -51,6 +56,7 @@ const StyledPageHeader = styled(StyledHeader)<{
     padding: 0 12px;
     padding-left: 10px;
   `};
+  ${({ isBannerVisible }) => isBannerVisible && `top: 40px;`};
 `;
 
 const HeaderSection = styled.div`
@@ -130,12 +136,12 @@ const Tab = styled.div<{ isSelected: boolean }>`
   }
 `;
 
-type PageHeaderProps = {
+interface PageHeaderProps {
   user?: User;
   hideShadow?: boolean;
   showSeparator?: boolean;
   hideEditProfileLink?: boolean;
-};
+}
 
 export function PageHeader(props: PageHeaderProps) {
   const { user } = props;
@@ -188,104 +194,111 @@ export function PageHeader(props: PageHeaderProps) {
   }, [location.pathname]);
 
   const isAirgappedInstance = isAirgapped();
+  const showBanner = useSelector(shouldShowLicenseBanner);
+  const isHomePage = useRouteMatch("/applications")?.isExact;
+  const isLicensePage = useRouteMatch("/license")?.isExact;
 
   return (
-    <StyledPageHeader
-      data-testid="t--appsmith-page-header"
-      hideShadow={props.hideShadow || false}
-      isMobile={isMobile}
-      showSeparator={props.showSeparator || false}
-      showingTabs={showTabs}
-    >
-      <HeaderSection>
-        {tenantConfig.brandLogoUrl && (
-          <Link className="t--appsmith-logo" to={APPLICATIONS_URL}>
-            <img
-              alt="Logo"
-              className="h-6"
-              src={getAssetUrl(tenantConfig.brandLogoUrl)}
-            />
-          </Link>
-        )}
-      </HeaderSection>
-      <Tabs>
-        {showTabs && !isMobile && (
-          <TabsList>
-            <Tab
-              className="t--apps-tab"
-              isSelected={matchApplicationPath(location.pathname)}
-              onClick={() => history.push(APPLICATIONS_URL)}
-            >
-              <div>Apps</div>
-            </Tab>
-
-            {!isAirgappedInstance && (
-              <Tab
-                className="t--templates-tab"
-                isSelected={
-                  matchTemplatesPath(location.pathname) ||
-                  matchTemplatesIdPath(location.pathname)
-                }
-                onClick={() => {
-                  AnalyticsUtil.logEvent("TEMPLATES_TAB_CLICK");
-                  history.push(TEMPLATES_PATH);
-                }}
-              >
-                <div>Templates</div>
-              </Tab>
-            )}
-          </TabsList>
-        )}
-      </Tabs>
-
-      {user && !isMobile && (
-        <div>
-          {user.username === ANONYMOUS_USERNAME ? (
-            <EditorButton
-              filled
-              intent={"primary"}
-              onClick={() => history.push(loginUrl)}
-              size="small"
-              text="Sign In"
-            />
-          ) : (
-            <ProfileDropdown
-              hideEditProfileLink={props.hideEditProfileLink}
-              name={user.name}
-              navColorStyle={navColorStyle}
-              photoId={user?.photoId}
-              primaryColor={primaryColor}
-              userName={user.username}
-            />
+    <>
+      <Banner />
+      <StyledPageHeader
+        data-testid="t--appsmith-page-header"
+        hideShadow={props.hideShadow || false}
+        isBannerVisible={showBanner && (isHomePage || isLicensePage)}
+        isMobile={isMobile}
+        showSeparator={props.showSeparator || false}
+        showingTabs={showTabs}
+      >
+        <HeaderSection>
+          {tenantConfig.brandLogoUrl && (
+            <Link className="t--appsmith-logo" to={APPLICATIONS_URL}>
+              <img
+                alt="Logo"
+                className="h-6"
+                src={getAssetUrl(tenantConfig.brandLogoUrl)}
+              />
+            </Link>
           )}
-        </div>
-      )}
-      {isMobile && !isMobileSidebarOpen && (
-        <Button
-          isIconButton
-          kind="tertiary"
-          onClick={() => setIsMobileSidebarOpen(true)}
-          size={"md"}
-          startIcon="hamburger"
-        />
-      )}
-      {isMobile && isMobileSidebarOpen && (
-        <Button
-          isIconButton
-          kind="tertiary"
-          onClick={() => setIsMobileSidebarOpen(false)}
-          size="sm"
-          startIcon="close-x"
-        />
-      )}
-      {isMobile && user && (
-        <MobileSideBar
-          isOpen={isMobileSidebarOpen}
-          name={user.name}
-          userName={user.username}
-        />
-      )}
-    </StyledPageHeader>
+        </HeaderSection>
+        <Tabs>
+          {showTabs && !isMobile && (
+            <TabsList>
+              <Tab
+                className="t--apps-tab"
+                isSelected={matchApplicationPath(location.pathname)}
+                onClick={() => history.push(APPLICATIONS_URL)}
+              >
+                <div>Apps</div>
+              </Tab>
+
+              {!isAirgappedInstance && (
+                <Tab
+                  className="t--templates-tab"
+                  isSelected={
+                    matchTemplatesPath(location.pathname) ||
+                    matchTemplatesIdPath(location.pathname)
+                  }
+                  onClick={() => {
+                    AnalyticsUtil.logEvent("TEMPLATES_TAB_CLICK");
+                    history.push(TEMPLATES_PATH);
+                  }}
+                >
+                  <div>Templates</div>
+                </Tab>
+              )}
+            </TabsList>
+          )}
+        </Tabs>
+
+        {user && !isMobile && (
+          <div>
+            {user.username === ANONYMOUS_USERNAME ? (
+              <EditorButton
+                filled
+                intent={"primary"}
+                onClick={() => history.push(loginUrl)}
+                size="small"
+                text="Sign In"
+              />
+            ) : (
+              <ProfileDropdown
+                hideEditProfileLink={props.hideEditProfileLink}
+                name={user.name}
+                navColorStyle={navColorStyle}
+                photoId={user?.photoId}
+                primaryColor={primaryColor}
+                userName={user.username}
+              />
+            )}
+          </div>
+        )}
+        {isMobile && !isMobileSidebarOpen && (
+          <Button
+            isIconButton
+            kind="tertiary"
+            onClick={() => setIsMobileSidebarOpen(true)}
+            size={"md"}
+            startIcon="hamburger"
+          />
+        )}
+        {isMobile && isMobileSidebarOpen && (
+          <Button
+            isIconButton
+            kind="tertiary"
+            onClick={() => setIsMobileSidebarOpen(false)}
+            size="sm"
+            startIcon="close-x"
+          />
+        )}
+        {isMobile && user && (
+          <MobileSideBar
+            isOpen={isMobileSidebarOpen}
+            name={user.name}
+            userName={user.username}
+          />
+        )}
+      </StyledPageHeader>
+    </>
   );
 }
 
diff --git a/app/client/src/pages/common/PageWrapper.tsx b/app/client/src/pages/common/PageWrapper.tsx
index 00092f0325..8bd185cc61 100644
--- a/app/client/src/pages/common/PageWrapper.tsx
+++ b/app/client/src/pages/common/PageWrapper.tsx
@@ -2,7 +2,6 @@ import type { ReactNode } from "react";
 import React, { useMemo } from "react";
 import { Helmet } from "react-helmet";
 import styled from "styled-components";
-import { Banner } from "@appsmith/utils/licenseHelpers";
 import {
   getPageTitle,
   getHTMLPageTitle,
@@ -57,12 +56,12 @@ export const PageBody = styled.div<{ isSavable?: boolean }>`
   }
 `;
 
-export type PageWrapperProps = {
+export interface PageWrapperProps {
   children?: ReactNode;
   displayName?: string;
   isFixed?: boolean;
   isSavable?: boolean;
-};
+}
 
 export function PageWrapper(props: PageWrapperProps) {
   const { isFixed = false, isSavable = false } = props;
@@ -84,7 +83,6 @@ export function PageWrapper(props: PageWrapperProps) {
 
   return (
     <Wrapper isFixed={isFixed}>
-      <Banner />
       <Helmet>
         <title>{pageTitle}</title>
       </Helmet>
diff --git a/app/client/src/pages/common/SearchSnippets.tsx b/app/client/src/pages/common/SearchSnippets.tsx
index 162b8c8633..e527bbe386 100644
--- a/app/client/src/pages/common/SearchSnippets.tsx
+++ b/app/client/src/pages/common/SearchSnippets.tsx
@@ -9,14 +9,14 @@ export enum ENTITY_TYPE {
   JSACTION = "JSACTION",
 }
 
-type Props = {
+interface Props {
   className?: string;
   entityId?: string;
   entityType: ENTITY_TYPE;
   // TODO: be more precise with the function type
   onClick: any;
   showIconOnly?: boolean;
-};
+}
 
 export default function SearchSnippets(props: Props) {
   const className = props.className || "";
diff --git a/app/client/src/pages/common/SubHeader.tsx b/app/client/src/pages/common/SubHeader.tsx
index ea5e9758d6..431a7270a2 100644
--- a/app/client/src/pages/common/SubHeader.tsx
+++ b/app/client/src/pages/common/SubHeader.tsx
@@ -55,7 +55,7 @@ const MultipleDeleteWrapper = styled.div`
   gap: 8px;
 `;
 
-type SubHeaderProps = {
+interface SubHeaderProps {
   add?: {
     form: ReactNode;
     title: string;
@@ -73,7 +73,7 @@ type SubHeaderProps = {
     defaultValue?: string;
   };
   isBannerVisible?: boolean;
-};
+}
 
 export function ApplicationsSubHeader(props: SubHeaderProps) {
   const [showModal, setShowModal] = useState(false);
diff --git a/app/client/src/pages/common/SuccessTick.tsx b/app/client/src/pages/common/SuccessTick.tsx
index a1c9f1a91e..d423dd50a0 100644
--- a/app/client/src/pages/common/SuccessTick.tsx
+++ b/app/client/src/pages/common/SuccessTick.tsx
@@ -33,7 +33,8 @@ const CheckmarkWrapper = styled.div<{ $height: string; $width: string }>`
     stroke-miterlimit: 10;
     margin: 10% auto;
     box-shadow: inset 0px 0px 0px #7ac142;
-    animation: fill 0.4s ease-in-out 0.4s forwards,
+    animation:
+      fill 0.4s ease-in-out 0.4s forwards,
       scale 0.3s ease-in-out 0.9s both;
   }
 
diff --git a/app/client/src/pages/common/datasourceAuth/AuthMessage.tsx b/app/client/src/pages/common/datasourceAuth/AuthMessage.tsx
index f2be6c97ce..ff440f6cc8 100644
--- a/app/client/src/pages/common/datasourceAuth/AuthMessage.tsx
+++ b/app/client/src/pages/common/datasourceAuth/AuthMessage.tsx
@@ -30,7 +30,7 @@ const StyledAuthMessage = styled.div<{ isInViewMode: boolean }>`
     `margin-top: var(--ads-v2-spaces-5);margin-bottom: var(--ads-v2-spaces-4);`}
 `;
 
-type AuthMessageProps = {
+interface AuthMessageProps {
   // We can handle for other action types as well eg. save, delete etc.
   actionType?: string;
   datasource: Datasource;
@@ -39,7 +39,7 @@ type AuthMessageProps = {
   style?: any;
   calloutType?: CalloutKind;
   isInViewMode?: boolean;
-};
+}
 
 export default function AuthMessage(props: AuthMessageProps) {
   const {
@@ -47,9 +47,9 @@ export default function AuthMessage(props: AuthMessageProps) {
     calloutType = "error",
     datasource,
     description,
+    isInViewMode = false,
     pageId,
     style = {},
-    isInViewMode = false,
   } = props;
   const dispatch = useDispatch();
   const pluginType = useSelector((state: AppState) =>
diff --git a/app/client/src/pages/common/datasourceAuth/index.tsx b/app/client/src/pages/common/datasourceAuth/index.tsx
index 04d26e0ada..8e806a6e76 100644
--- a/app/client/src/pages/common/datasourceAuth/index.tsx
+++ b/app/client/src/pages/common/datasourceAuth/index.tsx
@@ -30,7 +30,7 @@ import { Button, toast } from "design-system";
 import type { ApiDatasourceForm } from "entities/Datasource/RestAPIForm";
 import { TEMP_DATASOURCE_ID } from "constants/Datasource";
 import { INTEGRATION_TABS, SHOW_FILE_PICKER_KEY } from "constants/routes";
-import { integrationEditorURL } from "RouteBuilder";
+import { integrationEditorURL } from "@appsmith/RouteBuilder";
 import { getQueryParams } from "utils/URLUtils";
 import type { AppsmithLocationState } from "utils/history";
 import type { PluginType } from "entities/Action";
@@ -134,20 +134,20 @@ function DatasourceAuth({
   ],
   formData,
   getSanitizedFormData,
+  isFormDirty,
+  isInsideReconnectModal,
   isInvalid,
-  pageId: pageIdProp = "",
-  pluginType,
-  pluginName,
-  pluginPackageName,
   isSaving,
   isTesting,
-  viewMode,
+  onCancel,
+  pageId: pageIdProp = "",
+  pluginName,
+  pluginPackageName,
+  pluginType,
+  scopeValue,
   shouldDisplayAuthMessage = true,
   triggerSave,
-  isFormDirty,
-  scopeValue,
-  isInsideReconnectModal,
-  onCancel,
+  viewMode,
 }: Props) {
   const shouldRender = !viewMode || isInsideReconnectModal;
   const authType =
diff --git a/app/client/src/pages/setup/GetStarted.tsx b/app/client/src/pages/setup/GetStarted.tsx
index cc08af1d73..e5f0408b6a 100644
--- a/app/client/src/pages/setup/GetStarted.tsx
+++ b/app/client/src/pages/setup/GetStarted.tsx
@@ -32,14 +32,14 @@ const StyledButton = styled(Button)`
   margin-top: ${(props) => props.theme.spaces[3]}px;
 `;
 
-type UserFormProps = {
+interface UserFormProps {
   onGetStarted?: (proficiency?: string, useCase?: string) => void;
-};
+}
 
-type NonSuperUserFormData = {
+interface NonSuperUserFormData {
   proficiency?: string;
   useCase?: string;
-};
+}
 
 export function SuperUserForm() {
   return (
diff --git a/app/client/src/pages/setup/NonSuperUserWelcome.tsx b/app/client/src/pages/setup/NonSuperUserWelcome.tsx
index 8ff6b02974..e37eed13bf 100644
--- a/app/client/src/pages/setup/NonSuperUserWelcome.tsx
+++ b/app/client/src/pages/setup/NonSuperUserWelcome.tsx
@@ -73,9 +73,9 @@ const StyledImageBanner = styled.div`
 const getWelcomeImage = () => `${ASSETS_CDN_URL}/welcome-banner-v2.svg`;
 const getAppsmithLogo = () => `${ASSETS_CDN_URL}/appsmith-logo.svg`;
 
-type LandingPageProps = {
+interface LandingPageProps {
   onGetStarted?: (proficiency?: string, useCase?: string) => void;
-};
+}
 
 const WELCOME_PAGE_ANIMATION_CONTAINER = "welcome-page-animation-container";
 
diff --git a/app/client/src/pages/setup/SetupForm.tsx b/app/client/src/pages/setup/SetupForm.tsx
index 03006beaa1..057263aab5 100644
--- a/app/client/src/pages/setup/SetupForm.tsx
+++ b/app/client/src/pages/setup/SetupForm.tsx
@@ -49,7 +49,7 @@ const SpaceFiller = styled.div`
   height: 100px;
 `;
 
-export type DetailsFormValues = {
+export interface DetailsFormValues {
   firstName?: string;
   lastName?: string;
   email?: string;
@@ -58,7 +58,7 @@ export type DetailsFormValues = {
   proficiency?: string;
   useCase?: string;
   custom_useCase?: string;
-};
+}
 
 export const firstpageValues = [
   "firstName",
diff --git a/app/client/src/pages/setup/Welcome.tsx b/app/client/src/pages/setup/Welcome.tsx
index 538b336cd7..3b780dd9d2 100644
--- a/app/client/src/pages/setup/Welcome.tsx
+++ b/app/client/src/pages/setup/Welcome.tsx
@@ -2,10 +2,10 @@ import React from "react";
 import SuperUserWelcome from "./SuperUserWelcome";
 import NonSuperUserWelcome from "./NonSuperUserWelcome";
 
-type LandingPageProps = {
+interface LandingPageProps {
   onGetStarted?: (role?: string, useCase?: string) => void;
   forSuperUser: boolean;
-};
+}
 
 export default function LandingPage(props: LandingPageProps) {
   return props.forSuperUser ? (
diff --git a/app/client/src/pages/setup/constants.ts b/app/client/src/pages/setup/constants.ts
index 7ed2072b7e..f5496f5ad9 100644
--- a/app/client/src/pages/setup/constants.ts
+++ b/app/client/src/pages/setup/constants.ts
@@ -1,7 +1,7 @@
-export type OptionType = {
+export interface OptionType {
   label?: string;
   value?: string;
-};
+}
 
 export const roleOptions: OptionType[] = [
   {
diff --git a/app/client/src/pages/tests/slug.test.tsx b/app/client/src/pages/tests/slug.test.tsx
index aa158edff0..7dd7b29d0b 100644
--- a/app/client/src/pages/tests/slug.test.tsx
+++ b/app/client/src/pages/tests/slug.test.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import { ApplicationVersion } from "@appsmith/actions/applicationActions";
-import { builderURL } from "RouteBuilder";
+import { builderURL } from "@appsmith/RouteBuilder";
 import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 import { selectURLSlugs } from "selectors/editorSelectors";
 import store from "store";
@@ -20,7 +20,7 @@ import {
 } from "./mockData";
 import ManualUpgrades from "components/BottomBar/ManualUpgrades";
 import { updateCurrentPage } from "actions/pageActions";
-import urlBuilder from "entities/URLRedirect/URLAssembly";
+import urlBuilder from "@appsmith/entities/URLRedirect/URLAssembly";
 import { Button } from "design-system";
 
 describe("URL slug names", () => {
diff --git a/app/client/src/pages/workspace/AppInviteUsersForm.tsx b/app/client/src/pages/workspace/AppInviteUsersForm.tsx
index 91e6b7a857..099fd0d3cf 100644
--- a/app/client/src/pages/workspace/AppInviteUsersForm.tsx
+++ b/app/client/src/pages/workspace/AppInviteUsersForm.tsx
@@ -11,7 +11,7 @@ import {
 import WorkspaceInviteUsersForm from "pages/workspace/WorkspaceInviteUsersForm";
 import { getCurrentUser } from "selectors/usersSelectors";
 import { ANONYMOUS_USERNAME } from "constants/userConstants";
-import { viewerURL } from "RouteBuilder";
+import { viewerURL } from "@appsmith/RouteBuilder";
 import { fetchWorkspace } from "@appsmith/actions/workspaceActions";
 import {
   createMessage,
diff --git a/app/client/src/pages/workspace/DeleteConfirmationModal.tsx b/app/client/src/pages/workspace/DeleteConfirmationModal.tsx
index a1e905895d..d3ee63916d 100644
--- a/app/client/src/pages/workspace/DeleteConfirmationModal.tsx
+++ b/app/client/src/pages/workspace/DeleteConfirmationModal.tsx
@@ -13,7 +13,7 @@ import {
   DELETE_CONFIRMATION_MODAL_SUBTITLE,
 } from "@appsmith/constants/messages";
 
-type DeleteConfirmationProps = {
+interface DeleteConfirmationProps {
   userToBeDeleted: {
     name: string;
     username: string;
@@ -26,7 +26,7 @@ type DeleteConfirmationProps = {
   onClose: () => void;
   onConfirm: () => void;
   isDeletingUser: boolean;
-};
+}
 
 function DeleteConfirmationModal(props: DeleteConfirmationProps) {
   const { isDeletingUser, isOpen, onClose, onConfirm, userToBeDeleted } = props;
diff --git a/app/client/src/pages/workspace/PartnerProgramCallout.tsx b/app/client/src/pages/workspace/PartnerProgramCallout.tsx
index 338cc85748..8f746bc100 100644
--- a/app/client/src/pages/workspace/PartnerProgramCallout.tsx
+++ b/app/client/src/pages/workspace/PartnerProgramCallout.tsx
@@ -7,10 +7,10 @@ import {
   createMessage,
 } from "@appsmith/constants/messages";
 
-type PartnerProgramCalloutProps = {
+interface PartnerProgramCalloutProps {
   email: string;
   onClose: () => void;
-};
+}
 
 export default function PartnerProgramCallout(
   props: PartnerProgramCalloutProps,
diff --git a/app/client/src/pages/workspace/SettingsPageHeader.tsx b/app/client/src/pages/workspace/SettingsPageHeader.tsx
index 63818190bc..cfabc50f65 100644
--- a/app/client/src/pages/workspace/SettingsPageHeader.tsx
+++ b/app/client/src/pages/workspace/SettingsPageHeader.tsx
@@ -15,7 +15,7 @@ import { SettingsHeader } from "components/utils/helperComponents";
 import { ARE_YOU_SURE, createMessage } from "@appsmith/constants/messages";
 import { useMediaQuery } from "react-responsive";
 
-type PageHeaderProps = {
+interface PageHeaderProps {
   buttonText?: string;
   searchPlaceholder: string;
   onButtonClick?: () => void;
@@ -24,7 +24,7 @@ type PageHeaderProps = {
   title?: string;
   showMoreOptions?: boolean;
   showSearchNButton?: boolean;
-};
+}
 
 const Container = styled.div<{ isMobile?: boolean }>`
   display: flex;
diff --git a/app/client/src/pages/workspace/settings.tsx b/app/client/src/pages/workspace/settings.tsx
index f1f59cdadd..a7c6322270 100644
--- a/app/client/src/pages/workspace/settings.tsx
+++ b/app/client/src/pages/workspace/settings.tsx
@@ -37,12 +37,12 @@ import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
 
 const SentryRoute = Sentry.withSentryRouting(Route);
 
-type TabProp = {
+interface TabProp {
   key: string;
   title: string;
   count?: number;
   panelComponent?: JSX.Element;
-};
+}
 
 const SettingsWrapper = styled.div<{
   isMobile?: boolean;
diff --git a/app/client/src/plugins/Linting/Linter.ts b/app/client/src/plugins/Linting/Linter.ts
index ed343339a3..87eba9714e 100644
--- a/app/client/src/plugins/Linting/Linter.ts
+++ b/app/client/src/plugins/Linting/Linter.ts
@@ -1,3 +1,4 @@
+import type { FeatureFlags } from "@appsmith/entities/FeatureFlag";
 import type { ILinter } from "./linters";
 import { WorkerLinter } from "./linters";
 import type { LintTreeRequestPayload, updateJSLibraryProps } from "./types";
@@ -10,6 +11,7 @@ export class Linter {
     this.updateJSLibraryGlobals = this.updateJSLibraryGlobals.bind(this);
     this.start = this.start.bind(this);
     this.shutdown = this.shutdown.bind(this);
+    this.setup = this.setup.bind(this);
   }
   *lintTree(data: LintTreeRequestPayload) {
     return yield* this.linter.lintTree(data);
@@ -23,4 +25,7 @@ export class Linter {
   *shutdown() {
     yield this.linter.shutdown();
   }
+  *setup(featureFlags: FeatureFlags) {
+    yield this.linter.setup(featureFlags);
+  }
 }
diff --git a/app/client/src/plugins/Linting/constants.ts b/app/client/src/plugins/Linting/constants.ts
index c985f1a90b..5c04ff6e24 100644
--- a/app/client/src/plugins/Linting/constants.ts
+++ b/app/client/src/plugins/Linting/constants.ts
@@ -27,7 +27,7 @@ export const lintOptions = (globalData: Record<string, boolean>) =>
     // global values
     globals: globalData,
     loopfunc: true,
-  } as LintOptions);
+  }) as LintOptions;
 export const JS_OBJECT_START_STATEMENT = "export default";
 export const INVALID_JSOBJECT_START_STATEMENT = `JSObject must start with '${JS_OBJECT_START_STATEMENT}'`;
 export const INVALID_JSOBJECT_START_STATEMENT_ERROR_CODE =
diff --git a/app/client/src/plugins/Linting/globalData.ts b/app/client/src/plugins/Linting/globalData.ts
index 8a2f1e5da1..d16e08ac13 100644
--- a/app/client/src/plugins/Linting/globalData.ts
+++ b/app/client/src/plugins/Linting/globalData.ts
@@ -1,4 +1,4 @@
-import type { ConfigTree, DataTree } from "@appsmith/entities/DataTree/types";
+import type { ConfigTree, DataTree } from "entities/DataTree/dataTreeTypes";
 import { isEmpty } from "lodash";
 import type { EvalContext } from "workers/Evaluation/evaluate";
 import { getEvaluationContext } from "./utils/getEvaluationContext";
diff --git a/app/client/src/plugins/Linting/handlers/index.ts b/app/client/src/plugins/Linting/handlers/index.ts
index 3db9823e8b..286a264c39 100644
--- a/app/client/src/plugins/Linting/handlers/index.ts
+++ b/app/client/src/plugins/Linting/handlers/index.ts
@@ -1,8 +1,10 @@
 import { LINT_WORKER_ACTIONS } from "plugins/Linting/types";
 import { updateJSLibraryGlobals } from "./updateJSLibraryGlobals";
 import { lintService } from "./lintService";
+import { setupLintingWorkerEnv } from "./setupLinkingWorkerEnv";
 
 export const handlerMap = {
   [LINT_WORKER_ACTIONS.LINT_TREE]: lintService.lintTree,
   [LINT_WORKER_ACTIONS.UPDATE_LINT_GLOBALS]: updateJSLibraryGlobals,
+  [LINT_WORKER_ACTIONS.SETUP]: setupLintingWorkerEnv,
 } as const;
diff --git a/app/client/src/plugins/Linting/handlers/lintService.ts b/app/client/src/plugins/Linting/handlers/lintService.ts
index 9eb7c8913f..7cf77eeab4 100644
--- a/app/client/src/plugins/Linting/handlers/lintService.ts
+++ b/app/client/src/plugins/Linting/handlers/lintService.ts
@@ -318,9 +318,12 @@ class LintService {
 }
 
 function convertArrayToObject(arr: string[]) {
-  return arr.reduce((acc, item) => {
-    return { ...acc, [item]: true } as const;
-  }, {} as Record<string, true>);
+  return arr.reduce(
+    (acc, item) => {
+      return { ...acc, [item]: true } as const;
+    },
+    {} as Record<string, true>,
+  );
 }
 
 function filterDataPaths(paths: string[], entityTree: EntityTree) {
diff --git a/app/client/src/plugins/Linting/handlers/setupLinkingWorkerEnv.ts b/app/client/src/plugins/Linting/handlers/setupLinkingWorkerEnv.ts
new file mode 100644
index 0000000000..89afebc362
--- /dev/null
+++ b/app/client/src/plugins/Linting/handlers/setupLinkingWorkerEnv.ts
@@ -0,0 +1,6 @@
+import type { FeatureFlags } from "@appsmith/entities/FeatureFlag";
+import { WorkerEnv } from "workers/Evaluation/handlers/workerEnv";
+
+export const setupLintingWorkerEnv = (featureFlags: FeatureFlags) => {
+  WorkerEnv.setFeatureFlags(featureFlags);
+};
diff --git a/app/client/src/plugins/Linting/lib/entity/EntityTree.ts b/app/client/src/plugins/Linting/lib/entity/EntityTree.ts
index b69b880ea1..fe088a6d31 100644
--- a/app/client/src/plugins/Linting/lib/entity/EntityTree.ts
+++ b/app/client/src/plugins/Linting/lib/entity/EntityTree.ts
@@ -2,7 +2,7 @@ import type {
   ConfigTree,
   DataTree,
   DataTreeEntity,
-} from "@appsmith/entities/DataTree/types";
+} from "entities/DataTree/dataTreeTypes";
 import type { IEntity } from ".";
 import type { Diff } from "deep-diff";
 import EntityFactory from ".";
diff --git a/app/client/src/plugins/Linting/lib/entity/index.ts b/app/client/src/plugins/Linting/lib/entity/index.ts
index 1309c50502..3c99d5a5ec 100644
--- a/app/client/src/plugins/Linting/lib/entity/index.ts
+++ b/app/client/src/plugins/Linting/lib/entity/index.ts
@@ -8,7 +8,6 @@ import type {
   WidgetEntity as TWidgetEntity,
   AppsmithEntity as TAppsmithEntity,
   DataTreeEntityConfig,
-  DataTreeEntity,
   WidgetEntityConfig as TWidgetEntityConfig,
   JSActionEntity as TJSActionEntity,
   ActionEntity as TActionEntity,
@@ -16,6 +15,7 @@ import type {
   ActionEntityConfig as TActionEntityConfig,
   JSActionEntityConfig as TJSActionEntityConfig,
 } from "@appsmith/entities/DataTree/types";
+import type { DataTreeEntity } from "entities/DataTree/dataTreeTypes";
 import {
   defaultDiffGenerator,
   type EntityDiffGenerator,
diff --git a/app/client/src/plugins/Linting/linters/index.ts b/app/client/src/plugins/Linting/linters/index.ts
index 06f32b1dd1..aca0f73499 100644
--- a/app/client/src/plugins/Linting/linters/index.ts
+++ b/app/client/src/plugins/Linting/linters/index.ts
@@ -4,12 +4,14 @@ import type {
   updateJSLibraryProps,
 } from "plugins/Linting/types";
 import { LINT_WORKER_ACTIONS as LINT_ACTIONS } from "plugins/Linting/types";
+import type { FeatureFlags } from "@appsmith/entities/FeatureFlag";
 
 export interface ILinter {
   lintTree(args: LintTreeRequestPayload): any;
   updateJSLibraryGlobals(args: updateJSLibraryProps): any;
   start(): void;
   shutdown(): void;
+  setup(args: FeatureFlags): any;
 }
 
 export class WorkerLinter implements ILinter {
@@ -23,6 +25,7 @@ export class WorkerLinter implements ILinter {
         name: "lintWorker",
       }),
     );
+    this.setup = this.setup.bind(this);
     this.start = this.start.bind(this);
     this.shutdown = this.shutdown.bind(this);
     this.lintTree = this.lintTree.bind(this);
@@ -40,4 +43,7 @@ export class WorkerLinter implements ILinter {
   *updateJSLibraryGlobals(args: updateJSLibraryProps) {
     return yield* this.server.request(LINT_ACTIONS.UPDATE_LINT_GLOBALS, args);
   }
+  *setup(args: FeatureFlags) {
+    return yield* this.server.request(LINT_ACTIONS.SETUP, args);
+  }
 }
diff --git a/app/client/src/plugins/Linting/types.ts b/app/client/src/plugins/Linting/types.ts
index 68c9371367..b3cfa00d0b 100644
--- a/app/client/src/plugins/Linting/types.ts
+++ b/app/client/src/plugins/Linting/types.ts
@@ -2,7 +2,7 @@ import type {
   ConfigTree,
   DataTree,
   DataTreeEntity,
-} from "@appsmith/entities/DataTree/types";
+} from "entities/DataTree/dataTreeTypes";
 import type { LintErrorsStore } from "reducers/lintingReducers/lintErrorsReducers";
 import type {
   createEvaluationContext,
@@ -15,6 +15,7 @@ import type { TJSLibrary } from "workers/common/JSLibrary";
 export enum LINT_WORKER_ACTIONS {
   LINT_TREE = "LINT_TREE",
   UPDATE_LINT_GLOBALS = "UPDATE_LINT_GLOBALS",
+  SETUP = "SETUP",
 }
 export interface LintTreeResponse {
   errors: LintErrorsStore;
@@ -29,16 +30,16 @@ export interface LintTreeRequestPayload {
   forceLinting?: boolean;
 }
 
-export type LintRequest = {
+export interface LintRequest {
   data: any;
   method: LINT_WORKER_ACTIONS;
-};
+}
 
-export type LintTreeSagaRequestData = {
+export interface LintTreeSagaRequestData {
   unevalTree: DataTree;
   configTree: ConfigTree;
   forceLinting?: boolean;
-};
+}
 export interface lintTriggerPathProps {
   userScript: string;
   entity: DataTreeEntity;
diff --git a/app/client/src/plugins/Linting/utils/entityParser.ts b/app/client/src/plugins/Linting/utils/entityParser.ts
index dd3ec465f1..34951d92a4 100644
--- a/app/client/src/plugins/Linting/utils/entityParser.ts
+++ b/app/client/src/plugins/Linting/utils/entityParser.ts
@@ -1,9 +1,9 @@
 import type {
-  DataTreeEntity,
   DataTreeEntityConfig,
   JSActionEntityConfig,
   JSActionEntity as TJSActionEntity,
 } from "@appsmith/entities/DataTree/types";
+import type { DataTreeEntity } from "entities/DataTree/dataTreeTypes";
 import { EvaluationSubstitutionType } from "@appsmith/entities/DataTree/types";
 import type { TParsedJSProperty } from "@shared/ast";
 import { isJSFunctionProperty } from "@shared/ast";
@@ -30,15 +30,15 @@ type TParsedJSEntity = Record<string, string> & {
 
 type TParsedJSEntityConfig = Record<string, TParsedJSProperty>;
 
-export type ParsedJSCache = {
+export interface ParsedJSCache {
   parsedEntity: ParsedEntity<TJSActionEntity>;
   parsedEntityConfig: TParsedJSEntityConfig;
-};
+}
 
-export type ParsedEntity<T> = {
+export interface ParsedEntity<T> {
   parsedEntity: Partial<T>;
   parsedEntityConfig: Record<string, unknown>;
-};
+}
 
 export class DefaultEntityParser implements EntityParser {
   parse<T extends DataTreeEntity>(entity: T) {
diff --git a/app/client/src/plugins/Linting/utils/getEntityDependencies.ts b/app/client/src/plugins/Linting/utils/getEntityDependencies.ts
index 31f514ac5c..acb66065e7 100644
--- a/app/client/src/plugins/Linting/utils/getEntityDependencies.ts
+++ b/app/client/src/plugins/Linting/utils/getEntityDependencies.ts
@@ -18,7 +18,7 @@ import type {
   JSEntity,
   WidgetEntity,
 } from "../lib/entity";
-import type { DataTreeEntity } from "@appsmith/entities/DataTree/types";
+import type { DataTreeEntity } from "entities/DataTree/dataTreeTypes";
 
 export function getEntityDependencies(
   entity: IEntity,
diff --git a/app/client/src/plugins/Linting/utils/getEvaluationContext.ts b/app/client/src/plugins/Linting/utils/getEvaluationContext.ts
index bf4b7b80fc..b90bd55c51 100644
--- a/app/client/src/plugins/Linting/utils/getEvaluationContext.ts
+++ b/app/client/src/plugins/Linting/utils/getEvaluationContext.ts
@@ -1,4 +1,4 @@
-import type { ConfigTree, DataTree } from "@appsmith/entities/DataTree/types";
+import type { ConfigTree, DataTree } from "entities/DataTree/dataTreeTypes";
 import { createEvaluationContext } from "workers/Evaluation/evaluate";
 import { getActionTriggerFunctionNames } from "@appsmith/workers/Evaluation/fns";
 
@@ -24,7 +24,7 @@ export function getEvaluationContext(
   });
 
   const platformFnNamesMap = Object.values(
-    getActionTriggerFunctionNames(cloudHosting),
+    getActionTriggerFunctionNames(),
   ).reduce(
     (acc, name) => ({ ...acc, [name]: true }),
     {} as { [x: string]: boolean },
diff --git a/app/client/src/plugins/Linting/utils/getJSToLint.ts b/app/client/src/plugins/Linting/utils/getJSToLint.ts
index d71e1805b2..ad5c9bedc3 100644
--- a/app/client/src/plugins/Linting/utils/getJSToLint.ts
+++ b/app/client/src/plugins/Linting/utils/getJSToLint.ts
@@ -1,4 +1,4 @@
-import type { DataTreeEntity } from "@appsmith/entities/DataTree/types";
+import type { DataTreeEntity } from "entities/DataTree/dataTreeTypes";
 import { isJSAction } from "@appsmith/workers/Evaluation/evaluationUtils";
 
 // Removes "export default" statement from js Object
diff --git a/app/client/src/plugins/Linting/utils/isEntityFunction.ts b/app/client/src/plugins/Linting/utils/isEntityFunction.ts
index f759e0f655..d982006be9 100644
--- a/app/client/src/plugins/Linting/utils/isEntityFunction.ts
+++ b/app/client/src/plugins/Linting/utils/isEntityFunction.ts
@@ -1,4 +1,4 @@
-import type { DataTreeEntity } from "@appsmith/entities/DataTree/types";
+import type { DataTreeEntity } from "entities/DataTree/dataTreeTypes";
 import { isDataTreeEntity } from "@appsmith/workers/Evaluation/evaluationUtils";
 import { entityFns } from "@appsmith/workers/Evaluation/fns";
 import setters from "workers/Evaluation/setters";
diff --git a/app/client/src/plugins/Linting/utils/lintJSObjectBody.ts b/app/client/src/plugins/Linting/utils/lintJSObjectBody.ts
index ba7ba31143..10da015c0c 100644
--- a/app/client/src/plugins/Linting/utils/lintJSObjectBody.ts
+++ b/app/client/src/plugins/Linting/utils/lintJSObjectBody.ts
@@ -1,7 +1,5 @@
-import type {
-  DataTree,
-  JSActionEntity,
-} from "@appsmith/entities/DataTree/types";
+import type { JSActionEntity } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import type { LintError } from "utils/DynamicBindingUtils";
 import { PropertyEvaluationErrorType } from "utils/DynamicBindingUtils";
 import { getScriptToEval, getScriptType } from "workers/Evaluation/evaluate";
diff --git a/app/client/src/plugins/Linting/utils/lintJSProperty.ts b/app/client/src/plugins/Linting/utils/lintJSProperty.ts
index e9f6ea2e7d..331b8335ee 100644
--- a/app/client/src/plugins/Linting/utils/lintJSProperty.ts
+++ b/app/client/src/plugins/Linting/utils/lintJSProperty.ts
@@ -1,4 +1,4 @@
-import type { DataTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import type { LintError } from "utils/DynamicBindingUtils";
 import { isNil } from "lodash";
 import {
diff --git a/app/client/src/plugins/Linting/utils/sortLintingPathsByType.ts b/app/client/src/plugins/Linting/utils/sortLintingPathsByType.ts
index cb863f9cf7..2c61bd3e24 100644
--- a/app/client/src/plugins/Linting/utils/sortLintingPathsByType.ts
+++ b/app/client/src/plugins/Linting/utils/sortLintingPathsByType.ts
@@ -1,4 +1,4 @@
-import type { DataTree, ConfigTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree, ConfigTree } from "entities/DataTree/dataTreeTypes";
 import {
   getEntityNameAndPropertyPath,
   isATriggerPath,
diff --git a/app/client/src/reducers/entityReducers/appReducer.ts b/app/client/src/reducers/entityReducers/appReducer.ts
index 722d7625d5..8e6774ef00 100644
--- a/app/client/src/reducers/entityReducers/appReducer.ts
+++ b/app/client/src/reducers/entityReducers/appReducer.ts
@@ -4,13 +4,13 @@ import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 import type { User } from "constants/userConstants";
 import type { APP_MODE } from "entities/App";
 
-export type AuthUserState = {
+export interface AuthUserState {
   username: string;
   email: string;
   id: string;
-};
+}
 
-export type UrlDataState = {
+export interface UrlDataState {
   queryParams: Record<string, string>;
   protocol: string;
   host: string;
@@ -19,11 +19,11 @@ export type UrlDataState = {
   pathname: string;
   hash: string;
   fullPath: string;
-};
+}
 
 export type AppStoreState = Record<string, unknown>;
 
-export type AppDataState = {
+export interface AppDataState {
   mode?: APP_MODE;
   user: AuthUserState;
   URL: UrlDataState;
@@ -32,7 +32,7 @@ export type AppDataState = {
     canBeRequested: boolean;
     currentPosition?: Partial<GeolocationPosition>;
   };
-};
+}
 
 const initialState: AppDataState = {
   user: {
diff --git a/app/client/src/reducers/entityReducers/autoHeightReducers/autoHeightLayoutTreeReducer.ts b/app/client/src/reducers/entityReducers/autoHeightReducers/autoHeightLayoutTreeReducer.ts
index 859681b8ce..a6ba0eb5b3 100644
--- a/app/client/src/reducers/entityReducers/autoHeightReducers/autoHeightLayoutTreeReducer.ts
+++ b/app/client/src/reducers/entityReducers/autoHeightReducers/autoHeightLayoutTreeReducer.ts
@@ -4,14 +4,14 @@ import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 import type { TreeNode } from "utils/autoHeight/constants";
 import { xor } from "lodash";
 
-export type AutoHeightLayoutTreePayload = {
+export interface AutoHeightLayoutTreePayload {
   tree: Record<string, TreeNode>;
   canvasLevelMap: Record<string, number>;
-};
+}
 
-export type AutoHeightLayoutTreeReduxState = {
+export interface AutoHeightLayoutTreeReduxState {
   [widgetId: string]: TreeNode;
-};
+}
 const initialState: AutoHeightLayoutTreeReduxState = {};
 
 const autoHeightLayoutTreeReducer = createImmerReducer(initialState, {
diff --git a/app/client/src/reducers/entityReducers/autoHeightReducers/canvasLevelsReducer.ts b/app/client/src/reducers/entityReducers/autoHeightReducers/canvasLevelsReducer.ts
index 88211dd59d..d922c3c8f1 100644
--- a/app/client/src/reducers/entityReducers/autoHeightReducers/canvasLevelsReducer.ts
+++ b/app/client/src/reducers/entityReducers/autoHeightReducers/canvasLevelsReducer.ts
@@ -5,9 +5,9 @@ import type { AutoHeightLayoutTreePayload } from "./autoHeightLayoutTreeReducer"
 
 export type CanvasLevelsPayload = Record<string, number>;
 
-export type CanvasLevelsReduxState = {
+export interface CanvasLevelsReduxState {
   [widgetId: string]: number;
-};
+}
 
 const initialState: CanvasLevelsReduxState = {};
 
diff --git a/app/client/src/reducers/entityReducers/canvasWidgetsStructureReducer.ts b/app/client/src/reducers/entityReducers/canvasWidgetsStructureReducer.ts
index 355ac524d2..02c3f1db76 100644
--- a/app/client/src/reducers/entityReducers/canvasWidgetsStructureReducer.ts
+++ b/app/client/src/reducers/entityReducers/canvasWidgetsStructureReducer.ts
@@ -16,14 +16,14 @@ export type FlattenedWidgetProps<orType = never> =
     })
   | orType;
 
-export type CanvasWidgetsStructureReduxState = {
+export interface CanvasWidgetsStructureReduxState {
   children?: CanvasWidgetsStructureReduxState[];
   type: WidgetType;
   widgetId: string;
   parentId?: string;
   bottomRow: number;
   topRow: number;
-};
+}
 
 const initialState: CanvasWidgetsStructureReduxState = {
   type: "CANVAS_WIDGET",
diff --git a/app/client/src/reducers/entityReducers/metaWidgetsReducer.ts b/app/client/src/reducers/entityReducers/metaWidgetsReducer.ts
index 4342250b92..f2438326f5 100644
--- a/app/client/src/reducers/entityReducers/metaWidgetsReducer.ts
+++ b/app/client/src/reducers/entityReducers/metaWidgetsReducer.ts
@@ -7,9 +7,9 @@ import type { WidgetProps } from "widgets/BaseWidget";
 import type { BatchPropertyUpdatePayload } from "actions/controlActions";
 import type { UpdateWidgetsPayload } from "./canvasWidgetsReducer";
 
-export type MetaWidgetsReduxState = {
+export interface MetaWidgetsReduxState {
   [widgetId: string]: FlattenedWidgetProps;
-};
+}
 
 export type FlattenedWidgetProps<orType = never> =
   | (WidgetProps & {
@@ -26,26 +26,26 @@ export type FlattenedWidgetProps<orType = never> =
  *  addOrUpdate/deleteIds. If a list widget creates creates/adds a bunch of meta widgets then
  *  the creatorId would be the list widget's widgetId.
  */
-export type ModifyMetaWidgetPayload = {
+export interface ModifyMetaWidgetPayload {
   addOrUpdate: Record<string, FlattenedWidgetProps>;
   deleteIds: string[];
   propertyUpdates?: MetaWidgetPropertyUpdate[];
   creatorId?: string;
-};
+}
 
-export type UpdateMetaWidgetPropertyPayload = {
+export interface UpdateMetaWidgetPropertyPayload {
   updates: BatchPropertyUpdatePayload;
   widgetId: string;
   creatorId?: string;
-};
-export type DeleteMetaWidgetsPayload = {
+}
+export interface DeleteMetaWidgetsPayload {
   creatorIds: string[];
-};
+}
 
-type MetaWidgetPropertyUpdate = {
+interface MetaWidgetPropertyUpdate {
   path: string;
   value: unknown;
-};
+}
 
 const initialState: MetaWidgetsReduxState = {};
 
diff --git a/app/client/src/reducers/entityReducers/pageListReducer.tsx b/app/client/src/reducers/entityReducers/pageListReducer.tsx
index fc2bee888e..acf24c650b 100644
--- a/app/client/src/reducers/entityReducers/pageListReducer.tsx
+++ b/app/client/src/reducers/entityReducers/pageListReducer.tsx
@@ -59,10 +59,13 @@ export const pageListReducer = createReducer(initialState, {
       Array<{ pageId: string; dsl: DSL; userPermissions: string[] }>
     >,
   ) => {
-    const pagePermissionsMap = action.payload.reduce((acc, page) => {
-      acc[page.pageId] = page.userPermissions;
-      return acc;
-    }, {} as Record<string, string[]>);
+    const pagePermissionsMap = action.payload.reduce(
+      (acc, page) => {
+        acc[page.pageId] = page.userPermissions;
+        return acc;
+      },
+      {} as Record<string, string[]>,
+    );
 
     return {
       ...state,
diff --git a/app/client/src/reducers/evaluationReducers/dependencyReducer.ts b/app/client/src/reducers/evaluationReducers/dependencyReducer.ts
index 54da2028cc..c614dda907 100644
--- a/app/client/src/reducers/evaluationReducers/dependencyReducer.ts
+++ b/app/client/src/reducers/evaluationReducers/dependencyReducer.ts
@@ -3,9 +3,9 @@ import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
 import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 import type { DependencyMap } from "utils/DynamicBindingUtils";
 
-export type EvaluationDependencyState = {
+export interface EvaluationDependencyState {
   inverseDependencyMap: DependencyMap;
-};
+}
 
 const initialState: EvaluationDependencyState = {
   inverseDependencyMap: {},
diff --git a/app/client/src/reducers/evaluationReducers/formEvaluationReducer.ts b/app/client/src/reducers/evaluationReducers/formEvaluationReducer.ts
index 717a35647c..59156e90e0 100644
--- a/app/client/src/reducers/evaluationReducers/formEvaluationReducer.ts
+++ b/app/client/src/reducers/evaluationReducers/formEvaluationReducer.ts
@@ -5,7 +5,7 @@ import type { FetchPageRequest } from "api/PageApi";
 import type { FormConfigType } from "components/formControls/BaseControl";
 
 // Type for the object that will store the dynamic values for each component
-export type DynamicValues = {
+export interface DynamicValues {
   allowedToFetch: boolean;
   isLoading: boolean;
   hasStarted: boolean;
@@ -14,20 +14,23 @@ export type DynamicValues = {
   config: DynamicValuesConfig;
   evaluatedConfig: DynamicValuesConfig;
   dynamicDependencyPathList?: Set<string> | undefined;
-};
+}
 
-export type DynamicValuesConfig = { url?: string; params: Record<string, any> };
+export interface DynamicValuesConfig {
+  url?: string;
+  params: Record<string, any>;
+}
 
-export type EvaluatedFormConfig = {
+export interface EvaluatedFormConfig {
   updateEvaluatedConfig: boolean;
   paths: string[];
   evaluateFormConfigObject: FormConfigEvalObject;
-};
+}
 
 export type ConditonalObject = Record<string, any>;
 
 // Type for the object that will store the evaluation output for each component
-export type ConditionalOutput = {
+export interface ConditionalOutput {
   visible?: boolean;
   enabled?: boolean;
   fetchDynamicValues?: DynamicValues;
@@ -35,11 +38,11 @@ export type ConditionalOutput = {
   evaluateFormConfig?: EvaluatedFormConfig;
   configPropertyPath?: string;
   staticDependencyPathList?: Set<string> | undefined;
-};
+}
 
-export type FormConfigEvalObject = {
+export interface FormConfigEvalObject {
   [path: string]: { expression: string; output: string };
-};
+}
 
 // Type for the object that will store the eval output for the form
 export type FormEvalOutput = Record<string, ConditionalOutput>;
diff --git a/app/client/src/reducers/evaluationReducers/treeReducer.ts b/app/client/src/reducers/evaluationReducers/treeReducer.ts
index 5ce7b0e410..7edc07137b 100644
--- a/app/client/src/reducers/evaluationReducers/treeReducer.ts
+++ b/app/client/src/reducers/evaluationReducers/treeReducer.ts
@@ -2,7 +2,7 @@ import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
 import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 import type { Diff } from "deep-diff";
 import { applyChange } from "deep-diff";
-import type { DataTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { createImmerReducer } from "utils/ReducerUtils";
 import * as Sentry from "@sentry/react";
 import { get } from "lodash";
diff --git a/app/client/src/reducers/evaluationReducers/triggerReducer.ts b/app/client/src/reducers/evaluationReducers/triggerReducer.ts
index 94de0aff92..1bf82b1749 100644
--- a/app/client/src/reducers/evaluationReducers/triggerReducer.ts
+++ b/app/client/src/reducers/evaluationReducers/triggerReducer.ts
@@ -10,16 +10,16 @@ import type {
 // // Type for the object that will store the eval output for the app
 export type TriggerValuesEvaluationState = Record<string, FormEvalOutput>;
 
-export type TriggerActionPayload = {
+export interface TriggerActionPayload {
   formId: string;
   values: ConditionalOutput;
-};
+}
 
-export type TriggerActionLoadingPayload = {
+export interface TriggerActionLoadingPayload {
   formId: string;
   keys: string[]; // keys that need their loading states set.
   value: boolean;
-};
+}
 
 const initialState: TriggerValuesEvaluationState = {};
 
diff --git a/app/client/src/reducers/uiReducers/appCollabReducer.ts b/app/client/src/reducers/uiReducers/appCollabReducer.ts
index 1c7c3f866e..b219204d31 100644
--- a/app/client/src/reducers/uiReducers/appCollabReducer.ts
+++ b/app/client/src/reducers/uiReducers/appCollabReducer.ts
@@ -62,14 +62,14 @@ const appCollabReducer = createReducer(initialState, {
   }),
 });
 
-type PointerDataType = {
+interface PointerDataType {
   [s: string]: any;
-};
+}
 
-export type AppCollabReducerState = {
+export interface AppCollabReducerState {
   editors: User[];
   pointerData: PointerDataType;
   pageEditors: User[];
-};
+}
 
 export default appCollabReducer;
diff --git a/app/client/src/reducers/uiReducers/appThemingReducer.ts b/app/client/src/reducers/uiReducers/appThemingReducer.ts
index 914e5c0686..af37ad8338 100644
--- a/app/client/src/reducers/uiReducers/appThemingReducer.ts
+++ b/app/client/src/reducers/uiReducers/appThemingReducer.ts
@@ -4,7 +4,7 @@ import { createImmerReducer } from "utils/ReducerUtils";
 import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
 import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 
-export type AppThemingState = {
+export interface AppThemingState {
   isSaving: boolean;
   isChanging: boolean;
   stack: AppThemingMode[];
@@ -13,7 +13,7 @@ export type AppThemingState = {
   themesLoading: boolean;
   selectedThemeLoading: boolean;
   isBetaCardShown: boolean;
-};
+}
 
 const initialState: AppThemingState = {
   stack: [],
diff --git a/app/client/src/reducers/uiReducers/autoHeightReducer.ts b/app/client/src/reducers/uiReducers/autoHeightReducer.ts
index a1e0ea44d6..e29449777a 100644
--- a/app/client/src/reducers/uiReducers/autoHeightReducer.ts
+++ b/app/client/src/reducers/uiReducers/autoHeightReducer.ts
@@ -2,13 +2,13 @@ import { createImmerReducer } from "utils/ReducerUtils";
 import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
 import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 
-export type AutoHeightUIStatePayload = {
+export interface AutoHeightUIStatePayload {
   isAutoHeightWithLimitsChanging: boolean;
-};
+}
 
-export type AutoHeightUIState = {
+export interface AutoHeightUIState {
   isAutoHeightWithLimitsChanging: boolean;
-};
+}
 
 const initialState: AutoHeightUIState = {
   isAutoHeightWithLimitsChanging: false,
diff --git a/app/client/src/reducers/uiReducers/canvasSelectionReducer.ts b/app/client/src/reducers/uiReducers/canvasSelectionReducer.ts
index 5baee6cf51..965c48b107 100644
--- a/app/client/src/reducers/uiReducers/canvasSelectionReducer.ts
+++ b/app/client/src/reducers/uiReducers/canvasSelectionReducer.ts
@@ -57,11 +57,11 @@ export const canvasSelectionReducer = createImmerReducer(initialState, {
   },
 });
 
-export type CanvasSelectionState = {
+export interface CanvasSelectionState {
   isDraggingForSelection: boolean;
   widgetId?: string;
   outOfCanvasStartPositions?: XYCord;
   recentlyAddedWidget: Record<string, string>;
-};
+}
 
 export default canvasSelectionReducer;
diff --git a/app/client/src/reducers/uiReducers/crudInfoModalReducer.ts b/app/client/src/reducers/uiReducers/crudInfoModalReducer.ts
index 2662e866df..c41508567f 100644
--- a/app/client/src/reducers/uiReducers/crudInfoModalReducer.ts
+++ b/app/client/src/reducers/uiReducers/crudInfoModalReducer.ts
@@ -21,10 +21,10 @@ const crudInfoModalReducer = createReducer(initialState, {
   },
 });
 
-export type GenerateCRUDSuccessInfoData = {
+export interface GenerateCRUDSuccessInfoData {
   successImageUrl: string;
   successMessage: string;
-};
+}
 
 export interface CrudInfoModalReduxState {
   crudInfoModalOpen: boolean;
diff --git a/app/client/src/reducers/uiReducers/debuggerReducer.ts b/app/client/src/reducers/uiReducers/debuggerReducer.ts
index 81d1025604..de9c9d504c 100644
--- a/app/client/src/reducers/uiReducers/debuggerReducer.ts
+++ b/app/client/src/reducers/uiReducers/debuggerReducer.ts
@@ -170,12 +170,12 @@ export interface DebuggerReduxState {
   context: DebuggerContext;
 }
 
-export type DebuggerContext = {
+export interface DebuggerContext {
   scrollPosition: number;
   errorCount: number;
   selectedDebuggerTab: string;
   responseTabHeight: number;
   selectedDebuggerFilter: string;
-};
+}
 
 export default debuggerReducer;
diff --git a/app/client/src/reducers/uiReducers/dragResizeReducer.ts b/app/client/src/reducers/uiReducers/dragResizeReducer.ts
index bc15be6cc6..88a0259797 100644
--- a/app/client/src/reducers/uiReducers/dragResizeReducer.ts
+++ b/app/client/src/reducers/uiReducers/dragResizeReducer.ts
@@ -110,20 +110,20 @@ export const widgetDraggingReducer = createImmerReducer(initialState, {
   },
 });
 
-export type DraggingGroupCenter = {
+export interface DraggingGroupCenter {
   widgetId?: string;
   top?: number;
   left?: number;
-};
-export type DragDetails = {
+}
+export interface DragDetails {
   dragGroupActualParent?: string;
   draggingGroupCenter?: DraggingGroupCenter;
   newWidget?: any;
   draggedOn?: string;
   dragOffset?: any;
-};
+}
 
-export type WidgetDragResizeState = {
+export interface WidgetDragResizeState {
   isDraggingDisabled: boolean;
   isDragging: boolean;
   dragDetails: DragDetails;
@@ -135,6 +135,6 @@ export type WidgetDragResizeState = {
   entityExplorerAncestry: string[];
   selectedWidgets: string[];
   isAutoCanvasResizing: boolean;
-};
+}
 
 export default widgetDraggingReducer;
diff --git a/app/client/src/reducers/uiReducers/focusHistoryReducer.ts b/app/client/src/reducers/uiReducers/focusHistoryReducer.ts
index 4e458ee35e..8e8246a452 100644
--- a/app/client/src/reducers/uiReducers/focusHistoryReducer.ts
+++ b/app/client/src/reducers/uiReducers/focusHistoryReducer.ts
@@ -2,14 +2,16 @@ import { createImmerReducer } from "utils/ReducerUtils";
 import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 import type { FocusEntityInfo } from "navigation/FocusEntity";
 
-export type FocusState = {
+export interface FocusState {
   entityInfo: FocusEntityInfo;
   state: Record<string, any>;
-};
+}
 
 export type FocusHistory = Record<string, FocusState>;
 
-export type FocusHistoryState = { history: FocusHistory };
+export interface FocusHistoryState {
+  history: FocusHistory;
+}
 
 const initialState: FocusHistoryState = {
   history: {},
diff --git a/app/client/src/reducers/uiReducers/gitSyncReducer.ts b/app/client/src/reducers/uiReducers/gitSyncReducer.ts
index 3c9d6a0079..1c763aedec 100644
--- a/app/client/src/reducers/uiReducers/gitSyncReducer.ts
+++ b/app/client/src/reducers/uiReducers/gitSyncReducer.ts
@@ -565,7 +565,7 @@ const gitSyncReducer = createReducer(initialState, {
   }),
 });
 
-export type GitStatusData = {
+export interface GitStatusData {
   aheadCount: number;
   behindCount: number;
   conflicting: Array<string>;
@@ -579,36 +579,36 @@ export type GitStatusData = {
   modifiedJSLibs: number;
   discardDocUrl?: string;
   migrationMessage?: string;
-};
+}
 
-export type GitRemoteStatusData = {
+export interface GitRemoteStatusData {
   aheadCount: number;
   behindCount: number;
   remoteTrackingBranch: string;
-};
+}
 
-type GitErrorPayloadType = {
+interface GitErrorPayloadType {
   code: number | string;
   errorType?: string;
   message: string;
   referenceDoc?: string;
-};
+}
 
-export type GitErrorType = {
+export interface GitErrorType {
   error: GitErrorPayloadType;
   show?: boolean;
   crash?: boolean;
   logToSentry?: boolean;
-};
+}
 
-export type GitBranchDeleteState = {
+export interface GitBranchDeleteState {
   deleteBranch?: any;
   deleteBranchError?: any;
   deleteBranchWarning?: any;
   deletingBranch?: boolean;
-};
+}
 
-export type GitDiscardResponse = {
+export interface GitDiscardResponse {
   id: string;
   modifiedBy: string;
   userPermissions: string[];
@@ -640,7 +640,7 @@ export type GitDiscardResponse = {
   };
   new: boolean;
   modifiedAt: string;
-};
+}
 
 export type GitSyncReducerState = GitBranchDeleteState & {
   isGitSyncModalOpen: boolean;
diff --git a/app/client/src/reducers/uiReducers/layoutConversionReducer.ts b/app/client/src/reducers/uiReducers/layoutConversionReducer.ts
index ddb309d30e..5f1e4e948c 100644
--- a/app/client/src/reducers/uiReducers/layoutConversionReducer.ts
+++ b/app/client/src/reducers/uiReducers/layoutConversionReducer.ts
@@ -21,9 +21,9 @@ export enum CONVERSION_STATES {
   RESTORING_SNAPSHOT_SPINNER = "RESTORING_SNAPSHOT_SPINNER",
 }
 
-export type SnapShotDetails = {
+export interface SnapShotDetails {
   lastUpdatedTime: string;
-};
+}
 
 const initialState: layoutConversionReduxState = {
   snapshotDetails: undefined,
diff --git a/app/client/src/reducers/uiReducers/libraryReducer.ts b/app/client/src/reducers/uiReducers/libraryReducer.ts
index bb577103fb..a9ade8c1c6 100644
--- a/app/client/src/reducers/uiReducers/libraryReducer.ts
+++ b/app/client/src/reducers/uiReducers/libraryReducer.ts
@@ -15,11 +15,11 @@ export enum InstallState {
   Success,
 }
 
-export type LibraryState = {
+export interface LibraryState {
   installationStatus: Record<string, InstallState>;
   installedLibraries: TJSLibrary[];
   isInstallerOpen: boolean;
-};
+}
 
 const initialState = {
   isInstallerOpen: false,
diff --git a/app/client/src/reducers/uiReducers/modalActionReducer.ts b/app/client/src/reducers/uiReducers/modalActionReducer.ts
index 1159805447..df22c52b02 100644
--- a/app/client/src/reducers/uiReducers/modalActionReducer.ts
+++ b/app/client/src/reducers/uiReducers/modalActionReducer.ts
@@ -24,11 +24,11 @@ export enum ModalType {
 }
 
 // some meta-data about the Modal.
-export type ModalInfo = {
+export interface ModalInfo {
   name: string;
   modalOpen: boolean;
   modalType: ModalType;
-};
+}
 export interface ModalActionReduxState {
   modals: ModalInfo[];
 }
diff --git a/app/client/src/reducers/uiReducers/onBoardingReducer.ts b/app/client/src/reducers/uiReducers/onBoardingReducer.ts
index fb25bce30c..6ac70e91e9 100644
--- a/app/client/src/reducers/uiReducers/onBoardingReducer.ts
+++ b/app/client/src/reducers/uiReducers/onBoardingReducer.ts
@@ -16,11 +16,11 @@ const initialState: OnboardingState = {
   showAnonymousDataPopup: false,
 };
 
-export type StepState = {
+export interface StepState {
   step: SIGNPOSTING_STEP;
   completed: boolean;
   read?: boolean;
-};
+}
 
 export interface OnboardingState {
   inOnboardingWidgetSelection: boolean;
diff --git a/app/client/src/reducers/uiReducers/propertyPaneReducer.tsx b/app/client/src/reducers/uiReducers/propertyPaneReducer.tsx
index 1ec754a196..671c14c3e5 100644
--- a/app/client/src/reducers/uiReducers/propertyPaneReducer.tsx
+++ b/app/client/src/reducers/uiReducers/propertyPaneReducer.tsx
@@ -6,7 +6,9 @@ import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 import { DEFAULT_PROPERTY_PANE_WIDTH } from "constants/AppConstants";
 import { createImmerReducer } from "utils/ReducerUtils";
 
-export type SelectedPropertyPanel = { [path: string]: number };
+export interface SelectedPropertyPanel {
+  [path: string]: number;
+}
 
 const initialState: PropertyPaneReduxState = {
   isVisible: false,
diff --git a/app/client/src/reducers/uiReducers/reflowReducer.ts b/app/client/src/reducers/uiReducers/reflowReducer.ts
index 36e7c89bd5..8b8edef9a3 100644
--- a/app/client/src/reducers/uiReducers/reflowReducer.ts
+++ b/app/client/src/reducers/uiReducers/reflowReducer.ts
@@ -25,7 +25,7 @@ export const widgetReflowReducer = createReducer(initialState, {
   },
 });
 
-export type widgetReflow = {
+export interface widgetReflow {
   isReflowing: boolean;
   reflowingWidgets: ReflowedSpaceMap;
-};
+}
diff --git a/app/client/src/reducers/uiReducers/releasesReducer.ts b/app/client/src/reducers/uiReducers/releasesReducer.ts
index b019029470..0f055d5174 100644
--- a/app/client/src/reducers/uiReducers/releasesReducer.ts
+++ b/app/client/src/reducers/uiReducers/releasesReducer.ts
@@ -18,9 +18,9 @@ const importReducer = createReducer(initialState, {
   }),
 });
 
-export type ReleasesState = {
+export interface ReleasesState {
   newReleasesCount: string;
   releaseItems: any[];
-};
+}
 
 export default importReducer;
diff --git a/app/client/src/reducers/uiReducers/themeReducer.ts b/app/client/src/reducers/uiReducers/themeReducer.ts
index f8e1e2d4d1..5ba614f21d 100644
--- a/app/client/src/reducers/uiReducers/themeReducer.ts
+++ b/app/client/src/reducers/uiReducers/themeReducer.ts
@@ -22,10 +22,10 @@ export type ThemeState = HeaderMetaState & {
   theme: any;
 };
 
-export type HeaderMetaState = {
+export interface HeaderMetaState {
   hideHeaderShadow: boolean;
   showHeaderSeparator: boolean;
-};
+}
 
 const themeReducer = createImmerReducer(initialState, {
   [ReduxActionTypes.SET_THEME]: (
diff --git a/app/client/src/reducers/uiReducers/tourReducer.ts b/app/client/src/reducers/uiReducers/tourReducer.ts
index 71d9a7a70e..b04067c76c 100644
--- a/app/client/src/reducers/uiReducers/tourReducer.ts
+++ b/app/client/src/reducers/uiReducers/tourReducer.ts
@@ -32,10 +32,10 @@ const tourReducer = createReducer(initialState, {
   }),
 });
 
-export type TourReducerState = {
+export interface TourReducerState {
   isTourInProgress: boolean;
   activeTourType?: TourType;
   activeTourIndex: number;
-};
+}
 
 export default tourReducer;
diff --git a/app/client/src/reflow/reflowTypes.ts b/app/client/src/reflow/reflowTypes.ts
index bab63db19f..d236f0f8aa 100644
--- a/app/client/src/reflow/reflowTypes.ts
+++ b/app/client/src/reflow/reflowTypes.ts
@@ -27,14 +27,14 @@ export enum MathComparators {
   max = "max",
 }
 
-export type GridProps = {
+export interface GridProps {
   parentColumnSpace: number;
   parentRowSpace: number;
   maxGridColumns: number;
   paddingOffset?: number;
-};
+}
 
-export type CollisionAccessors = {
+export interface CollisionAccessors {
   direction: SpaceAttributes;
   oppositeDirection: SpaceAttributes;
   perpendicularMax: SpaceAttributes;
@@ -46,12 +46,12 @@ export type CollisionAccessors = {
   directionIndicator: 1 | -1;
   isHorizontal: boolean;
   plane: "vertical" | "horizontal";
-};
+}
 
-export type Delta = {
+export interface Delta {
   X: number;
   Y: number;
-};
+}
 
 export type CollidingSpace = BlockSpace & {
   direction: ReflowDirection;
@@ -72,21 +72,21 @@ export type SecondOrderCollision = BlockSpace & {
   };
 };
 
-export type SecondOrderCollisionMap = {
+export interface SecondOrderCollisionMap {
   [key: string]: SecondOrderCollision;
-};
+}
 
-export type MovementLimitMap = {
+export interface MovementLimitMap {
   [key: string]: { canVerticalMove: boolean; canHorizontalMove: boolean };
-};
-export type CollidingSpaceMap = {
+}
+export interface CollidingSpaceMap {
   horizontal: CollisionMap;
   vertical: CollisionMap;
-};
+}
 
-export type CollisionMap = {
+export interface CollisionMap {
   [key: string]: CollidingSpace;
-};
+}
 
 export type CollisionTree = BlockSpace & {
   direction: ReflowDirection;
@@ -100,18 +100,18 @@ export type CollisionTree = BlockSpace & {
   fixedHeight?: number;
 };
 
-export type SpaceMovementMap = {
+export interface SpaceMovementMap {
   [key: string]: DirectionalMovement[];
-};
+}
 
-export type DirectionalMovement = {
+export interface DirectionalMovement {
   maxMovement: number;
   directionalIndicator: 1 | -1;
   coordinateKey: "X" | "Y";
   isHorizontal: boolean;
-};
+}
 
-export type CollisionTreeCache = {
+export interface CollisionTreeCache {
   [spaceId: string]: {
     [direction: string]: {
       value: number;
@@ -121,9 +121,9 @@ export type CollisionTreeCache = {
       childNode?: CollisionTree;
     };
   };
-};
+}
 
-export type ReflowedSpace = {
+export interface ReflowedSpace {
   X?: number;
   Y?: number;
   width?: number;
@@ -142,33 +142,35 @@ export type ReflowedSpace = {
   horizontalEmptySpaces?: number;
   verticalMaxOccupiedSpace?: number;
   verticalEmptySpaces?: number;
-};
+}
 
-export type ReflowedSpaceMap = {
+export interface ReflowedSpaceMap {
   [key: string]: ReflowedSpace;
-};
+}
 
-export type PrevReflowState = {
+export interface PrevReflowState {
   prevSpacesMap: SpaceMap;
   prevCollidingSpaceMap: CollidingSpaceMap;
   prevMovementMap: ReflowedSpaceMap;
   prevSecondOrderCollisionMap: SecondOrderCollisionMap;
-};
+}
 
 export type BlockSpace = OccupiedSpace & {
   isDropTarget?: boolean;
   fixedHeight?: number;
 };
 
-export type SpaceMap = { [id: string]: BlockSpace };
+export interface SpaceMap {
+  [id: string]: BlockSpace;
+}
 
-export type DirectionalVariables = {
+export interface DirectionalVariables {
   [key: string]: {
     [direction: string]: [number, number, CollisionAccessors, ReflowDirection];
   };
-};
+}
 
-export type OrientationAccessors = {
+export interface OrientationAccessors {
   primary: "horizontal" | "vertical";
   secondary: "horizontal" | "vertical";
-};
+}
diff --git a/app/client/src/sagas/ActionExecution/NavigateActionSaga.ts b/app/client/src/sagas/ActionExecution/NavigateActionSaga.ts
index 3ee0587c07..6687fe37cb 100644
--- a/app/client/src/sagas/ActionExecution/NavigateActionSaga.ts
+++ b/app/client/src/sagas/ActionExecution/NavigateActionSaga.ts
@@ -5,11 +5,11 @@ import type { Page } from "@appsmith/constants/ReduxActionConstants";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import { getAppMode } from "@appsmith/selectors/applicationSelectors";
 import { APP_MODE } from "entities/App";
-import { getQueryStringfromObject } from "RouteBuilder";
+import { getQueryStringfromObject } from "@appsmith/entities/URLRedirect/URLAssembly";
 import history from "utils/history";
 import { setDataUrl } from "sagas/PageSagas";
 import AppsmithConsole from "utils/AppsmithConsole";
-import { builderURL, viewerURL } from "RouteBuilder";
+import { builderURL, viewerURL } from "@appsmith/RouteBuilder";
 import { TriggerFailureError } from "./errorUtils";
 import { isValidURL, matchesURLPattern } from "utils/URLUtils";
 import type { TNavigateToDescription } from "workers/Evaluation/fns/navigateTo";
diff --git a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
index 9f28203e7d..18edb9f6f1 100644
--- a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
+++ b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
@@ -165,12 +165,12 @@ enum ActionResponseDataTypes {
   BINARY = "BINARY",
 }
 
-type FilePickerInstumentationObject = {
+interface FilePickerInstumentationObject {
   numberOfFiles: number;
   totalSize: number;
   fileTypes: Array<string>;
   fileSizes: Array<number>;
-};
+}
 
 export const getActionTimeout = (
   state: AppState,
@@ -726,11 +726,11 @@ function* runActionShortcutSaga() {
   }
 }
 
-type RunActionError = {
+interface RunActionError {
   name: string;
   message: string;
   clientDefinedError?: boolean;
-};
+}
 
 function* runActionSaga(
   reduxAction: ReduxAction<{
@@ -1284,10 +1284,10 @@ function* executePageLoadActionsSaga() {
   }
 }
 
-type ExecutePluginActionResponse = {
+interface ExecutePluginActionResponse {
   payload: ActionResponse;
   isError: boolean;
-};
+}
 /*
  * This saga handles the complete plugin action execution flow. It will respond with a
  * payload and isError property which indicates if the response is of an error type.
diff --git a/app/client/src/sagas/ActionExecution/ResetWidgetActionSaga.ts b/app/client/src/sagas/ActionExecution/ResetWidgetActionSaga.ts
index 49b4932c3e..117b624c31 100644
--- a/app/client/src/sagas/ActionExecution/ResetWidgetActionSaga.ts
+++ b/app/client/src/sagas/ActionExecution/ResetWidgetActionSaga.ts
@@ -13,11 +13,8 @@ import { getType, Types } from "utils/TypeHelpers";
 import type { FlattenedWidgetProps } from "WidgetProvider/constants";
 import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 import { getDataTree, getConfigTree } from "selectors/dataTreeSelectors";
-import type {
-  DataTree,
-  ConfigTree,
-  WidgetEntityConfig,
-} from "@appsmith/entities/DataTree/types";
+import type { WidgetEntityConfig } from "@appsmith/entities/DataTree/types";
+import type { DataTree, ConfigTree } from "entities/DataTree/dataTreeTypes";
 import { isWidget } from "@appsmith/workers/Evaluation/evaluationUtils";
 import type { TResetWidgetDescription } from "workers/Evaluation/fns/resetWidget";
 
diff --git a/app/client/src/sagas/ActionExecution/errorUtils.ts b/app/client/src/sagas/ActionExecution/errorUtils.ts
index 0b242bff8a..20315cd414 100644
--- a/app/client/src/sagas/ActionExecution/errorUtils.ts
+++ b/app/client/src/sagas/ActionExecution/errorUtils.ts
@@ -7,7 +7,6 @@ import { isString } from "lodash";
 import type { Types } from "utils/TypeHelpers";
 import type { ActionTriggerKeys } from "@appsmith/workers/Evaluation/fns/index";
 import { getActionTriggerFunctionNames } from "@appsmith/workers/Evaluation/fns/index";
-import { getAppsmithConfigs } from "@appsmith/configs";
 import { getAppMode } from "@appsmith/selectors/applicationSelectors";
 import AnalyticsUtil from "../../utils/AnalyticsUtil";
 import {
@@ -19,8 +18,6 @@ import store from "store";
 import showToast from "sagas/ToastSagas";
 import { call } from "redux-saga/effects";
 
-const APPSMITH_CONFIGS = getAppsmithConfigs();
-
 /*
  * The base trigger error that also logs the errors in the debugger.
  * Extend this error to make custom handling of errors
@@ -52,9 +49,7 @@ export class ActionValidationError extends TriggerFailureError {
   ) {
     const errorMessage = createMessage(
       TRIGGER_ACTION_VALIDATION_ERROR,
-      getActionTriggerFunctionNames(!!APPSMITH_CONFIGS.cloudHosting)[
-        functionName
-      ],
+      getActionTriggerFunctionNames()[functionName],
       argumentName,
       expectedType,
       received,
diff --git a/app/client/src/sagas/ActionExecution/geolocationSaga.ts b/app/client/src/sagas/ActionExecution/geolocationSaga.ts
index f216bcca4c..53be2acb11 100644
--- a/app/client/src/sagas/ActionExecution/geolocationSaga.ts
+++ b/app/client/src/sagas/ActionExecution/geolocationSaga.ts
@@ -12,7 +12,10 @@ import type {
 } from "workers/Evaluation/fns/geolocationFns";
 
 class GeoLocationError extends Error {
-  constructor(message: string, private responseData?: any) {
+  constructor(
+    message: string,
+    private responseData?: any,
+  ) {
     super(message);
   }
 }
diff --git a/app/client/src/sagas/ActionSagas.ts b/app/client/src/sagas/ActionSagas.ts
index 302b3eabc3..6a88f622f9 100644
--- a/app/client/src/sagas/ActionSagas.ts
+++ b/app/client/src/sagas/ActionSagas.ts
@@ -111,7 +111,7 @@ import {
   integrationEditorURL,
   queryEditorIdURL,
   saasEditorApiIdURL,
-} from "RouteBuilder";
+} from "@appsmith/RouteBuilder";
 import {
   RequestPayloadAnalyticsPath,
   checkAndLogErrorsIfCyclicDependency,
@@ -301,9 +301,8 @@ export function* fetchActionsSaga(
     { mode: "EDITOR", appId: applicationId },
   );
   try {
-    const response: ApiResponse<Action[]> = yield ActionAPI.fetchActions(
-      applicationId,
-    );
+    const response: ApiResponse<Action[]> =
+      yield ActionAPI.fetchActions(applicationId);
     const isValidResponse: boolean = yield validateResponse(response);
     if (isValidResponse) {
       yield put({
@@ -727,9 +726,8 @@ export function* refactorActionName(
       newName: newName,
     });
 
-    const isRefactorSuccessful: boolean = yield validateResponse(
-      refactorResponse,
-    );
+    const isRefactorSuccessful: boolean =
+      yield validateResponse(refactorResponse);
 
     const currentPageId: string = yield select(getCurrentPageId);
 
@@ -992,9 +990,8 @@ function* executeCommandSaga(actionPayload: ReduxAction<SlashCommandPayload>) {
       }
 
       yield put({
-        type: ReduxActionTypes.TOGGLE_AI_WINDOW,
+        type: ReduxActionTypes.UPDATE_AI_CONTEXT,
         payload: {
-          show: true,
           context,
         },
       });
diff --git a/app/client/src/sagas/ApiPaneSagas.ts b/app/client/src/sagas/ApiPaneSagas.ts
index 9ee5664afd..c40f6048b3 100644
--- a/app/client/src/sagas/ApiPaneSagas.ts
+++ b/app/client/src/sagas/ApiPaneSagas.ts
@@ -75,7 +75,7 @@ import {
   apiEditorIdURL,
   datasourcesEditorIdURL,
   integrationEditorURL,
-} from "RouteBuilder";
+} from "@appsmith/RouteBuilder";
 import { getCurrentPageId } from "selectors/editorSelectors";
 import { validateResponse } from "./ErrorSagas";
 import type { CreateDatasourceSuccessAction } from "actions/datasourceActions";
@@ -666,7 +666,7 @@ function* handleCreateNewApiActionSaga(
   }>,
 ) {
   const workspaceId: string = yield select(getCurrentWorkspaceId);
-  const { pageId, apiType = PluginPackageName.REST_API } = action.payload;
+  const { apiType = PluginPackageName.REST_API, pageId } = action.payload;
   const pluginId: string = yield select(getPluginIdOfPackageName, apiType);
   // Default Config is Rest Api Plugin Config
   let defaultConfig = DEFAULT_CREATE_API_CONFIG;
diff --git a/app/client/src/sagas/AppThemingSaga.tsx b/app/client/src/sagas/AppThemingSaga.tsx
index 13c16026c3..3855bc7f6a 100644
--- a/app/client/src/sagas/AppThemingSaga.tsx
+++ b/app/client/src/sagas/AppThemingSaga.tsx
@@ -74,9 +74,8 @@ export function* initAppTheming() {
 export function* fetchAppThemes(action: ReduxAction<FetchAppThemesAction>) {
   try {
     const { applicationId } = action.payload;
-    const response: ApiResponse<AppTheme> = yield ThemingApi.fetchThemes(
-      applicationId,
-    );
+    const response: ApiResponse<AppTheme> =
+      yield ThemingApi.fetchThemes(applicationId);
 
     yield put({
       type: ReduxActionTypes.FETCH_APP_THEMES_SUCCESS,
@@ -294,9 +293,8 @@ function* closeisBetaCardShown() {
  */
 function* resetTheme() {
   try {
-    const canvasWidgets: CanvasWidgetsReduxState = yield select(
-      getCanvasWidgets,
-    );
+    const canvasWidgets: CanvasWidgetsReduxState =
+      yield select(getCanvasWidgets);
     const propertiesToUpdate: UpdateWidgetPropertyPayload[] =
       getPropertiesToUpdateForReset(canvasWidgets);
 
@@ -313,9 +311,8 @@ function* setDefaultSelectedThemeOnError() {
   const applicationId: string = yield select(getCurrentApplicationId);
   try {
     // Fetch all system themes
-    const response: ApiResponse<AppTheme[]> = yield ThemingApi.fetchThemes(
-      applicationId,
-    );
+    const response: ApiResponse<AppTheme[]> =
+      yield ThemingApi.fetchThemes(applicationId);
 
     // Gets default theme
     const theme = find(response.data, { name: "Default" });
diff --git a/app/client/src/sagas/AutoLayoutUpdateSagas.tsx b/app/client/src/sagas/AutoLayoutUpdateSagas.tsx
index 1032caae51..32a20323cc 100644
--- a/app/client/src/sagas/AutoLayoutUpdateSagas.tsx
+++ b/app/client/src/sagas/AutoLayoutUpdateSagas.tsx
@@ -149,9 +149,8 @@ export function* updateLayoutSystemTypeSaga(
   actionPayload: ReduxAction<LayoutSystemTypes>,
 ) {
   try {
-    const currLayoutSystemType: LayoutSystemTypes = yield select(
-      getLayoutSystemType,
-    );
+    const currLayoutSystemType: LayoutSystemTypes =
+      yield select(getLayoutSystemType);
     const payloadLayoutSystemType = actionPayload.payload;
 
     if (currLayoutSystemType === payloadLayoutSystemType) return;
@@ -194,9 +193,8 @@ export function* recalculateAutoLayoutColumnsAndSave(
   widgets?: CanvasWidgetsReduxState,
 ) {
   const layoutSystemType: LayoutSystemTypes = yield select(getLayoutSystemType);
-  const mainCanvasProps: MainCanvasReduxState = yield select(
-    getMainCanvasProps,
-  );
+  const mainCanvasProps: MainCanvasReduxState =
+    yield select(getMainCanvasProps);
 
   yield put(
     updateLayoutForMobileBreakpointAction(
diff --git a/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts b/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts
index 2354a0c9d3..82aa55148d 100644
--- a/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts
+++ b/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts
@@ -43,7 +43,7 @@ import { toast } from "design-system";
 import type { WidgetDraggingUpdateParams } from "layoutSystems/common/canvasArenas/ArenaTypes";
 import { getLayoutSystemType } from "selectors/layoutSystemSelectors";
 
-export type WidgetMoveParams = {
+export interface WidgetMoveParams {
   widgetId: string;
   leftColumn: number;
   topRow: number;
@@ -59,7 +59,7 @@ export type WidgetMoveParams = {
   allWidgets: CanvasWidgetsReduxState;
   position?: number;
   useAutoLayout?: boolean;
-};
+}
 
 export function* getCanvasSizeAfterWidgetMove(
   canvasWidgetId: string,
@@ -72,9 +72,8 @@ export function* getCanvasSizeAfterWidgetMove(
   let mainCanvasMinHeight;
   let canvasParentMinHeight = canvasWidget.minHeight;
   if (canvasWidgetId === MAIN_CONTAINER_WIDGET_ID) {
-    const mainCanvasProps: MainCanvasReduxState = yield select(
-      getMainCanvasProps,
-    );
+    const mainCanvasProps: MainCanvasReduxState =
+      yield select(getMainCanvasProps);
     mainCanvasMinHeight = mainCanvasProps?.height;
   } else if (canvasWidget.parentId) {
     const parent: FlattenedWidgetProps = yield select(
@@ -335,9 +334,8 @@ function* moveWidgetsSaga(
       );
     }
 
-    const layoutSystemType: LayoutSystemTypes = yield select(
-      getLayoutSystemType,
-    );
+    const layoutSystemType: LayoutSystemTypes =
+      yield select(getLayoutSystemType);
     let updatedWidgets: CanvasWidgetsReduxState = { ...allWidgets };
     if (layoutSystemType === LayoutSystemTypes.AUTO) {
       /**
diff --git a/app/client/src/sagas/ContextSwitchingSaga.ts b/app/client/src/sagas/ContextSwitchingSaga.ts
index 7696c6e8ba..0d7d2d7e05 100644
--- a/app/client/src/sagas/ContextSwitchingSaga.ts
+++ b/app/client/src/sagas/ContextSwitchingSaga.ts
@@ -16,7 +16,7 @@ import {
 } from "navigation/FocusEntity";
 import { FocusElementsConfig } from "navigation/FocusElements";
 import { setFocusHistory } from "actions/focusHistoryActions";
-import { builderURL } from "RouteBuilder";
+import { builderURL } from "@appsmith/RouteBuilder";
 import type { AppsmithLocationState } from "utils/history";
 import history, { NavigationMethod } from "utils/history";
 import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
diff --git a/app/client/src/sagas/CurlImportSagas.ts b/app/client/src/sagas/CurlImportSagas.ts
index 75357c2783..7a95bbf2fc 100644
--- a/app/client/src/sagas/CurlImportSagas.ts
+++ b/app/client/src/sagas/CurlImportSagas.ts
@@ -13,7 +13,7 @@ import { getCurrentWorkspaceId } from "@appsmith/selectors/workspaceSelectors";
 import transformCurlImport from "transformers/CurlImportTransformer";
 import history from "utils/history";
 import { CURL } from "constants/AppsmithActionConstants/ActionConstants";
-import { apiEditorIdURL } from "RouteBuilder";
+import { apiEditorIdURL } from "@appsmith/RouteBuilder";
 
 export function* curlImportSaga(action: ReduxAction<CurlImportRequest>) {
   const { name, pageId, type } = action.payload;
diff --git a/app/client/src/sagas/DatasourcesSagas.ts b/app/client/src/sagas/DatasourcesSagas.ts
index 63af707555..f057617ae9 100644
--- a/app/client/src/sagas/DatasourcesSagas.ts
+++ b/app/client/src/sagas/DatasourcesSagas.ts
@@ -135,7 +135,7 @@ import {
   generateTemplateFormURL,
   integrationEditorURL,
   saasEditorDatasourceIdURL,
-} from "RouteBuilder";
+} from "@appsmith/RouteBuilder";
 import {
   DATASOURCE_NAME_DEFAULT_PREFIX,
   GOOGLE_SHEET_FILE_PICKER_OVERLAY_CLASS,
diff --git a/app/client/src/sagas/DebuggerSagas.ts b/app/client/src/sagas/DebuggerSagas.ts
index bdbfb66c18..4bf9b77c6f 100644
--- a/app/client/src/sagas/DebuggerSagas.ts
+++ b/app/client/src/sagas/DebuggerSagas.ts
@@ -34,7 +34,7 @@ import type { Action } from "entities/Action";
 import { PluginType } from "entities/Action";
 import type { JSCollection } from "entities/JSCollection";
 import LOG_TYPE from "entities/AppsmithConsole/logtype";
-import type { ConfigTree, DataTree } from "@appsmith/entities/DataTree/types";
+import type { ConfigTree, DataTree } from "entities/DataTree/dataTreeTypes";
 import {
   getConfigTree,
   getDataTree,
@@ -453,9 +453,8 @@ function* logDebuggerErrorAnalyticsSaga(
 
 function* addDebuggerErrorLogsSaga(action: ReduxAction<Log[]>) {
   const errorLogs = action.payload;
-  const currentDebuggerErrors: Record<string, Log> = yield select(
-    getDebuggerErrors,
-  );
+  const currentDebuggerErrors: Record<string, Log> =
+    yield select(getDebuggerErrors);
   const appMode: ReturnType<typeof getAppMode> = yield select(getAppMode);
   yield put(debuggerLogInit(errorLogs));
   const validErrorLogs = errorLogs.filter((log) => log.source && log.id);
@@ -585,9 +584,8 @@ function* deleteDebuggerErrorLogsSaga(
   action: ReduxAction<{ id: string; analytics: Log["analytics"] }[]>,
 ) {
   const { payload } = action;
-  const currentDebuggerErrors: Record<string, Log> = yield select(
-    getDebuggerErrors,
-  );
+  const currentDebuggerErrors: Record<string, Log> =
+    yield select(getDebuggerErrors);
   const appMode: ReturnType<typeof getAppMode> = yield select(getAppMode);
   const existingErrorPayloads = payload.filter((item) =>
     currentDebuggerErrors.hasOwnProperty(item.id),
diff --git a/app/client/src/sagas/ErrorSagas.tsx b/app/client/src/sagas/ErrorSagas.tsx
index d8a47371e3..d6b8ba2b4e 100644
--- a/app/client/src/sagas/ErrorSagas.tsx
+++ b/app/client/src/sagas/ErrorSagas.tsx
@@ -132,12 +132,12 @@ export function getResponseErrorMessage(response: ApiResponse) {
     : undefined;
 }
 
-type ClientDefinedErrorMetadata = {
+interface ClientDefinedErrorMetadata {
   clientDefinedError: boolean;
   statusCode: string;
   message: string;
   pluginErrorDetails: PluginErrorDetails;
-};
+}
 
 export function extractClientDefinedErrorMetadata(
   err: any,
@@ -154,11 +154,11 @@ export function extractClientDefinedErrorMetadata(
   }
 }
 
-export type ErrorPayloadType = {
+export interface ErrorPayloadType {
   code?: number | string;
   message?: string;
   crash?: boolean;
-};
+}
 const ActionErrorDisplayMap: {
   [key: string]: (error: ErrorPayloadType) => string;
 } = {
diff --git a/app/client/src/sagas/EvalWorkerActionSagas.ts b/app/client/src/sagas/EvalWorkerActionSagas.ts
index 11c39502af..e6d61ca08f 100644
--- a/app/client/src/sagas/EvalWorkerActionSagas.ts
+++ b/app/client/src/sagas/EvalWorkerActionSagas.ts
@@ -27,13 +27,13 @@ import type {
   JSVarMutatedEvents,
 } from "workers/Evaluation/types";
 import isEmpty from "lodash/isEmpty";
-import type { UnEvalTree } from "@appsmith/entities/DataTree/types";
+import type { UnEvalTree } from "entities/DataTree/dataTreeTypes";
 import { sortJSExecutionDataByCollectionId } from "workers/Evaluation/JSObject/utils";
 import type { LintTreeSagaRequestData } from "plugins/Linting/types";
-export type UpdateDataTreeMessageData = {
+export interface UpdateDataTreeMessageData {
   workerResponse: EvalTreeResponseData;
   unevalTree: UnEvalTree;
-};
+}
 
 export function* handleEvalWorkerRequestSaga(listenerChannel: Channel<any>) {
   while (true) {
diff --git a/app/client/src/sagas/EvaluationsSaga.ts b/app/client/src/sagas/EvaluationsSaga.ts
index 4eecd793e3..a5299d80c3 100644
--- a/app/client/src/sagas/EvaluationsSaga.ts
+++ b/app/client/src/sagas/EvaluationsSaga.ts
@@ -82,12 +82,8 @@ import {
   getAllActionValidationConfig,
   getAllJSActionsData,
 } from "@appsmith/selectors/entitiesSelector";
-import type {
-  DataTree,
-  UnEvalTree,
-  WidgetEntityConfig,
-} from "@appsmith/entities/DataTree/types";
-
+import type { WidgetEntityConfig } from "@appsmith/entities/DataTree/types";
+import type { DataTree, UnEvalTree } from "entities/DataTree/dataTreeTypes";
 import { initiateLinting, lintWorker } from "./LintingSagas";
 import type {
   EvalTreeRequestData,
@@ -100,7 +96,10 @@ import { executeJSUpdates } from "actions/pluginActionActions";
 import { setEvaluatedActionSelectorField } from "actions/actionSelectorActions";
 import { waitForWidgetConfigBuild } from "./InitSagas";
 import { logDynamicTriggerExecution } from "@appsmith/sagas/analyticsSaga";
+import { selectFeatureFlags } from "@appsmith/selectors/featureFlagsSelectors";
+import { fetchFeatureFlagsInit } from "actions/userActions";
 import { parseUpdatesAndDeleteUndefinedUpdates } from "./EvaluationSaga.utils";
+import { getFeatureFlagsFetched } from "selectors/usersSelectors";
 const APPSMITH_CONFIGS = getAppsmithConfigs();
 export const evalWorker = new GracefulWorkerService(
   new Worker(
@@ -134,16 +133,16 @@ export function* updateDataTreeHandler(
     errors,
     evalMetaUpdates = [],
     evaluationOrder,
-    reValidatedPaths,
     isCreateFirstTree = false,
     isNewWidgetAdded,
     jsUpdates,
+    jsVarsCreatedEvent,
     logs,
     removedPaths,
+    reValidatedPaths,
     staleMetaIds,
     undefinedEvalValuesMap,
     unEvalUpdates,
-    jsVarsCreatedEvent,
     updates,
   } = evalTreeResponse;
 
@@ -247,12 +246,10 @@ export function* evaluateTreeSaga(
   > = yield select(getAllActionValidationConfig);
   const unevalTree = unEvalAndConfigTree.unEvalTree;
   const widgets: ReturnType<typeof getWidgets> = yield select(getWidgets);
-  const metaWidgets: ReturnType<typeof getMetaWidgets> = yield select(
-    getMetaWidgets,
-  );
-  const theme: ReturnType<typeof getSelectedAppTheme> = yield select(
-    getSelectedAppTheme,
-  );
+  const metaWidgets: ReturnType<typeof getMetaWidgets> =
+    yield select(getMetaWidgets);
+  const theme: ReturnType<typeof getSelectedAppTheme> =
+    yield select(getSelectedAppTheme);
   const toPrintConfigTree = unEvalAndConfigTree.configTree;
   log.debug({ unevalTree, configTree: toPrintConfigTree });
   PerformanceTracker.startAsyncTracking(
@@ -585,8 +582,18 @@ function* evaluationChangeListenerSaga(): any {
     call(lintWorker.start),
   ]);
 
+  const isFFFetched = yield select(getFeatureFlagsFetched);
+  if (!isFFFetched) {
+    yield call(fetchFeatureFlagsInit);
+    yield take(ReduxActionTypes.FETCH_FEATURE_FLAGS_SUCCESS);
+  }
+
+  const featureFlags: Record<string, boolean> =
+    yield select(selectFeatureFlags);
+
   yield call(evalWorker.request, EVAL_WORKER_ACTIONS.SETUP, {
     cloudHosting: !!APPSMITH_CONFIGS.cloudHosting,
+    featureFlags: featureFlags,
   });
   yield spawn(handleEvalWorkerRequestSaga, evalWorkerListenerChannel);
 
@@ -604,9 +611,8 @@ function* evaluationChangeListenerSaga(): any {
     evalQueueBuffer(),
   );
   while (true) {
-    const action: EvaluationReduxAction<unknown | unknown[]> = yield take(
-      evtActionChannel,
-    );
+    const action: EvaluationReduxAction<unknown | unknown[]> =
+      yield take(evtActionChannel);
 
     yield call(evalAndLintingHandler, true, action, {
       shouldReplay: get(action, "payload.shouldReplay"),
diff --git a/app/client/src/sagas/FormEvaluationSaga.ts b/app/client/src/sagas/FormEvaluationSaga.ts
index 56499c6240..b8c7bd9d9f 100644
--- a/app/client/src/sagas/FormEvaluationSaga.ts
+++ b/app/client/src/sagas/FormEvaluationSaga.ts
@@ -22,7 +22,7 @@ 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 "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import {
   extractFetchDynamicValueFormConfigs,
   extractQueueOfValuesToBeFetched,
@@ -30,7 +30,7 @@ import {
 import type { DatasourceConfiguration } from "entities/Datasource";
 import { buffers } from "redux-saga";
 
-export type FormEvalActionPayload = {
+export interface FormEvalActionPayload {
   formId: string;
   datasourceId?: string;
   pluginId?: string;
@@ -40,7 +40,7 @@ export type FormEvalActionPayload = {
   actionDiffPath?: string;
   hasRouteChanged?: boolean;
   datasourceConfiguration?: DatasourceConfiguration;
-};
+}
 
 // This value holds an array of values that needs to be dynamically fetched
 // when we run form evaluations we store dynamic values to be fetched in this array
@@ -270,9 +270,8 @@ function* formEvaluationChangeListenerSaga() {
         type: ReduxActionTypes.FORM_EVALUATION_EMPTY_BUFFER,
       });
     }
-    const action: ReduxAction<FormEvalActionPayload> = yield take(
-      formEvalChannel,
-    );
+    const action: ReduxAction<FormEvalActionPayload> =
+      yield take(formEvalChannel);
     yield call(setFormEvaluationSagaAsync, action);
   }
 }
diff --git a/app/client/src/sagas/GitSyncSagas.ts b/app/client/src/sagas/GitSyncSagas.ts
index 9408ddc60f..7f84bdda42 100644
--- a/app/client/src/sagas/GitSyncSagas.ts
+++ b/app/client/src/sagas/GitSyncSagas.ts
@@ -98,7 +98,7 @@ import { getCurrentWorkspace } from "@appsmith/selectors/workspaceSelectors";
 import type { Workspace } from "@appsmith/constants/workspaceConstants";
 import { log } from "loglevel";
 import GIT_ERROR_CODES from "constants/GitErrorCodes";
-import { builderURL } from "RouteBuilder";
+import { builderURL } from "@appsmith/RouteBuilder";
 import { APP_MODE } from "entities/App";
 import type { GitDiscardResponse } from "reducers/uiReducers/gitSyncReducer";
 import { FocusEntity, identifyEntityFromPath } from "navigation/FocusEntity";
@@ -1072,9 +1072,8 @@ function* watchGitRequests() {
   );
 
   while (true) {
-    const { type, ...args }: ReduxAction<unknown> = yield take(
-      gitActionChannel,
-    );
+    const { type, ...args }: ReduxAction<unknown> =
+      yield take(gitActionChannel);
     yield call(gitRequestActions[type], { type, ...args });
   }
 }
diff --git a/app/client/src/sagas/InitSagas.ts b/app/client/src/sagas/InitSagas.ts
index 84de28f7f7..d826b8fa21 100644
--- a/app/client/src/sagas/InitSagas.ts
+++ b/app/client/src/sagas/InitSagas.ts
@@ -69,10 +69,10 @@ export const URL_CHANGE_ACTIONS = [
   ReduxActionTypes.UPDATE_APPLICATION_SUCCESS,
 ];
 
-export type ReduxURLChangeAction = {
+export interface ReduxURLChangeAction {
   type: typeof URL_CHANGE_ACTIONS;
   payload: ApplicationPagePayload | ApplicationPayload | Page;
-};
+}
 
 export function* failFastApiCalls(
   triggerActions: Array<ReduxAction<unknown> | ReduxActionWithoutPayload>,
diff --git a/app/client/src/sagas/JSActionSagas.ts b/app/client/src/sagas/JSActionSagas.ts
index 51cfc162e7..64bac20837 100644
--- a/app/client/src/sagas/JSActionSagas.ts
+++ b/app/client/src/sagas/JSActionSagas.ts
@@ -55,7 +55,7 @@ import { ENTITY_TYPE } from "entities/AppsmithConsole";
 import LOG_TYPE from "entities/AppsmithConsole/logtype";
 import type { CreateJSCollectionRequest } from "api/JSActionAPI";
 import * as log from "loglevel";
-import { builderURL, jsCollectionIdURL } from "RouteBuilder";
+import { builderURL, jsCollectionIdURL } from "@appsmith/RouteBuilder";
 import type { EventLocation } from "@appsmith/utils/analyticsUtilTypes";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import { checkAndLogErrorsIfCyclicDependency } from "./helper";
@@ -361,9 +361,8 @@ export function* refactorJSObjectName(
         newName: newName,
       });
 
-    const isRefactorSuccessful: boolean = yield validateResponse(
-      refactorResponse,
-    );
+    const isRefactorSuccessful: boolean =
+      yield validateResponse(refactorResponse);
 
     const currentPageId: string | undefined = yield select(getCurrentPageId);
 
diff --git a/app/client/src/sagas/JSLibrarySaga.ts b/app/client/src/sagas/JSLibrarySaga.ts
index 0e1857ab9f..17d57a7101 100644
--- a/app/client/src/sagas/JSLibrarySaga.ts
+++ b/app/client/src/sagas/JSLibrarySaga.ts
@@ -404,9 +404,8 @@ function* startInstallationRequestChannel() {
     ReduxActionTypes.INSTALL_LIBRARY_INIT,
   ]);
   while (true) {
-    const action: ReduxAction<Partial<TJSLibrary>> = yield take(
-      queueInstallChannel,
-    );
+    const action: ReduxAction<Partial<TJSLibrary>> =
+      yield take(queueInstallChannel);
     yield put({
       type: ReduxActionTypes.INSTALL_LIBRARY_START,
       payload: action.payload.url,
diff --git a/app/client/src/sagas/JSPaneSagas.ts b/app/client/src/sagas/JSPaneSagas.ts
index d19df1b87b..1d96884888 100644
--- a/app/client/src/sagas/JSPaneSagas.ts
+++ b/app/client/src/sagas/JSPaneSagas.ts
@@ -75,7 +75,7 @@ import PageApi from "api/PageApi";
 import { updateCanvasWithDSL } from "sagas/PageSagas";
 import { set } from "lodash";
 import { updateReplayEntity } from "actions/pageActions";
-import { jsCollectionIdURL } from "RouteBuilder";
+import { jsCollectionIdURL } from "@appsmith/RouteBuilder";
 import type { ApiResponse } from "api/ApiResponses";
 import { shouldBeDefined } from "utils/helpers";
 import { ModalType } from "reducers/uiReducers/modalActionReducer";
@@ -568,9 +568,8 @@ function* handleRefactorJSActionNameSaga(
       const refactorResponse: ApiResponse =
         yield JSActionAPI.updateJSCollectionActionRefactor(requestData);
 
-      const isRefactorSuccessful: boolean = yield validateResponse(
-        refactorResponse,
-      );
+      const isRefactorSuccessful: boolean =
+        yield validateResponse(refactorResponse);
 
       const currentPageId: string | undefined = yield select(getCurrentPageId);
 
diff --git a/app/client/src/sagas/LintingSagas.ts b/app/client/src/sagas/LintingSagas.ts
index 56f31135ca..ea0c96edbd 100644
--- a/app/client/src/sagas/LintingSagas.ts
+++ b/app/client/src/sagas/LintingSagas.ts
@@ -22,6 +22,7 @@ import { getEntityNameAndPropertyPath } from "@appsmith/workers/Evaluation/evalu
 import { Linter } from "plugins/Linting/Linter";
 import log from "loglevel";
 import { getFixedTimeDifference } from "workers/common/DataTreeEvaluator/utils";
+import { selectFeatureFlags } from "@appsmith/selectors/featureFlagsSelectors";
 
 const APPSMITH_CONFIGS = getAppsmithConfigs();
 
@@ -124,4 +125,10 @@ export function* initiateLinting(
 
 export default function* lintTreeSagaWatcher() {
   yield takeEvery(ReduxActionTypes.UPDATE_LINT_GLOBALS, updateLintGlobals);
+  yield takeEvery(ReduxActionTypes.START_EVALUATION, setupSaga);
+}
+
+export function* setupSaga(): any {
+  const featureFlags = yield select(selectFeatureFlags);
+  yield call(lintWorker.setup, featureFlags);
 }
diff --git a/app/client/src/sagas/ModalSagas.ts b/app/client/src/sagas/ModalSagas.ts
index 036e4501c8..b2f5dbc06a 100644
--- a/app/client/src/sagas/ModalSagas.ts
+++ b/app/client/src/sagas/ModalSagas.ts
@@ -109,9 +109,8 @@ export function* createModalSaga(action: ReduxAction<{ modalName: string }>) {
 export function* showModalByNameSaga(
   action: ReduxAction<{ modalName: string }>,
 ) {
-  const widgets: { [widgetId: string]: FlattenedWidgetProps } = yield select(
-    getWidgets,
-  );
+  const widgets: { [widgetId: string]: FlattenedWidgetProps } =
+    yield select(getWidgets);
   const modal: FlattenedWidgetProps | undefined = Object.values(widgets).find(
     (widget: FlattenedWidgetProps) =>
       widget.widgetName === action.payload.modalName,
diff --git a/app/client/src/sagas/OnboardingSagas.ts b/app/client/src/sagas/OnboardingSagas.ts
index 2d566a9149..8209721560 100644
--- a/app/client/src/sagas/OnboardingSagas.ts
+++ b/app/client/src/sagas/OnboardingSagas.ts
@@ -77,10 +77,10 @@ import { selectWidgetInitAction } from "actions/widgetSelectionActions";
 import { hideIndicator } from "pages/Editor/GuidedTour/utils";
 import { updateWidgetName } from "actions/propertyPaneActions";
 import AnalyticsUtil from "utils/AnalyticsUtil";
-import type { DataTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
 import type { User } from "constants/userConstants";
-import { builderURL, queryEditorIdURL } from "RouteBuilder";
+import { builderURL, queryEditorIdURL } from "@appsmith/RouteBuilder";
 import { GuidedTourEntityNames } from "pages/Editor/GuidedTour/constants";
 import type { GuidedTourState } from "reducers/uiReducers/guidedTourReducer";
 import { sessionStorage } from "utils/localStorage";
@@ -186,9 +186,8 @@ function* setCurrentStepSaga(action: ReduxAction<number>) {
 function* setUpTourAppSaga() {
   yield put(setPreviewModeAction(false));
   // Delete the container widget
-  const widgets: { [widgetId: string]: FlattenedWidgetProps } = yield select(
-    getWidgets,
-  );
+  const widgets: { [widgetId: string]: FlattenedWidgetProps } =
+    yield select(getWidgets);
   const containerWidget = Object.values(widgets).find(
     (widget) => widget.type === "CONTAINER_WIDGET",
   );
@@ -281,9 +280,8 @@ function* addOnboardingWidget(action: ReduxAction<Partial<WidgetProps>>) {
     // Wait for widget names to be updated
     // Updating widget names here as widget blueprints don't take widget names
     yield take(ReduxActionTypes.SAVE_PAGE_SUCCESS);
-    const widgets: { [widgetId: string]: FlattenedWidgetProps } = yield select(
-      getWidgets,
-    );
+    const widgets: { [widgetId: string]: FlattenedWidgetProps } =
+      yield select(getWidgets);
 
     const nameInput = Object.values(widgets).find(
       (widget) => widget.widgetName === "Input1",
@@ -331,9 +329,8 @@ function* addOnboardingWidget(action: ReduxAction<Partial<WidgetProps>>) {
 
 // Update button widget text
 function* updateWidgetTextSaga() {
-  const widgets: { [widgetId: string]: FlattenedWidgetProps } = yield select(
-    getWidgets,
-  );
+  const widgets: { [widgetId: string]: FlattenedWidgetProps } =
+    yield select(getWidgets);
   const buttonWidget = Object.values(widgets).find(
     (widget) => widget.type === "BUTTON_WIDGET",
   );
@@ -373,9 +370,8 @@ function* endGuidedTourSaga(action: ReduxAction<boolean>) {
 function* selectWidgetSaga(
   action: ReduxAction<{ widgetName: string; propertyName?: string }>,
 ) {
-  const widgets: { [widgetId: string]: FlattenedWidgetProps } = yield select(
-    getWidgets,
-  );
+  const widgets: { [widgetId: string]: FlattenedWidgetProps } =
+    yield select(getWidgets);
   const widget = Object.values(widgets).find((widget) => {
     return widget.widgetName === action.payload.widgetName;
   });
diff --git a/app/client/src/sagas/PageSagas.tsx b/app/client/src/sagas/PageSagas.tsx
index 363d4aca8e..07f077f44b 100644
--- a/app/client/src/sagas/PageSagas.tsx
+++ b/app/client/src/sagas/PageSagas.tsx
@@ -126,7 +126,7 @@ import {
 
 import WidgetFactory from "WidgetProvider/factory";
 import { toggleShowDeviationDialog } from "actions/onboardingActions";
-import { builderURL } from "RouteBuilder";
+import { builderURL } from "@appsmith/RouteBuilder";
 import { failFastApiCalls, waitForWidgetConfigBuild } from "./InitSagas";
 import { resizePublishedMainCanvasToLowestWidget } from "./WidgetOperationUtils";
 import { checkAndLogErrorsIfCyclicDependency } from "./helper";
@@ -171,10 +171,13 @@ export function* fetchPageListSaga(
     const response: FetchPageListResponse = yield call(apiCall, applicationId);
     const isValidResponse: boolean = yield validateResponse(response);
     const prevPagesState: Page[] = yield select(getPageList);
-    const pagePermissionsMap = prevPagesState.reduce((acc, page) => {
-      acc[page.pageId] = page.userPermissions ?? [];
-      return acc;
-    }, {} as Record<string, string[]>);
+    const pagePermissionsMap = prevPagesState.reduce(
+      (acc, page) => {
+        acc[page.pageId] = page.userPermissions ?? [];
+        return acc;
+      },
+      {} as Record<string, string[]>,
+    );
     if (isValidResponse) {
       const workspaceId = response.data.workspaceId;
       const pages: Page[] = response.data.pages.map((page) => ({
@@ -292,9 +295,8 @@ export function* handleFetchedPage({
   isFirstLoad?: boolean;
 }) {
   const isAutoLayout: boolean = yield select(getIsAutoLayout);
-  const mainCanvasProps: MainCanvasReduxState = yield select(
-    getMainCanvasProps,
-  );
+  const mainCanvasProps: MainCanvasReduxState =
+    yield select(getMainCanvasProps);
   const isValidResponse: boolean = yield validateResponse(fetchPageResponse);
   const willPageBeMigrated = checkIfMigrationIsNeeded(fetchPageResponse);
   const lastUpdatedTime = getLastUpdateTime(fetchPageResponse);
@@ -705,9 +707,8 @@ export function* createNewPageFromEntity(
 ) {
   try {
     const isAutoLayout: boolean = yield select(getIsAutoLayout);
-    const mainCanvasProps: MainCanvasReduxState = yield select(
-      getMainCanvasProps,
-    );
+    const mainCanvasProps: MainCanvasReduxState =
+      yield select(getMainCanvasProps);
     // Default layout is extracted by adding dynamically computed properties like min-height.
     const defaultPageLayouts = [
       {
@@ -748,9 +749,8 @@ export function* createPageSaga(
   try {
     const guidedTourEnabled: boolean = yield select(inGuidedTour);
     const isAutoLayout: boolean = yield select(getIsAutoLayout);
-    const mainCanvasProps: MainCanvasReduxState = yield select(
-      getMainCanvasProps,
-    );
+    const mainCanvasProps: MainCanvasReduxState =
+      yield select(getMainCanvasProps);
 
     // Prevent user from creating a new page during the guided tour
     if (guidedTourEnabled) {
@@ -1130,9 +1130,8 @@ export function* setDataUrl() {
 export function* fetchPageDSLSaga(pageId: string) {
   try {
     const isAutoLayout: boolean = yield select(getIsAutoLayout);
-    const mainCanvasProps: MainCanvasReduxState = yield select(
-      getMainCanvasProps,
-    );
+    const mainCanvasProps: MainCanvasReduxState =
+      yield select(getMainCanvasProps);
     const fetchPageResponse: FetchPageResponse = yield call(PageApi.fetchPage, {
       id: pageId,
     });
diff --git a/app/client/src/sagas/PluginSagas.ts b/app/client/src/sagas/PluginSagas.ts
index d6e6fa6255..73a1b11715 100644
--- a/app/client/src/sagas/PluginSagas.ts
+++ b/app/client/src/sagas/PluginSagas.ts
@@ -214,7 +214,10 @@ export function* checkAndGetPluginFormConfigsSaga(pluginId: string) {
   }
 }
 
-type GetPluginFormConfigParams = { id: string; type: string };
+interface GetPluginFormConfigParams {
+  id: string;
+  type: string;
+}
 
 function* getPluginFormConfig({ id }: GetPluginFormConfigParams) {
   yield call(checkAndGetPluginFormConfigsSaga, id);
diff --git a/app/client/src/sagas/PostEvaluationSagas.ts b/app/client/src/sagas/PostEvaluationSagas.ts
index 656e46d790..dfb89089f8 100644
--- a/app/client/src/sagas/PostEvaluationSagas.ts
+++ b/app/client/src/sagas/PostEvaluationSagas.ts
@@ -4,12 +4,12 @@ import {
   PLATFORM_ERROR,
   Severity,
 } from "entities/AppsmithConsole";
+import type { WidgetEntityConfig } from "@appsmith/entities/DataTree/types";
 import type {
   ConfigTree,
   DataTree,
   UnEvalTree,
-  WidgetEntityConfig,
-} from "@appsmith/entities/DataTree/types";
+} from "entities/DataTree/dataTreeTypes";
 import type { DataTreeDiff } from "@appsmith/workers/Evaluation/evaluationUtils";
 import {
   DataTreeDiffEvent,
@@ -222,9 +222,8 @@ export function* evalErrorHandler(
   removedPaths?: Array<{ entityId: string; fullpath: string }>,
 ) {
   if (dataTree && evaluationOrder && configTree && reValidatedPaths) {
-    const currentDebuggerErrors: Record<string, Log> = yield select(
-      getDebuggerErrors,
-    );
+    const currentDebuggerErrors: Record<string, Log> =
+      yield select(getDebuggerErrors);
 
     const evalAndValidationOrder = new Set([
       ...reValidatedPaths,
diff --git a/app/client/src/sagas/PostLintingSagas.ts b/app/client/src/sagas/PostLintingSagas.ts
index ec62c6bda5..6dc006c25d 100644
--- a/app/client/src/sagas/PostLintingSagas.ts
+++ b/app/client/src/sagas/PostLintingSagas.ts
@@ -1,6 +1,6 @@
 import { ENTITY_TYPE, Severity } from "entities/AppsmithConsole";
 import LOG_TYPE from "entities/AppsmithConsole/logtype";
-import type { DataTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { isEmpty } from "lodash";
 import AppsmithConsole from "utils/AppsmithConsole";
 import {
diff --git a/app/client/src/sagas/ProvidersSaga.ts b/app/client/src/sagas/ProvidersSaga.ts
index 368ecfcc66..a9bd13e6cf 100644
--- a/app/client/src/sagas/ProvidersSaga.ts
+++ b/app/client/src/sagas/ProvidersSaga.ts
@@ -124,9 +124,8 @@ export function* fetchProvidersWithCategorySaga(
 ) {
   try {
     const request: FetchProviderWithCategoryRequest = action.payload;
-    const response: Providers = yield ProvidersApi.fetchProvidersWithCategory(
-      request,
-    );
+    const response: Providers =
+      yield ProvidersApi.fetchProvidersWithCategory(request);
 
     const isValidResponse: boolean = yield validateResponse(response);
 
diff --git a/app/client/src/sagas/QueryPaneSagas.ts b/app/client/src/sagas/QueryPaneSagas.ts
index 66f78bf805..b11783ca03 100644
--- a/app/client/src/sagas/QueryPaneSagas.ts
+++ b/app/client/src/sagas/QueryPaneSagas.ts
@@ -68,7 +68,7 @@ import {
   generateTemplateFormURL,
   integrationEditorURL,
   queryEditorIdURL,
-} from "RouteBuilder";
+} from "@appsmith/RouteBuilder";
 import type { GenerateCRUDEnabledPluginMap, Plugin } from "api/PluginApi";
 import { UIComponentTypes } from "api/PluginApi";
 import { getUIComponent } from "pages/Editor/QueryEditor/helpers";
@@ -342,9 +342,8 @@ function* handleQueryCreatedSaga(actionPayload: ReduxAction<QueryAction>) {
     actionPayload.payload;
   const pageId: string = yield select(getCurrentPageId);
   if (pluginType !== PluginType.DB && pluginType !== PluginType.REMOTE) return;
-  const pluginTemplates: Record<string, unknown> = yield select(
-    getPluginTemplates,
-  );
+  const pluginTemplates: Record<string, unknown> =
+    yield select(getPluginTemplates);
   const queryTemplate = pluginTemplates[pluginId];
   // Do not show template view if the query has body(code) or if there are no templates or if the plugin is MongoDB
   const showTemplate = !(
diff --git a/app/client/src/sagas/ReplaySaga.ts b/app/client/src/sagas/ReplaySaga.ts
index f01278258a..a53e89daaa 100644
--- a/app/client/src/sagas/ReplaySaga.ts
+++ b/app/client/src/sagas/ReplaySaga.ts
@@ -81,9 +81,9 @@ import type { Plugin } from "api/PluginApi";
 import { UIComponentTypes } from "api/PluginApi";
 import { getCurrentEnvironmentId } from "@appsmith/selectors/environmentSelectors";
 
-export type UndoRedoPayload = {
+export interface UndoRedoPayload {
   operation: ReplayReduxActionTypes;
-};
+}
 
 export default function* undoRedoListenerSaga() {
   yield all([
diff --git a/app/client/src/sagas/SaaSPaneSagas.ts b/app/client/src/sagas/SaaSPaneSagas.ts
index c125a4a4be..d60210aafa 100644
--- a/app/client/src/sagas/SaaSPaneSagas.ts
+++ b/app/client/src/sagas/SaaSPaneSagas.ts
@@ -13,7 +13,7 @@ import {
   generateTemplateFormURL,
   saasEditorApiIdURL,
   saasEditorDatasourceIdURL,
-} from "RouteBuilder";
+} from "@appsmith/RouteBuilder";
 import { getCurrentPageId } from "selectors/editorSelectors";
 import type { CreateDatasourceSuccessAction } from "actions/datasourceActions";
 import { getQueryParams } from "utils/URLUtils";
diff --git a/app/client/src/sagas/SnapshotSagas.ts b/app/client/src/sagas/SnapshotSagas.ts
index 2ca9bacfa2..e95fc19624 100644
--- a/app/client/src/sagas/SnapshotSagas.ts
+++ b/app/client/src/sagas/SnapshotSagas.ts
@@ -84,9 +84,8 @@ function* restoreApplicationFromSnapshotSaga() {
       applicationId,
     });
 
-    const currentLayoutSystemType: LayoutSystemTypes = yield select(
-      getLayoutSystemType,
-    );
+    const currentLayoutSystemType: LayoutSystemTypes =
+      yield select(getLayoutSystemType);
 
     const isValidResponse: boolean = yield validateResponse(
       response,
@@ -170,9 +169,8 @@ export function* deleteApplicationSnapshotSaga() {
 //Saga to update snapshot details by fetching info from backend
 function* updateSnapshotDetailsSaga() {
   try {
-    const snapShotDetails: { updatedTime: Date } | undefined = yield call(
-      fetchSnapshotSaga,
-    );
+    const snapShotDetails: { updatedTime: Date } | undefined =
+      yield call(fetchSnapshotSaga);
     yield put(
       updateSnapshotDetails(
         snapShotDetails && snapShotDetails.updatedTime
diff --git a/app/client/src/sagas/TemplatesSagas.ts b/app/client/src/sagas/TemplatesSagas.ts
index ccfad8a8e1..c984b00c97 100644
--- a/app/client/src/sagas/TemplatesSagas.ts
+++ b/app/client/src/sagas/TemplatesSagas.ts
@@ -25,7 +25,7 @@ import {
   setTemplateNotificationSeen,
 } from "utils/storage";
 import { validateResponse } from "./ErrorSagas";
-import { builderURL } from "RouteBuilder";
+import { builderURL } from "@appsmith/RouteBuilder";
 import { getCurrentApplicationId } from "selectors/editorSelectors";
 import { getCurrentWorkspaceId } from "@appsmith/selectors/workspaceSelectors";
 import {
diff --git a/app/client/src/sagas/ThemeSaga.tsx b/app/client/src/sagas/ThemeSaga.tsx
index 4704fe37b6..07fbd6ecbb 100644
--- a/app/client/src/sagas/ThemeSaga.tsx
+++ b/app/client/src/sagas/ThemeSaga.tsx
@@ -6,9 +6,9 @@ import type { ThemeMode } from "selectors/themeSelectors";
 import { getCurrentThemeDetails } from "selectors/themeSelectors";
 import { trimTrailingSlash } from "utils/helpers";
 
-export type BackgroundTheme = {
+export interface BackgroundTheme {
   colors: { homepageBackground: string; appBackground: string };
-};
+}
 
 export function changeAppBackground(currentTheme: BackgroundTheme) {
   if (
diff --git a/app/client/src/sagas/ToastSagas.ts b/app/client/src/sagas/ToastSagas.ts
index 77c57aef02..c158fa3d11 100644
--- a/app/client/src/sagas/ToastSagas.ts
+++ b/app/client/src/sagas/ToastSagas.ts
@@ -5,10 +5,10 @@ import { select } from "redux-saga/effects";
 import { getAppMode } from "@appsmith/selectors/entitiesSelector";
 import log from "loglevel";
 
-type ExtraOptions = {
+interface ExtraOptions {
   // This enables showing of toast no matter the conditions
   forceDisplay?: boolean;
-};
+}
 
 /**
  * Shows toast
diff --git a/app/client/src/sagas/WebsocketSagas/versionUpdatePrompt.ts b/app/client/src/sagas/WebsocketSagas/versionUpdatePrompt.ts
index 574c616f67..e6082344df 100644
--- a/app/client/src/sagas/WebsocketSagas/versionUpdatePrompt.ts
+++ b/app/client/src/sagas/WebsocketSagas/versionUpdatePrompt.ts
@@ -19,12 +19,12 @@ enum UpdateStateEvent {
   UPDATE_REQUESTED = "UPDATE_REQUESTED",
 }
 
-export type VersionUpdateState = {
+export interface VersionUpdateState {
   currentVersion: string;
   upgradeVersion: string;
   timesShown: number;
   event: UpdateStateEvent;
-};
+}
 
 let timesShown = 0;
 
diff --git a/app/client/src/sagas/WidgetAdditionSagas.ts b/app/client/src/sagas/WidgetAdditionSagas.ts
index e24c454749..093127e9b7 100644
--- a/app/client/src/sagas/WidgetAdditionSagas.ts
+++ b/app/client/src/sagas/WidgetAdditionSagas.ts
@@ -37,7 +37,7 @@ import {
 } from "WidgetProvider/constants";
 import { getPropertiesToUpdate } from "./WidgetOperationSagas";
 import { klona as clone } from "klona/full";
-import type { DataTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { generateAutoHeightLayoutTreeAction } from "actions/autoHeightActions";
 import { toast } from "design-system";
 import { ResponsiveBehavior } from "layoutSystems/common/utils/constants";
@@ -52,15 +52,15 @@ import { isFunction } from "lodash";
 
 const WidgetTypes = WidgetFactory.widgetTypes;
 
-type GeneratedWidgetPayload = {
+interface GeneratedWidgetPayload {
   widgetId: string;
   widgets: { [widgetId: string]: FlattenedWidgetProps };
-};
+}
 
-type WidgetAddTabChild = {
+interface WidgetAddTabChild {
   tabs: any;
   widgetId: string;
-};
+}
 
 function* getEntityNames() {
   const evalTree: DataTree = yield select(getDataTree);
diff --git a/app/client/src/sagas/WidgetBlueprintSagas.ts b/app/client/src/sagas/WidgetBlueprintSagas.ts
index 99f32a7eaf..c774d354bd 100644
--- a/app/client/src/sagas/WidgetBlueprintSagas.ts
+++ b/app/client/src/sagas/WidgetBlueprintSagas.ts
@@ -50,11 +50,11 @@ export function* buildWidgetBlueprint(
   return widgetProps;
 }
 
-export type UpdatePropertyArgs = {
+export interface UpdatePropertyArgs {
   widgetId: string;
   propertyName: string;
   propertyValue: any;
-};
+}
 export type BlueprintOperationAddActionFn = () => void;
 export type BlueprintOperationModifyPropsFn = (
   widget: WidgetProps & { children?: WidgetProps[] },
@@ -93,10 +93,10 @@ export type BlueprintOperationFunction =
 
 export type BlueprintOperationType = keyof typeof BlueprintOperationTypes;
 
-export type BlueprintOperation = {
+export interface BlueprintOperation {
   type: BlueprintOperationType;
   fn: BlueprintOperationFunction;
-};
+}
 
 export function* executeWidgetBlueprintOperations(
   operations: BlueprintOperation[],
@@ -243,12 +243,12 @@ export function* traverseTreeAndExecuteBlueprintChildOperations(
   return widgets;
 }
 
-type ExecuteWidgetBlueprintBeforeOperationsParams = {
+interface ExecuteWidgetBlueprintBeforeOperationsParams {
   parentId: string;
   widgetId: string;
   widgets: { [widgetId: string]: FlattenedWidgetProps };
   widgetType: WidgetType;
-};
+}
 
 export function* executeWidgetBlueprintBeforeOperations(
   blueprintOperation: Extract<
diff --git a/app/client/src/sagas/WidgetDeletionSagas.ts b/app/client/src/sagas/WidgetDeletionSagas.ts
index b0866e552e..476b4c1b60 100644
--- a/app/client/src/sagas/WidgetDeletionSagas.ts
+++ b/app/client/src/sagas/WidgetDeletionSagas.ts
@@ -51,13 +51,13 @@ import { updateFlexLayersOnDelete } from "../layoutSystems/autolayout/utils/Auto
 
 const WidgetTypes = WidgetFactory.widgetTypes;
 
-type WidgetDeleteTabChild = {
+interface WidgetDeleteTabChild {
   id: string;
   index: number;
   isVisible: boolean;
   label: string;
   widgetId: string;
-};
+}
 
 function* deleteTabChildSaga(
   deleteChildTabAction: ReduxAction<WidgetDeleteTabChild>,
@@ -122,9 +122,8 @@ function* deleteTabChildSaga(
 
 function* deleteSagaInit(deleteAction: ReduxAction<WidgetDelete>) {
   const { widgetId } = deleteAction.payload;
-  const selectedWidget: FlattenedWidgetProps | undefined = yield select(
-    getSelectedWidget,
-  );
+  const selectedWidget: FlattenedWidgetProps | undefined =
+    yield select(getSelectedWidget);
   const selectedWidgets: string[] = yield select(getSelectedWidgets);
   const guidedTourEnabled: boolean = yield select(inGuidedTour);
   const isExploring: boolean = yield select(isExploringSelector);
@@ -209,9 +208,8 @@ function* deleteSaga(deleteAction: ReduxAction<WidgetDelete>) {
     const { disallowUndo, isShortcut } = deleteAction.payload;
 
     if (!widgetId) {
-      const selectedWidget: FlattenedWidgetProps | undefined = yield select(
-        getSelectedWidget,
-      );
+      const selectedWidget: FlattenedWidgetProps | undefined =
+        yield select(getSelectedWidget);
       if (!selectedWidget) return;
 
       // if widget is not deletable, don't do anything
diff --git a/app/client/src/sagas/WidgetEnhancementHelpers.ts b/app/client/src/sagas/WidgetEnhancementHelpers.ts
index 1845bf69ed..14cf40995c 100644
--- a/app/client/src/sagas/WidgetEnhancementHelpers.ts
+++ b/app/client/src/sagas/WidgetEnhancementHelpers.ts
@@ -178,13 +178,13 @@ export function useChildWidgetEnhancementFn(
 type EnhancementFn = (parentProps: any, ...rest: any) => unknown;
 type BoundEnhancementFn = (...rest: any) => unknown;
 
-type EnhancementFns = {
+interface EnhancementFns {
   updateDataTreePathFn?: BoundEnhancementFn;
   propertyPaneEnhancementFn?: BoundEnhancementFn;
   autoCompleteEnhancementFn?: BoundEnhancementFn;
   customJSControlEnhancementFn?: BoundEnhancementFn;
   hideEvaluatedValueEnhancementFn?: BoundEnhancementFn;
-};
+}
 
 export function useChildWidgetEnhancementFns(widgetId: string): EnhancementFns {
   const enhancementFns = {
diff --git a/app/client/src/sagas/WidgetLoadingSaga.ts b/app/client/src/sagas/WidgetLoadingSaga.ts
index f619a4988f..10548cf102 100644
--- a/app/client/src/sagas/WidgetLoadingSaga.ts
+++ b/app/client/src/sagas/WidgetLoadingSaga.ts
@@ -4,7 +4,7 @@ import {
   getEvaluationInverseDependencyMap,
   getDataTree,
 } from "selectors/dataTreeSelectors";
-import type { DataTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { getActions } from "@appsmith/selectors/entitiesSelector";
 import type {
   ActionData,
diff --git a/app/client/src/sagas/WidgetOperationSagas.tsx b/app/client/src/sagas/WidgetOperationSagas.tsx
index c94be7f11b..f082af8338 100644
--- a/app/client/src/sagas/WidgetOperationSagas.tsx
+++ b/app/client/src/sagas/WidgetOperationSagas.tsx
@@ -137,11 +137,8 @@ import {
   purgeOrphanedDynamicPaths,
 } from "./WidgetOperationUtils";
 import { widgetSelectionSagas } from "./WidgetSelectionSagas";
-import type {
-  DataTree,
-  ConfigTree,
-  WidgetEntityConfig,
-} from "@appsmith/entities/DataTree/types";
+import type { WidgetEntityConfig } from "@appsmith/entities/DataTree/types";
+import type { DataTree, ConfigTree } from "entities/DataTree/dataTreeTypes";
 import { getCanvasSizeAfterWidgetMove } from "./CanvasSagas/DraggingCanvasSagas";
 import widgetAdditionSagas from "./WidgetAdditionSagas";
 import widgetDeletionSagas from "./WidgetDeletionSagas";
@@ -158,7 +155,7 @@ import { reflow } from "reflow";
 import { getBottomMostRow } from "reflow/reflowUtils";
 import { flashElementsById } from "utils/helpers";
 import { getSlidingArenaName } from "constants/componentClassNameConstants";
-import { builderURL } from "RouteBuilder";
+import { builderURL } from "@appsmith/RouteBuilder";
 import history from "utils/history";
 import { generateAutoHeightLayoutTreeAction } from "actions/autoHeightActions";
 import {
@@ -212,9 +209,8 @@ export function* resizeSaga(resizeAction: ReduxAction<WidgetResize>) {
       widgetId,
     } = resizeAction.payload;
 
-    const layoutSystemType: LayoutSystemTypes = yield select(
-      getLayoutSystemType,
-    );
+    const layoutSystemType: LayoutSystemTypes =
+      yield select(getLayoutSystemType);
     const mainCanvasWidth: number = yield select(getCanvasWidth);
     widget = {
       ...widget,
@@ -360,10 +356,10 @@ enum DynamicPathUpdateEffectEnum {
   NOOP = "NOOP",
 }
 
-type DynamicPathUpdate = {
+interface DynamicPathUpdate {
   propertyPath: string;
   effect: DynamicPathUpdateEffectEnum;
-};
+}
 
 function getDynamicTriggerPathListUpdate(
   widget: WidgetProps,
@@ -692,7 +688,7 @@ export function* getPropertiesUpdatedWidget(
 ) {
   const { dynamicUpdates, updates, widgetId } = updatesObj;
 
-  const { modify = {}, remove = [], postUpdateAction, triggerPaths } = updates;
+  const { modify = {}, postUpdateAction, remove = [], triggerPaths } = updates;
 
   const stateWidget: WidgetProps = yield select(getWidget, widgetId);
 
@@ -993,9 +989,8 @@ function* createSelectedWidgetsCopy(
  * @returns
  */
 function* copyWidgetSaga(action: ReduxAction<{ isShortcut: boolean }>) {
-  const allWidgets: { [widgetId: string]: FlattenedWidgetProps } = yield select(
-    getWidgets,
-  );
+  const allWidgets: { [widgetId: string]: FlattenedWidgetProps } =
+    yield select(getWidgets);
   const selectedWidgets: string[] = yield select(getSelectedWidgets);
   if (!selectedWidgets) {
     toast.show(createMessage(ERROR_WIDGET_COPY_NO_WIDGET_SELECTED), {
@@ -1837,9 +1832,8 @@ function* pasteWidgetSaga(
                   !flexLayers ||
                   flexLayers.length <= 0)
               ) {
-                const metaProps: Record<string, any> = yield select(
-                  getWidgetsMeta,
-                );
+                const metaProps: Record<string, any> =
+                  yield select(getWidgetsMeta);
                 if (widget.widgetId === widgetIdMap[copiedWidget.widgetId])
                   widgets = pasteWidgetInFlexLayers(
                     widgets,
@@ -1958,9 +1952,8 @@ function* pasteWidgetSaga(
 }
 
 function* cutWidgetSaga() {
-  const allWidgets: { [widgetId: string]: FlattenedWidgetProps } = yield select(
-    getWidgets,
-  );
+  const allWidgets: { [widgetId: string]: FlattenedWidgetProps } =
+    yield select(getWidgets);
   const selectedWidgets: string[] = yield select(getSelectedWidgets);
   if (!selectedWidgets) {
     toast.show(createMessage(ERROR_WIDGET_CUT_NO_WIDGET_SELECTED), {
diff --git a/app/client/src/sagas/WidgetOperationUtils.ts b/app/client/src/sagas/WidgetOperationUtils.ts
index 2618465f7a..990b8a2cec 100644
--- a/app/client/src/sagas/WidgetOperationUtils.ts
+++ b/app/client/src/sagas/WidgetOperationUtils.ts
@@ -16,7 +16,7 @@ import {
   WIDGET_PADDING,
 } from "constants/WidgetConstants";
 import { all, call } from "redux-saga/effects";
-import type { DataTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { select } from "redux-saga/effects";
 import { getCopiedWidgets } from "utils/storage";
 import type { WidgetProps } from "widgets/BaseWidget";
@@ -69,13 +69,13 @@ export interface CopiedWidgetGroup {
   list: WidgetProps[];
 }
 
-export type NewPastePositionVariables = {
+export interface NewPastePositionVariables {
   bottomMostRow?: number;
   gridProps?: GridProps;
   newPastingPositionMap?: SpaceMap;
   reflowedMovementMap?: ReflowedSpaceMap;
   canvasId?: string;
-};
+}
 
 export const WIDGET_PASTE_PADDING = 1;
 
@@ -345,11 +345,11 @@ function sortWidgetsMetaByParent(widgetsMeta: MetaState, parentId: string) {
   );
 }
 
-export type DescendantWidgetMap = {
+export interface DescendantWidgetMap {
   id: string;
   // To accomodate metaWidgets which might not be present on the evalTree, evaluatedWidget might be undefined
   evaluatedWidget: WidgetEntity | undefined;
-};
+}
 
 /**
  * As part of widget's descendant, we add both children and metaWidgets.
@@ -671,13 +671,11 @@ export const getSelectedWidgetWhenPasting = function* () {
   const { widgets: copiedWidgetGroups }: { widgets: CopiedWidgetGroup[] } =
     yield getCopiedWidgets();
 
-  let selectedWidget: FlattenedWidgetProps | undefined = yield select(
-    getSelectedWidget,
-  );
+  let selectedWidget: FlattenedWidgetProps | undefined =
+    yield select(getSelectedWidget);
 
-  const focusedWidget: FlattenedWidgetProps | undefined = yield select(
-    getFocusedWidget,
-  );
+  const focusedWidget: FlattenedWidgetProps | undefined =
+    yield select(getFocusedWidget);
 
   selectedWidget = getSelectedWidgetIfPastingIntoListWidget(
     canvasWidgets,
@@ -1490,9 +1488,8 @@ export function getNextWidgetName(
  * @returns
  */
 export function* createWidgetCopy(widget: FlattenedWidgetProps) {
-  const allWidgets: { [widgetId: string]: FlattenedWidgetProps } = yield select(
-    getWidgets,
-  );
+  const allWidgets: { [widgetId: string]: FlattenedWidgetProps } =
+    yield select(getWidgets);
   const widgetsToStore = getAllWidgetsInTree(widget.widgetId, allWidgets);
   return {
     widgetId: widget.widgetId,
diff --git a/app/client/src/sagas/WidgetSelectionSagas.ts b/app/client/src/sagas/WidgetSelectionSagas.ts
index 9d4b2e6aa3..8315bb64f8 100644
--- a/app/client/src/sagas/WidgetSelectionSagas.ts
+++ b/app/client/src/sagas/WidgetSelectionSagas.ts
@@ -28,7 +28,7 @@ import {
   getIsFetchingPage,
   snipingModeSelector,
 } from "selectors/editorSelectors";
-import { builderURL, widgetURL } from "RouteBuilder";
+import { builderURL, widgetURL } from "@appsmith/RouteBuilder";
 import {
   getAppMode,
   getCanvasWidgets,
@@ -56,10 +56,10 @@ import { APP_MODE } from "entities/App";
 function* selectWidgetSaga(action: ReduxAction<WidgetSelectionRequestPayload>) {
   try {
     const {
-      payload = [],
-      selectionRequestType,
       invokedBy,
       pageId,
+      payload = [],
+      selectionRequestType,
     } = action.payload;
 
     if (payload.some(isInvalidSelectionRequest)) {
@@ -215,15 +215,22 @@ function* appendSelectedWidgetToUrlSaga(
 
 function* waitForInitialization(saga: any, action: ReduxAction<unknown>) {
   const isEditorInitialized: boolean = yield select(getIsEditorInitialized);
-  const isPageFetching: boolean = yield select(getIsFetchingPage);
   const appMode: APP_MODE = yield select(getAppMode);
-  const viewMode = appMode === APP_MODE.PUBLISHED;
-  if (!isEditorInitialized && !viewMode) {
+  const isViewMode = appMode === APP_MODE.PUBLISHED;
+
+  // Wait until the editor is initialised, and ensure we're not in the view mode
+  if (!isEditorInitialized && !isViewMode) {
     yield take(ReduxActionTypes.INITIALIZE_EDITOR_SUCCESS);
   }
+
+  // Wait until we're done fetching the page
+  // This is so that we can reliably assume that the Editor and the Canvas have loaded
+  const isPageFetching: boolean = yield select(getIsFetchingPage);
   if (isPageFetching) {
     yield take(ReduxActionTypes.FETCH_PAGE_SUCCESS);
   }
+
+  // Continue yielding
   yield call(saga, action);
 }
 
@@ -238,17 +245,43 @@ function* handleWidgetSelectionSaga(
 function* openOrCloseModalSaga(action: ReduxAction<{ widgetIds: string[] }>) {
   if (action.payload.widgetIds.length !== 1) return;
 
-  const selectedWidget = action.payload.widgetIds[0];
+  // Let's assume that the payload widgetId is a modal widget and we need to open the modal as it is selected
+  let modalWidgetToOpen: string = action.payload.widgetIds[0];
 
+  // Get all modal widget ids
   const modalWidgetIds: string[] = yield select(
     getWidgetIdsByType,
     "MODAL_WIDGET",
   );
 
-  const widgetIsModal = modalWidgetIds.includes(selectedWidget);
+  // Get all widgets
+  const allWidgets: CanvasWidgetsReduxState = yield select(getWidgets);
+  // Get the ancestry of the selected widget
+  const widgetAncestry = getWidgetAncestry(modalWidgetToOpen, allWidgets);
 
-  if (widgetIsModal) {
-    yield put(showModal(selectedWidget));
+  // If the selected widget is a modal, we want to open the modal
+  const widgetIsModal =
+    // Check if the widget is a modal widget
+    modalWidgetIds.includes(modalWidgetToOpen);
+
+  // Let's assume that this is not a child of a modal widget
+  let widgetIsChildOfModal = false;
+
+  if (!widgetIsModal) {
+    // Check if the widget is a child of a modal widget
+    const indexOfParentModalWidget: number = widgetAncestry.findIndex((id) =>
+      modalWidgetIds.includes(id),
+    );
+    // If we found a modal widget in the ancestry, we want to open that modal
+    if (indexOfParentModalWidget > -1) {
+      // Set the flag to true, so that we can open the modal
+      widgetIsChildOfModal = true;
+      modalWidgetToOpen = widgetAncestry[indexOfParentModalWidget];
+    }
+  }
+
+  if (widgetIsModal || widgetIsChildOfModal) {
+    yield put(showModal(modalWidgetToOpen));
   }
 }
 
diff --git a/app/client/src/sagas/autoHeightSagas/containers.ts b/app/client/src/sagas/autoHeightSagas/containers.ts
index dbcd1ed882..62cae50c6b 100644
--- a/app/client/src/sagas/autoHeightSagas/containers.ts
+++ b/app/client/src/sagas/autoHeightSagas/containers.ts
@@ -14,7 +14,8 @@ import {
 } from "widgets/WidgetUtils";
 import { getChildOfContainerLikeWidget } from "./helpers";
 import { getDataTree } from "selectors/dataTreeSelectors";
-import type { DataTree, WidgetEntity } from "@appsmith/entities/DataTree/types";
+import type { WidgetEntity } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { getLayoutTree } from "./layoutTree";
 import { getWidgetsForBreakpoint } from "selectors/editorSelectors";
 
diff --git a/app/client/src/sagas/autoHeightSagas/helpers.ts b/app/client/src/sagas/autoHeightSagas/helpers.ts
index f6a541081b..e9b82571e6 100644
--- a/app/client/src/sagas/autoHeightSagas/helpers.ts
+++ b/app/client/src/sagas/autoHeightSagas/helpers.ts
@@ -15,7 +15,8 @@ import { previewModeSelector } from "selectors/editorSelectors";
 import { getAppMode } from "@appsmith/selectors/entitiesSelector";
 import { isAutoHeightEnabledForWidget } from "widgets/WidgetUtils";
 import { getCanvasHeightOffset } from "utils/WidgetSizeUtils";
-import type { DataTree, WidgetEntity } from "@appsmith/entities/DataTree/types";
+import type { WidgetEntity } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { getDataTree } from "selectors/dataTreeSelectors";
 
 export function* shouldWidgetsCollapse() {
diff --git a/app/client/src/sagas/autoHeightSagas/widgets.ts b/app/client/src/sagas/autoHeightSagas/widgets.ts
index 34a0f12505..573921b022 100644
--- a/app/client/src/sagas/autoHeightSagas/widgets.ts
+++ b/app/client/src/sagas/autoHeightSagas/widgets.ts
@@ -243,9 +243,8 @@ export function* updateWidgetAutoHeightSaga(
     // Get the canvas level map from the store
     // This map tells us the nesting of each canvas widget in the DSL.
     // MainContainer's level is 0.
-    const canvasLevelMap: CanvasLevelsReduxState = yield select(
-      getCanvasLevelMap,
-    );
+    const canvasLevelMap: CanvasLevelsReduxState =
+      yield select(getCanvasLevelMap);
     // 1. Get all siblings together.
 
     // Get all updates for that level.
diff --git a/app/client/src/selectors/actionSelectors.tsx b/app/client/src/selectors/actionSelectors.tsx
index de38e7e91f..47f3d97b49 100644
--- a/app/client/src/selectors/actionSelectors.tsx
+++ b/app/client/src/selectors/actionSelectors.tsx
@@ -1,4 +1,4 @@
-import type { DataTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { createSelector } from "reselect";
 import WidgetFactory from "WidgetProvider/factory";
 import type { FlattenedWidgetProps } from "WidgetProvider/constants";
diff --git a/app/client/src/selectors/crudInfoModalSelectors.ts b/app/client/src/selectors/crudInfoModalSelectors.ts
index 49946264c3..b2325d5b49 100644
--- a/app/client/src/selectors/crudInfoModalSelectors.ts
+++ b/app/client/src/selectors/crudInfoModalSelectors.ts
@@ -5,10 +5,10 @@ import type {
   GenerateCRUDSuccessInfoData,
 } from "reducers/uiReducers/crudInfoModalReducer";
 
-export type CrudInfoModalData = {
+export interface CrudInfoModalData {
   crudInfoModalOpen: boolean;
   generateCRUDSuccessInfo: GenerateCRUDSuccessInfoData | null;
-};
+}
 
 const getCrudInfoModalState = (state: AppState): CrudInfoModalReduxState =>
   state.ui.crudInfoModal;
diff --git a/app/client/src/selectors/dataTreeSelectors.ts b/app/client/src/selectors/dataTreeSelectors.ts
index 48a4cecc40..ba8cf9b1c0 100644
--- a/app/client/src/selectors/dataTreeSelectors.ts
+++ b/app/client/src/selectors/dataTreeSelectors.ts
@@ -7,7 +7,8 @@ import {
   getCurrentJSCollections,
   getInputsForModule,
 } from "@appsmith/selectors/entitiesSelector";
-import type { DataTree, WidgetEntity } from "@appsmith/entities/DataTree/types";
+import type { WidgetEntity } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { DataTreeFactory } from "entities/DataTree/dataTreeFactory";
 import {
   getMetaWidgets,
diff --git a/app/client/src/selectors/debuggerSelectors.test.ts b/app/client/src/selectors/debuggerSelectors.test.ts
index 965664cbd0..366a2bff90 100644
--- a/app/client/src/selectors/debuggerSelectors.test.ts
+++ b/app/client/src/selectors/debuggerSelectors.test.ts
@@ -1,6 +1,6 @@
 import { Severity, ENTITY_TYPE, LOG_CATEGORY } from "entities/AppsmithConsole";
 import LOG_TYPE from "entities/AppsmithConsole/logtype";
-import type { DataTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
 import { PropertyEvaluationErrorType } from "utils/DynamicBindingUtils";
 import { getFilteredErrors } from "./debuggerSelectors";
diff --git a/app/client/src/selectors/debuggerSelectors.tsx b/app/client/src/selectors/debuggerSelectors.tsx
index a42c077587..3e2ef092a9 100644
--- a/app/client/src/selectors/debuggerSelectors.tsx
+++ b/app/client/src/selectors/debuggerSelectors.tsx
@@ -1,5 +1,6 @@
 import type { Log } from "entities/AppsmithConsole";
-import type { DataTree, WidgetEntity } from "@appsmith/entities/DataTree/types";
+import type { WidgetEntity } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { isEmpty } from "lodash";
 import type { AppState } from "@appsmith/reducers";
 import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
@@ -11,9 +12,9 @@ import {
 } from "@appsmith/workers/Evaluation/evaluationUtils";
 import { getDataTree } from "./dataTreeSelectors";
 
-type ErrorObejct = {
+interface ErrorObejct {
   [k: string]: Log;
-};
+}
 
 export const getDebuggerErrors = (state: AppState) => state.ui.debugger.errors;
 export const hideErrors = (state: AppState) => state.ui.debugger.hideErrors;
diff --git a/app/client/src/selectors/editorSelectors.tsx b/app/client/src/selectors/editorSelectors.tsx
index 074ad833f7..4c4763dd49 100644
--- a/app/client/src/selectors/editorSelectors.tsx
+++ b/app/client/src/selectors/editorSelectors.tsx
@@ -25,11 +25,10 @@ import {
 } from "constants/WidgetConstants";
 import { APP_MODE } from "entities/App";
 import type {
-  DataTree,
-  ConfigTree,
   WidgetEntity,
   WidgetEntityConfig,
 } from "@appsmith/entities/DataTree/types";
+import type { DataTree, ConfigTree } from "entities/DataTree/dataTreeTypes";
 import { find, sortBy } from "lodash";
 import {
   getDataTree,
@@ -185,11 +184,14 @@ export const getCurrentPageDescription = createSelector(
 );
 
 export const selectPageSlugToIdMap = createSelector(getPageList, (pages) =>
-  pages.reduce((acc, page: Page) => {
-    // Comeback
-    acc[page.pageId] = page.slug || "";
-    return acc;
-  }, {} as Record<string, string>),
+  pages.reduce(
+    (acc, page: Page) => {
+      // Comeback
+      acc[page.pageId] = page.slug || "";
+      return acc;
+    },
+    {} as Record<string, string>,
+  ),
 );
 
 export const getCurrentApplication = (state: AppState) =>
diff --git a/app/client/src/selectors/formSelectors.ts b/app/client/src/selectors/formSelectors.ts
index 8371d89797..5ad57dd0e5 100644
--- a/app/client/src/selectors/formSelectors.ts
+++ b/app/client/src/selectors/formSelectors.ts
@@ -9,17 +9,17 @@ import type {
 import { createSelector } from "reselect";
 import { isEmpty, replace } from "lodash";
 import { getDataTree } from "./dataTreeSelectors";
-import type { DataTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import type { Action } from "entities/Action";
 import type { EvaluationError } from "utils/DynamicBindingUtils";
 import { getActionIdFromURL } from "@appsmith/pages/Editor/Explorer/helpers";
 import { extractConditionalOutput } from "components/formControls/utils";
 
-export type GetFormData = {
+export interface GetFormData {
   initialValues: Record<string, unknown>;
   values: any;
   valid: boolean;
-};
+}
 
 export const getFormData = (state: AppState, formName: string): GetFormData => {
   const initialValues = getFormInitialValues(formName)(state);
@@ -68,7 +68,10 @@ export const getDynamicTriggers = (
   return !isEmpty(triggersAllowedToFetch) ? triggersAllowedToFetch : undefined;
 };
 
-type ConfigErrorProps = { configProperty: string; formName: string };
+interface ConfigErrorProps {
+  configProperty: string;
+  formName: string;
+}
 
 export const getConfigErrors = createSelector(
   getDataTree,
diff --git a/app/client/src/selectors/ideSelectors.tsx b/app/client/src/selectors/ideSelectors.tsx
new file mode 100644
index 0000000000..4db6819aec
--- /dev/null
+++ b/app/client/src/selectors/ideSelectors.tsx
@@ -0,0 +1,7 @@
+import { createSelector } from "reselect";
+import { selectFeatureFlags } from "@appsmith/selectors/featureFlagsSelectors";
+
+export const getIsAppSidebarEnabled = createSelector(
+  selectFeatureFlags,
+  (flags) => !!flags?.release_app_sidebar_enabled,
+);
diff --git a/app/client/src/selectors/navigationSelectors.ts b/app/client/src/selectors/navigationSelectors.ts
index d59bf00024..bfcb49e92f 100644
--- a/app/client/src/selectors/navigationSelectors.ts
+++ b/app/client/src/selectors/navigationSelectors.ts
@@ -1,4 +1,5 @@
-import type { DataTree, ENTITY_TYPE } from "@appsmith/entities/DataTree/types";
+import type { ENTITY_TYPE } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { ENTITY_TYPE_VALUE } from "entities/DataTree/dataTreeFactory";
 import { createSelector } from "reselect";
 import {
@@ -10,7 +11,7 @@ import {
 import { getWidgets } from "sagas/selectors";
 import { getCurrentPageId } from "selectors/editorSelectors";
 import { getActionConfig } from "pages/Editor/Explorer/Actions/helpers";
-import { jsCollectionIdURL, widgetURL } from "RouteBuilder";
+import { jsCollectionIdURL, widgetURL } from "@appsmith/RouteBuilder";
 import { getDataTree } from "selectors/dataTreeSelectors";
 import { createNavData } from "utils/NavigationSelector/common";
 import { getWidgetChildrenNavData } from "utils/NavigationSelector/WidgetChildren";
@@ -24,7 +25,7 @@ import { PluginType } from "entities/Action";
 import type { StoredDatasource } from "entities/Action";
 import type { Datasource } from "entities/Datasource";
 
-export type NavigationData = {
+export interface NavigationData {
   name: string;
   id: string;
   type: ENTITY_TYPE;
@@ -40,7 +41,7 @@ export type NavigationData = {
   actionType?: string;
   widgetType?: string;
   value?: boolean | string;
-};
+}
 export type EntityNavigationData = Record<string, NavigationData>;
 
 export const getEntitiesForNavigation = createSelector(
diff --git a/app/client/src/selectors/propertyPaneSelectors.tsx b/app/client/src/selectors/propertyPaneSelectors.tsx
index 78f6469bce..0f0b4777a1 100644
--- a/app/client/src/selectors/propertyPaneSelectors.tsx
+++ b/app/client/src/selectors/propertyPaneSelectors.tsx
@@ -1,11 +1,8 @@
 import type { AppState } from "@appsmith/reducers";
 import { find, get, set } from "lodash";
 import { createSelector } from "reselect";
-import type {
-  DataTree,
-  DataTreeEntity,
-  WidgetEntity,
-} from "@appsmith/entities/DataTree/types";
+import type { WidgetEntity } from "@appsmith/entities/DataTree/types";
+import type { DataTree, DataTreeEntity } from "entities/DataTree/dataTreeTypes";
 import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
 import type {
   PropertyPaneReduxState,
diff --git a/app/client/src/selectors/themeSelectors.tsx b/app/client/src/selectors/themeSelectors.tsx
index f99a127c1b..e61cfdf255 100644
--- a/app/client/src/selectors/themeSelectors.tsx
+++ b/app/client/src/selectors/themeSelectors.tsx
@@ -12,8 +12,10 @@ export const lightTheme = { ...theme, colors: { ...theme.colors, ...light } };
 const darkTheme = { ...theme, colors: { ...theme.colors, ...dark } };
 
 // Only for usage with ThemeProvider
-export const getThemeDetails = (state: AppState, themeMode: ThemeMode): Theme =>
-  themeMode === ThemeMode.LIGHT ? lightTheme : darkTheme;
+export const getThemeDetails = (
+  state: AppState,
+  themeMode: ThemeMode,
+): Theme => (themeMode === ThemeMode.LIGHT ? lightTheme : darkTheme);
 
 export const getTheme = (themeMode: ThemeMode) => {
   const colors = themeMode === ThemeMode.LIGHT ? light : dark;
diff --git a/app/client/src/selectors/widgetEnhancementSelectors.ts b/app/client/src/selectors/widgetEnhancementSelectors.ts
index 18aae026eb..a9311009fc 100644
--- a/app/client/src/selectors/widgetEnhancementSelectors.ts
+++ b/app/client/src/selectors/widgetEnhancementSelectors.ts
@@ -19,7 +19,7 @@ const getPropsFromTree = (tree: unknown, widgetName?: string): unknown => {
   return get(tree, widgetName, undefined);
 };
 
-export type EnhancementFns = {
+export interface EnhancementFns {
   enhancementFns: {
     updateDataTreePathFn: any;
     propertyPaneEnhancementFn: any;
@@ -29,7 +29,7 @@ export type EnhancementFns = {
     shouldHidePropertyFn: any;
   };
   parentIdWithEnhancementFn: any;
-};
+}
 
 export const getWidgetEnhancementSelector = (widgetId: string | undefined) => {
   return createSelector(
diff --git a/app/client/src/usagePulse/index.ts b/app/client/src/usagePulse/index.ts
index 4ba4c37005..eb0d6b3b1e 100644
--- a/app/client/src/usagePulse/index.ts
+++ b/app/client/src/usagePulse/index.ts
@@ -8,12 +8,14 @@ import {
   PULSE_API_ENDPOINT,
   PULSE_API_MAX_RETRY_COUNT,
   PULSE_API_RETRY_TIMEOUT,
-  PULSE_INTERVAL,
   USER_ACTIVITY_LISTENER_EVENTS,
 } from "@appsmith/constants/UsagePulse";
 import PageApi from "api/PageApi";
 import { APP_MODE } from "entities/App";
 import { getFirstTimeUserOnboardingIntroModalVisibility } from "utils/storage";
+// eslint-disable-next-line @typescript-eslint/no-restricted-imports
+import { PULSE_INTERVAL as PULSE_INTERVAL_CE } from "ce/constants/UsagePulse";
+import { PULSE_INTERVAL as PULSE_INTERVAL_EE } from "ee/constants/UsagePulse";
 
 class UsagePulse {
   static userAnonymousId: string | undefined;
@@ -21,6 +23,7 @@ class UsagePulse {
   static unlistenRouteChange: () => void;
   static isTelemetryEnabled: boolean;
   static isAnonymousUser: boolean;
+  static isFreePlan: boolean;
 
   /*
    * Function to check if the given URL is trakable or not.
@@ -99,7 +102,7 @@ class UsagePulse {
 
     UsagePulse.Timer = setTimeout(
       UsagePulse.registerActivityListener,
-      PULSE_INTERVAL,
+      UsagePulse.isFreePlan ? PULSE_INTERVAL_CE : PULSE_INTERVAL_EE,
     );
   }
 
@@ -109,9 +112,11 @@ class UsagePulse {
   static async startTrackingActivity(
     isTelemetryEnabled: boolean,
     isAnonymousUser: boolean,
+    isFree: boolean,
   ) {
     UsagePulse.isTelemetryEnabled = isTelemetryEnabled;
     UsagePulse.isAnonymousUser = isAnonymousUser;
+    UsagePulse.isFreePlan = isFree;
     if (await UsagePulse.isTrackableUrl(window.location.pathname)) {
       await UsagePulse.sendPulseAndScheduleNext();
     }
diff --git a/app/client/src/utils/AppsmithUtils.tsx b/app/client/src/utils/AppsmithUtils.tsx
index c6754836d7..71361eae7a 100644
--- a/app/client/src/utils/AppsmithUtils.tsx
+++ b/app/client/src/utils/AppsmithUtils.tsx
@@ -97,12 +97,12 @@ export const mapToPropList = (map: Record<string, string>): Property[] => {
 
 export const INTERACTION_ANALYTICS_EVENT = "INTERACTION_ANALYTICS_EVENT";
 
-export type InteractionAnalyticsEventDetail = {
+export interface InteractionAnalyticsEventDetail {
   key?: string;
   propertyName?: string;
   propertyType?: string;
   widgetType?: string;
-};
+}
 
 export const interactionAnalyticsEvent = (
   detail: InteractionAnalyticsEventDetail = {},
@@ -125,11 +125,11 @@ export enum DSEventTypes {
   KEYPRESS = "KEYPRESS",
 }
 
-export type DSEventDetail = {
+export interface DSEventDetail {
   component: string;
   event: DSEventTypes;
   meta: Record<string, unknown>;
-};
+}
 
 export function createDSEvent(detail: DSEventDetail) {
   return new CustomEvent(DS_EVENT, {
diff --git a/app/client/src/utils/DSLMigration.test.ts b/app/client/src/utils/DSLMigration.test.ts
index 5b001acf47..ace4c63922 100644
--- a/app/client/src/utils/DSLMigration.test.ts
+++ b/app/client/src/utils/DSLMigration.test.ts
@@ -25,13 +25,13 @@ import * as migrateLabelPosition from "./migrations/MigrateLabelPosition";
 import * as migrateAutoHeight from "./migrations/autoHeightMigrations";
 import * as chartMigrations from "./migrations/ChartWidget";
 
-type Migration = {
+interface Migration {
   functionLookup: {
     moduleObj: any;
     functionName: string;
   }[];
   version: number | undefined;
-};
+}
 
 /**
  * Migrations is an array of objects, were each object has
diff --git a/app/client/src/utils/DynamicBindingUtils.ts b/app/client/src/utils/DynamicBindingUtils.ts
index 9aa02e9f73..98b0f0d192 100644
--- a/app/client/src/utils/DynamicBindingUtils.ts
+++ b/app/client/src/utils/DynamicBindingUtils.ts
@@ -10,10 +10,8 @@ import {
   isTrueObject,
   isWidget,
 } from "@appsmith/workers/Evaluation/evaluationUtils";
-import type {
-  DataTreeEntity,
-  DataTreeEntityConfig,
-} from "@appsmith/entities/DataTree/types";
+import type { DataTreeEntityConfig } from "@appsmith/entities/DataTree/types";
+import type { DataTreeEntity } from "entities/DataTree/dataTreeTypes";
 import { getType, Types } from "./TypeHelpers";
 import { ViewTypes } from "components/formControls/utils";
 
@@ -148,11 +146,11 @@ export enum EvalErrorTypes {
   SERIALIZATION_ERROR = "SERIALIZATION_ERROR",
 }
 
-export type EvalError = {
+export interface EvalError {
   type: EvalErrorTypes;
   message: string;
   context?: Record<string, any>;
-};
+}
 
 export interface DynamicPath {
   key: string;
diff --git a/app/client/src/utils/FilterInternalProperties/Action.ts b/app/client/src/utils/FilterInternalProperties/Action.ts
index 6d3c72af72..3eadb852eb 100644
--- a/app/client/src/utils/FilterInternalProperties/Action.ts
+++ b/app/client/src/utils/FilterInternalProperties/Action.ts
@@ -1,5 +1,6 @@
 import { entityDefinitions } from "@appsmith/utils/autocomplete/EntityDefinitions";
-import type { DataTree, ActionEntity } from "@appsmith/entities/DataTree/types";
+import type { ActionEntity } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 
 export const getActionChildrenPeekData = (
   actionName: string,
diff --git a/app/client/src/utils/FilterInternalProperties/Appsmith.ts b/app/client/src/utils/FilterInternalProperties/Appsmith.ts
index edda5fbd2c..86e84cd09b 100644
--- a/app/client/src/utils/FilterInternalProperties/Appsmith.ts
+++ b/app/client/src/utils/FilterInternalProperties/Appsmith.ts
@@ -1,8 +1,6 @@
 import { entityDefinitions } from "@appsmith/utils/autocomplete/EntityDefinitions";
-import type {
-  AppsmithEntity,
-  DataTree,
-} from "@appsmith/entities/DataTree/types";
+import type { AppsmithEntity } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { createObjectPeekData } from "./Common";
 
 export const getAppsmithPeekData = (dataTree: DataTree) => {
diff --git a/app/client/src/utils/FilterInternalProperties/JsAction.ts b/app/client/src/utils/FilterInternalProperties/JsAction.ts
index 04b8e38de2..ead880bed5 100644
--- a/app/client/src/utils/FilterInternalProperties/JsAction.ts
+++ b/app/client/src/utils/FilterInternalProperties/JsAction.ts
@@ -1,7 +1,5 @@
-import type {
-  DataTree,
-  JSActionEntity,
-} from "@appsmith/entities/DataTree/types";
+import type { JSActionEntity } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import type { JSCollectionData } from "reducers/entityReducers/jsActionsReducer";
 
 export const getJsActionPeekData = (
diff --git a/app/client/src/utils/FilterInternalProperties/Widget.ts b/app/client/src/utils/FilterInternalProperties/Widget.ts
index bbcb062c58..322f3e55aa 100644
--- a/app/client/src/utils/FilterInternalProperties/Widget.ts
+++ b/app/client/src/utils/FilterInternalProperties/Widget.ts
@@ -1,9 +1,8 @@
 import type {
-  ConfigTree,
-  DataTree,
   WidgetEntity,
   WidgetEntityConfig,
 } from "@appsmith/entities/DataTree/types";
+import type { ConfigTree, DataTree } from "entities/DataTree/dataTreeTypes";
 import type { EntityDefinitionsOptions } from "@appsmith/utils/autocomplete/EntityDefinitions";
 import { isFunction } from "lodash";
 import type { Def } from "tern";
diff --git a/app/client/src/utils/FilterInternalProperties/index.ts b/app/client/src/utils/FilterInternalProperties/index.ts
index fdade132ea..9d1ae25bb0 100644
--- a/app/client/src/utils/FilterInternalProperties/index.ts
+++ b/app/client/src/utils/FilterInternalProperties/index.ts
@@ -3,7 +3,7 @@ import type {
   ConfigTree,
   DataTree,
   DataTreeEntity,
-} from "@appsmith/entities/DataTree/types";
+} from "entities/DataTree/dataTreeTypes";
 import type { JSCollectionDataState } from "reducers/entityReducers/jsActionsReducer";
 import { getWidgetChildrenPeekData } from "./Widget";
 import { getJsActionPeekData } from "./JsAction";
diff --git a/app/client/src/utils/JSPaneUtils.tsx b/app/client/src/utils/JSPaneUtils.tsx
index 2e837cefac..bf9bfdef9f 100644
--- a/app/client/src/utils/JSPaneUtils.tsx
+++ b/app/client/src/utils/JSPaneUtils.tsx
@@ -5,21 +5,21 @@ import LOG_TYPE from "entities/AppsmithConsole/logtype";
 import AppsmithConsole from "utils/AppsmithConsole";
 import { isEmpty, isEqual, xorWith } from "lodash";
 
-export type ParsedJSSubAction = {
+export interface ParsedJSSubAction {
   name: string;
   body: string;
   arguments: Array<Variable>;
-};
+}
 
-export type ParsedBody = {
+export interface ParsedBody {
   actions: Array<ParsedJSSubAction>;
   variables: Array<Variable>;
-};
+}
 
-export type JSUpdate = {
+export interface JSUpdate {
   id: string;
   parsedBody: ParsedBody | undefined;
-};
+}
 
 export const getDifferenceInJSArgumentArrays = (x: any, y: any) =>
   isEmpty(xorWith(x, y, isEqual));
diff --git a/app/client/src/utils/MessageUtil.ts b/app/client/src/utils/MessageUtil.ts
index f60820e3f5..3b86ab5fef 100644
--- a/app/client/src/utils/MessageUtil.ts
+++ b/app/client/src/utils/MessageUtil.ts
@@ -11,23 +11,23 @@ export enum MessageType {
   DEFAULT = "DEFAULT",
 }
 
-type TRequestMessage<TBody> = {
+interface TRequestMessage<TBody> {
   body: TBody;
   messageId: string;
   messageType: MessageType.REQUEST;
-};
+}
 
-type TResponseMessage<TBody> = {
+interface TResponseMessage<TBody> {
   body: TBody;
   messageId: string;
   messageType: MessageType.RESPONSE;
-};
+}
 
-export type TDefaultMessage<TBody> = {
+export interface TDefaultMessage<TBody> {
   messageId?: string;
   body: TBody;
   messageType: MessageType.DEFAULT;
-};
+}
 
 export type TMessage<TBody> =
   | TRequestMessage<TBody>
diff --git a/app/client/src/utils/NavigationSelector/JsChildren.ts b/app/client/src/utils/NavigationSelector/JsChildren.ts
index c5c65c278f..7cd6fcfa2b 100644
--- a/app/client/src/utils/NavigationSelector/JsChildren.ts
+++ b/app/client/src/utils/NavigationSelector/JsChildren.ts
@@ -1,11 +1,9 @@
-import type {
-  DataTree,
-  JSActionEntity,
-} from "@appsmith/entities/DataTree/types";
+import type { JSActionEntity } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { ENTITY_TYPE_VALUE } from "entities/DataTree/dataTreeFactory";
 import { keyBy } from "lodash";
 import type { JSCollectionData } from "reducers/entityReducers/jsActionsReducer";
-import { jsCollectionIdURL } from "RouteBuilder";
+import { jsCollectionIdURL } from "@appsmith/RouteBuilder";
 import type {
   EntityNavigationData,
   NavigationData,
diff --git a/app/client/src/utils/NavigationSelector/WidgetChildren.ts b/app/client/src/utils/NavigationSelector/WidgetChildren.ts
index 5451f16cb1..001945226a 100644
--- a/app/client/src/utils/NavigationSelector/WidgetChildren.ts
+++ b/app/client/src/utils/NavigationSelector/WidgetChildren.ts
@@ -1,6 +1,7 @@
-import type { DataTree, WidgetEntity } from "@appsmith/entities/DataTree/types";
+import type { WidgetEntity } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { ENTITY_TYPE_VALUE } from "entities/DataTree/dataTreeFactory";
-import { builderURL } from "RouteBuilder";
+import { builderURL } from "@appsmith/RouteBuilder";
 import type { EntityNavigationData } from "selectors/navigationSelectors";
 import { createNavData } from "./common";
 
diff --git a/app/client/src/utils/PerformanceTracker.ts b/app/client/src/utils/PerformanceTracker.ts
index 38d8c24236..b71d27fb76 100644
--- a/app/client/src/utils/PerformanceTracker.ts
+++ b/app/client/src/utils/PerformanceTracker.ts
@@ -37,10 +37,10 @@ export enum PerformanceTransactionName {
   SHOW_RESIZE_HANDLES = "SHOW_RESIZE_HANDLES",
 }
 
-export type PerfTag = {
+export interface PerfTag {
   name: string;
   value: string;
-};
+}
 export interface PerfLog {
   sentrySpan: Span;
   skipLog?: boolean;
diff --git a/app/client/src/utils/ProductRamps/RampTypes.ts b/app/client/src/utils/ProductRamps/RampTypes.ts
index 45107e17e2..9ae919e7bb 100644
--- a/app/client/src/utils/ProductRamps/RampTypes.ts
+++ b/app/client/src/utils/ProductRamps/RampTypes.ts
@@ -7,9 +7,9 @@ export type RampSection =
   | "bottom_bar_env_switcher"
   | "ds_editor";
 
-export type RampsForRolesTypes = {
+export interface RampsForRolesTypes {
   [key: string]: boolean;
-};
+}
 
 export type SupportedRampsType = {
   [key in EnvTypes]: RampsForRolesTypes;
diff --git a/app/client/src/utils/SuccessfulBindingsMap.ts b/app/client/src/utils/SuccessfulBindingsMap.ts
index 2afc124e78..79a1e46758 100644
--- a/app/client/src/utils/SuccessfulBindingsMap.ts
+++ b/app/client/src/utils/SuccessfulBindingsMap.ts
@@ -1,8 +1,8 @@
-import type { UnEvalTreeEntity } from "@appsmith/entities/DataTree/types";
+import type { UnEvalTreeEntity } from "entities/DataTree/dataTreeTypes";
 
-export type SuccessfulBindings = {
+export interface SuccessfulBindings {
   [entityName: string]: UnEvalTreeEntity;
-};
+}
 export default class SuccessfulBindingMap {
   successfulBindings: SuccessfulBindings;
 
diff --git a/app/client/src/utils/WidgetLoadingStateUtils.ts b/app/client/src/utils/WidgetLoadingStateUtils.ts
index 61c92b446f..8cc8e9dc90 100644
--- a/app/client/src/utils/WidgetLoadingStateUtils.ts
+++ b/app/client/src/utils/WidgetLoadingStateUtils.ts
@@ -1,4 +1,4 @@
-import type { DataTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { get, set } from "lodash";
 import {
   isJSObject,
diff --git a/app/client/src/utils/WidgetPropsUtils.tsx b/app/client/src/utils/WidgetPropsUtils.tsx
index 31f15a7055..93e9dab03c 100644
--- a/app/client/src/utils/WidgetPropsUtils.tsx
+++ b/app/client/src/utils/WidgetPropsUtils.tsx
@@ -26,11 +26,11 @@ import type {
   XYCord,
 } from "layoutSystems/common/canvasArenas/ArenaTypes";
 
-export type WidgetOperationParams = {
+export interface WidgetOperationParams {
   operation: WidgetOperation;
   widgetId: string;
   payload: any;
-};
+}
 
 const defaultDSL = defaultTemplate;
 
diff --git a/app/client/src/utils/autoHeight/constants.ts b/app/client/src/utils/autoHeight/constants.ts
index 3b8272fed0..14f7a7aeae 100644
--- a/app/client/src/utils/autoHeight/constants.ts
+++ b/app/client/src/utils/autoHeight/constants.ts
@@ -1,4 +1,4 @@
-export type TreeNode = {
+export interface TreeNode {
   aboves: string[];
   belows: string[];
   topRow: number;
@@ -6,14 +6,14 @@ export type TreeNode = {
   originalTopRow: number;
   originalBottomRow: number;
   distanceToNearestAbove: number;
-};
+}
 
-export type NodeSpace = {
+export interface NodeSpace {
   left: number;
   right: number;
   top: number;
   bottom: number;
   id: string;
-};
+}
 
 export const MAX_BOX_SIZE = 20000;
diff --git a/app/client/src/utils/autocomplete/CodemirrorTernService.ts b/app/client/src/utils/autocomplete/CodemirrorTernService.ts
index a9b3dcbff6..a191a347e1 100644
--- a/app/client/src/utils/autocomplete/CodemirrorTernService.ts
+++ b/app/client/src/utils/autocomplete/CodemirrorTernService.ts
@@ -38,28 +38,28 @@ export interface Completion extends Hint {
 export interface CommandsCompletion
   extends Omit<Completion, "type" | "origin" | "data"> {
   data: unknown;
-  action?: () => void;
+  action?: (callback?: (completion: string) => void) => void;
   shortcut?: string;
   triggerCompletionsPostPick?: boolean;
 }
 
 type TernDocs = Record<string, TernDoc>;
 
-type TernDoc = {
+interface TernDoc {
   doc: CodeMirror.Doc;
   name: string;
   changed: { to: number; from: number } | null;
-};
+}
 
-type ArgHints = {
+interface ArgHints {
   start: CodeMirror.Position;
   type: { args: any[]; rettype: null | string };
   name: string;
   guess: boolean;
   doc: CodeMirror.Doc;
-};
+}
 
-type RequestQuery = {
+interface RequestQuery {
   type: string;
   types?: boolean;
   docs?: boolean;
@@ -78,12 +78,12 @@ type RequestQuery = {
   depth?: number;
   sort?: boolean;
   expandWordForward?: boolean;
-};
+}
 
-export type DataTreeDefEntityInformation = {
+export interface DataTreeDefEntityInformation {
   type: ENTITY_TYPE;
   subType: string;
-};
+}
 
 /** Tern hard coded some keywords which return `isKeyword` true.
  * There is however no provision to add more keywords to the list. Therefore,
diff --git a/app/client/src/utils/autocomplete/TernWorkerService.ts b/app/client/src/utils/autocomplete/TernWorkerService.ts
index 771441d4e6..371acf979b 100644
--- a/app/client/src/utils/autocomplete/TernWorkerService.ts
+++ b/app/client/src/utils/autocomplete/TernWorkerService.ts
@@ -19,10 +19,10 @@ function getFile(ts: any, name: string, c: CallbackFn) {
   else c(null);
 }
 
-type TernWorkerServerConstructor = {
+interface TernWorkerServerConstructor {
   (ts: any): void;
   new (ts: any): Server;
-};
+}
 
 function TernWorkerServer(this: any, ts: any) {
   const worker = (ts.worker = ternWorker);
diff --git a/app/client/src/utils/autocomplete/dataTreeTypeDefCreator.ts b/app/client/src/utils/autocomplete/dataTreeTypeDefCreator.ts
index 0ed43c9cac..eb9fb4ea37 100644
--- a/app/client/src/utils/autocomplete/dataTreeTypeDefCreator.ts
+++ b/app/client/src/utils/autocomplete/dataTreeTypeDefCreator.ts
@@ -1,10 +1,12 @@
+import type {
+  WidgetEntityConfig,
+  JSActionEntityConfig,
+} from "@appsmith/entities/DataTree/types";
 import type {
   ConfigTree,
   DataTree,
   DataTreeEntity,
-  WidgetEntityConfig,
-  JSActionEntityConfig,
-} from "@appsmith/entities/DataTree/types";
+} from "entities/DataTree/dataTreeTypes";
 import { ENTITY_TYPE_VALUE } from "entities/DataTree/dataTreeFactory";
 import { uniqueId, isFunction, isObject } from "lodash";
 import { entityDefinitions } from "@appsmith/utils/autocomplete/EntityDefinitions";
diff --git a/app/client/src/utils/boxHelpers.ts b/app/client/src/utils/boxHelpers.ts
index 5f051ca3ec..5ade38372d 100644
--- a/app/client/src/utils/boxHelpers.ts
+++ b/app/client/src/utils/boxHelpers.ts
@@ -1,9 +1,9 @@
-export type Rect = {
+export interface Rect {
   top: number;
   left: number;
   right: number;
   bottom: number;
-};
+}
 
 export const areIntersecting = (r1: Rect, r2: Rect) => {
   return !(
diff --git a/app/client/src/utils/canvasStructureHelpers.ts b/app/client/src/utils/canvasStructureHelpers.ts
index 6e587f2cb2..50803ea7c7 100644
--- a/app/client/src/utils/canvasStructureHelpers.ts
+++ b/app/client/src/utils/canvasStructureHelpers.ts
@@ -10,9 +10,9 @@ import type {
 } from "WidgetProvider/constants";
 import { WIDGET_DSL_STRUCTURE_PROPS } from "constants/WidgetConstants";
 
-type DenormalizeOptions = {
+interface DenormalizeOptions {
   widgetTypeForHaltingRecursion?: string;
-};
+}
 
 export const compareAndGenerateImmutableCanvasStructure = (
   original: CanvasStructure,
diff --git a/app/client/src/utils/configTree.ts b/app/client/src/utils/configTree.ts
index e6b64b64d9..3a6c5f274d 100644
--- a/app/client/src/utils/configTree.ts
+++ b/app/client/src/utils/configTree.ts
@@ -1,4 +1,4 @@
-import type { ConfigTree } from "@appsmith/entities/DataTree/types";
+import type { ConfigTree } from "entities/DataTree/dataTreeTypes";
 
 export default class ConfigTreeActions {
   static tree: ConfigTree = {};
diff --git a/app/client/src/utils/editor/browserTabsTracking.ts b/app/client/src/utils/editor/browserTabsTracking.ts
index 855b18dcb0..1594cc53ba 100644
--- a/app/client/src/utils/editor/browserTabsTracking.ts
+++ b/app/client/src/utils/editor/browserTabsTracking.ts
@@ -1,6 +1,8 @@
 import { generateReactKey } from "../../widgets/WidgetUtils";
 
-type TabData = { [tabId: string]: string };
+interface TabData {
+  [tabId: string]: string;
+}
 
 const LOCAL_STORAGE_KEY = "EDITOR_TABS_DATA";
 
diff --git a/app/client/src/utils/history.ts b/app/client/src/utils/history.ts
index 50d1ef863a..90d9632934 100644
--- a/app/client/src/utils/history.ts
+++ b/app/client/src/utils/history.ts
@@ -16,6 +16,6 @@ export enum NavigationMethod {
   ContextSwitching = "ContextSwitching",
 }
 
-export type AppsmithLocationState = {
+export interface AppsmithLocationState {
   invokedBy?: NavigationMethod;
-};
+}
diff --git a/app/client/src/utils/hooks/dragResizeHooks.tsx b/app/client/src/utils/hooks/dragResizeHooks.tsx
index 6c61a5d922..b04ce458b9 100644
--- a/app/client/src/utils/hooks/dragResizeHooks.tsx
+++ b/app/client/src/utils/hooks/dragResizeHooks.tsx
@@ -109,11 +109,11 @@ export const useWidgetDragResize = () => {
     ),
     setDraggingState: useCallback(
       ({
-        isDragging,
-        dragGroupActualParent = "",
-        draggingGroupCenter = {},
-        startPoints,
         draggedOn,
+        draggingGroupCenter = {},
+        dragGroupActualParent = "",
+        isDragging,
+        startPoints,
       }: {
         isDragging: boolean;
         dragGroupActualParent?: string;
diff --git a/app/client/src/utils/hooks/useDynamicAppLayout.tsx b/app/client/src/utils/hooks/useDynamicAppLayout.tsx
index 0dd29351a3..74e0c35873 100644
--- a/app/client/src/utils/hooks/useDynamicAppLayout.tsx
+++ b/app/client/src/utils/hooks/useDynamicAppLayout.tsx
@@ -4,7 +4,10 @@ import { useDispatch, useSelector } from "react-redux";
 
 import { updateLayoutForMobileBreakpointAction } from "actions/autoLayoutActions";
 import { updateCanvasLayoutAction } from "actions/editorActions";
-import { APP_SETTINGS_PANE_WIDTH } from "constants/AppConstants";
+import {
+  APP_SETTINGS_PANE_WIDTH,
+  APP_SIDEBAR_WIDTH,
+} from "constants/AppConstants";
 import {
   DefaultLayoutType,
   layoutConfigurations,
@@ -42,6 +45,7 @@ import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 import { useLocation } from "react-router";
 import { CANVAS_VIEWPORT } from "constants/componentClassNameConstants";
 import { getLayoutSystemType } from "selectors/layoutSystemSelectors";
+import { getIsAppSidebarEnabled } from "../../selectors/ideSelectors";
 
 const GUTTER_WIDTH = 72;
 export const AUTOLAYOUT_RESIZER_WIDTH_BUFFER = 40;
@@ -75,6 +79,7 @@ export const useDynamicAppLayout = () => {
   const queryParams = new URLSearchParams(search);
   const isEmbed = queryParams.get("embed");
   const isNavbarVisibleInEmbeddedApp = queryParams.get("navbar");
+  const isAppSidebarEnabled = useSelector(getIsAppSidebarEnabled);
 
   // /**
   //  * calculates min height
@@ -149,6 +154,10 @@ export const useDynamicAppLayout = () => {
       calculatedWidth -= explorerWidth;
     }
 
+    if (appMode === APP_MODE.EDIT && isAppSidebarEnabled) {
+      calculatedWidth -= APP_SIDEBAR_WIDTH;
+    }
+
     /**
      * If there is
      * 1. a sidebar for navigation,
diff --git a/app/client/src/utils/hooks/useOnUpgrade.ts b/app/client/src/utils/hooks/useOnUpgrade.ts
index 9122e9dfa3..cd62f9f790 100644
--- a/app/client/src/utils/hooks/useOnUpgrade.ts
+++ b/app/client/src/utils/hooks/useOnUpgrade.ts
@@ -1,6 +1,6 @@
 import { useSelector } from "react-redux";
 import { getInstanceId } from "@appsmith/selectors/tenantSelectors";
-import { PRICING_PAGE_URL } from "constants/ThirdPartyConstants";
+import { CUSTOMER_PORTAL_URL_WITH_PARAMS } from "constants/ThirdPartyConstants";
 import type { EventName } from "@appsmith/utils/analyticsUtilTypes";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import { getAppsmithConfigs } from "@appsmith/configs";
@@ -10,12 +10,12 @@ import type {
   RampSection,
 } from "utils/ProductRamps/RampsControlList";
 
-type Props = {
+interface Props {
   logEventName?: EventName;
   logEventData?: any;
   featureName?: RampFeature;
   sectionName?: RampSection;
-};
+}
 
 const useOnUpgrade = (props: Props) => {
   const { featureName, logEventData, logEventName, sectionName } = props;
@@ -28,8 +28,8 @@ const useOnUpgrade = (props: Props) => {
       logEventData,
     );
     window.open(
-      PRICING_PAGE_URL(
-        appsmithConfigs.pricingUrl,
+      CUSTOMER_PORTAL_URL_WITH_PARAMS(
+        appsmithConfigs.customerPortalUrl,
         pricingPageUrlSource,
         instanceId,
         featureName,
diff --git a/app/client/src/utils/hooks/useReflow.ts b/app/client/src/utils/hooks/useReflow.ts
index c646094123..dc7d5ac000 100644
--- a/app/client/src/utils/hooks/useReflow.ts
+++ b/app/client/src/utils/hooks/useReflow.ts
@@ -37,13 +37,13 @@ type WidgetCollidingSpace = CollidingSpace & {
   isDropTarget: boolean;
 };
 
-type WidgetCollidingSpaceMap = {
+interface WidgetCollidingSpaceMap {
   horizontal: WidgetCollisionMap;
   vertical: WidgetCollisionMap;
-};
-export type WidgetCollisionMap = {
+}
+export interface WidgetCollisionMap {
   [key: string]: WidgetCollidingSpace;
-};
+}
 
 export interface ReflowInterface {
   (
diff --git a/app/client/src/utils/storage.ts b/app/client/src/utils/storage.ts
index 4be8f3717b..d6bf0a21ae 100644
--- a/app/client/src/utils/storage.ts
+++ b/app/client/src/utils/storage.ts
@@ -716,15 +716,15 @@ export const initAppKbState = async (
 
     const appKbState = {
       checksum,
-      pageSlugs: pageSlugs.reduce((acc, pageSlug) => {
-        acc[pageSlug] = {
-          hasReacted: false,
-        };
-        return acc;
-      }, {} as Record<string, { hasReacted: boolean }>) as Record<
-        string,
-        { hasReacted: boolean }
-      >,
+      pageSlugs: pageSlugs.reduce(
+        (acc, pageSlug) => {
+          acc[pageSlug] = {
+            hasReacted: false,
+          };
+          return acc;
+        },
+        {} as Record<string, { hasReacted: boolean }>,
+      ) as Record<string, { hasReacted: boolean }>,
     };
 
     aiKBApplicationMap[appId] = appKbState;
diff --git a/app/client/src/utils/treeUtils.ts b/app/client/src/utils/treeUtils.ts
index a84ccd8dc0..6af072824c 100644
--- a/app/client/src/utils/treeUtils.ts
+++ b/app/client/src/utils/treeUtils.ts
@@ -1,7 +1,7 @@
-type Tree = {
+interface Tree {
   children?: Tree[];
   [key: string]: any;
-};
+}
 
 export const traverseTree = (tree: Tree, callback: (tree: Tree) => void) => {
   callback(tree);
diff --git a/app/client/src/utils/widgetRenderUtils.test.ts b/app/client/src/utils/widgetRenderUtils.test.ts
index ee10a4862d..544d1bc337 100644
--- a/app/client/src/utils/widgetRenderUtils.test.ts
+++ b/app/client/src/utils/widgetRenderUtils.test.ts
@@ -1,8 +1,8 @@
 import type {
-  DataTree,
   WidgetEntity,
   WidgetEntityConfig,
 } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
 import type { MetaWidgetsReduxState } from "reducers/entityReducers/metaWidgetsReducer";
 import { buildChildWidgetTree, createCanvasWidget } from "./widgetRenderUtils";
diff --git a/app/client/src/utils/widgetRenderUtils.tsx b/app/client/src/utils/widgetRenderUtils.tsx
index b01eec1cc6..419c9c2e8d 100644
--- a/app/client/src/utils/widgetRenderUtils.tsx
+++ b/app/client/src/utils/widgetRenderUtils.tsx
@@ -3,11 +3,10 @@ import type {
   FlattenedWidgetProps,
 } from "reducers/entityReducers/canvasWidgetsReducer";
 import type {
-  ConfigTree,
-  DataTree,
   WidgetEntity,
   WidgetEntityConfig,
 } from "@appsmith/entities/DataTree/types";
+import type { ConfigTree, DataTree } from "entities/DataTree/dataTreeTypes";
 import { ENTITY_TYPE_VALUE } from "entities/DataTree/dataTreeFactory";
 import { pick } from "lodash";
 import {
diff --git a/app/client/src/widgets/BaseWidget.tsx b/app/client/src/widgets/BaseWidget.tsx
index 36adb5ac00..a5d2379661 100644
--- a/app/client/src/widgets/BaseWidget.tsx
+++ b/app/client/src/widgets/BaseWidget.tsx
@@ -426,7 +426,7 @@ export interface WidgetBaseProps {
   widgetSize?: { [key: string]: Record<string, string> };
 }
 
-export type WidgetRowCols = {
+export interface WidgetRowCols {
   leftColumn: number;
   rightColumn: number;
   topRow: number;
@@ -437,7 +437,7 @@ export type WidgetRowCols = {
   mobileTopRow?: number;
   mobileBottomRow?: number;
   height?: number;
-};
+}
 
 export interface WidgetPositionProps extends WidgetRowCols {
   parentColumnSpace: number;
diff --git a/app/client/src/widgets/ButtonWidget/component/DragContainer.tsx b/app/client/src/widgets/ButtonWidget/component/DragContainer.tsx
index e71f652fba..8bbde0b6b8 100644
--- a/app/client/src/widgets/ButtonWidget/component/DragContainer.tsx
+++ b/app/client/src/widgets/ButtonWidget/component/DragContainer.tsx
@@ -29,7 +29,7 @@ import { buttonHoverActiveStyles } from "./utils";
   For this reason we pass the showInAllModes prop.
 */
 
-export type ButtonContainerProps = {
+export interface ButtonContainerProps {
   buttonColor?: string;
   buttonVariant?: ButtonVariant;
   disabled?: boolean;
@@ -39,7 +39,7 @@ export type ButtonContainerProps = {
   minHeight?: number;
   loading?: boolean;
   style?: React.CSSProperties;
-};
+}
 
 const ButtonContainer = styled.div<ButtonContainerProps>`
   cursor: ${({ disabled }) => (disabled ? "not-allowed" : "pointer")};
diff --git a/app/client/src/widgets/ButtonWidget/component/index.tsx b/app/client/src/widgets/ButtonWidget/component/index.tsx
index 7763e0e61c..78ce74c6e2 100644
--- a/app/client/src/widgets/ButtonWidget/component/index.tsx
+++ b/app/client/src/widgets/ButtonWidget/component/index.tsx
@@ -160,7 +160,7 @@ export const StyledButton = styled((props) => (
   ${buttonBaseStyle}
 `;
 
-export type ButtonStyleProps = {
+export interface ButtonStyleProps {
   buttonColor?: string;
   buttonVariant?: ButtonVariant;
   boxShadow?: string;
@@ -173,7 +173,7 @@ export type ButtonStyleProps = {
   maxWidth?: number;
   minWidth?: number;
   minHeight?: number;
-};
+}
 
 // To be used in any other part of the app
 export function BaseButton(props: IButtonProps & ButtonStyleProps) {
@@ -280,14 +280,14 @@ interface ButtonComponentProps extends ComponentProps {
   maxWidth?: number;
 }
 
-type RecaptchaV2ComponentPropType = {
+interface RecaptchaV2ComponentPropType {
   children: any;
   className?: string;
   isDisabled?: boolean;
   recaptchaType?: RecaptchaType;
   isLoading: boolean;
   handleError: (event: React.MouseEvent<HTMLElement>, error: string) => void;
-};
+}
 
 function RecaptchaV2Component(
   props: RecaptchaV2ComponentPropType & RecaptchaProps,
@@ -335,14 +335,14 @@ function RecaptchaV2Component(
   );
 }
 
-type RecaptchaV3ComponentPropType = {
+interface RecaptchaV3ComponentPropType {
   children: any;
   className?: string;
   isDisabled?: boolean;
   recaptchaType?: RecaptchaType;
   isLoading: boolean;
   handleError: (event: React.MouseEvent<HTMLElement>, error: string) => void;
-};
+}
 
 function RecaptchaV3Component(
   props: RecaptchaV3ComponentPropType & RecaptchaProps,
diff --git a/app/client/src/widgets/ButtonWidgetV2/index.tsx b/app/client/src/widgets/ButtonWidgetV2/index.tsx
deleted file mode 100644
index edc43afdc7..0000000000
--- a/app/client/src/widgets/ButtonWidgetV2/index.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-import { ButtonWidget } from "./widget";
-export { ButtonWidget };
diff --git a/app/client/src/widgets/CategorySliderWidget/widget/index.tsx b/app/client/src/widgets/CategorySliderWidget/widget/index.tsx
index 116512a1a8..9aead08418 100644
--- a/app/client/src/widgets/CategorySliderWidget/widget/index.tsx
+++ b/app/client/src/widgets/CategorySliderWidget/widget/index.tsx
@@ -17,10 +17,10 @@ import { ResponsiveBehavior } from "layoutSystems/common/utils/constants";
 import IconSVG from "../icon.svg";
 import { WIDGET_TAGS } from "constants/WidgetConstants";
 
-export type SliderOption = {
+export interface SliderOption {
   label: string;
   value: string;
-};
+}
 
 export interface CategorySliderWidgetProps
   extends WidgetProps,
diff --git a/app/client/src/widgets/ChartWidget/component/LayoutBuilders/EChartsElementVisibilityCalculator.ts b/app/client/src/widgets/ChartWidget/component/LayoutBuilders/EChartsElementVisibilityCalculator.ts
index a33a19b04f..c2e6730deb 100644
--- a/app/client/src/widgets/ChartWidget/component/LayoutBuilders/EChartsElementVisibilityCalculator.ts
+++ b/app/client/src/widgets/ChartWidget/component/LayoutBuilders/EChartsElementVisibilityCalculator.ts
@@ -3,20 +3,20 @@ export type EChartElementLayoutParams = Omit<
   "height"
 >;
 
-export type EChartVisibleElementConfig = {
+export interface EChartVisibleElementConfig {
   elementName: string;
   height: number;
   minHeight: number;
   maxHeight: number;
   position: "top" | "bottom";
-};
+}
 
-export type EChartElementVisibilityProps = {
+export interface EChartElementVisibilityProps {
   height: number;
   padding: number;
   gridMinimumHeight: number;
   layoutConfigs: EChartElementLayoutParams[];
-};
+}
 
 export class EChartElementVisibilityCalculator {
   props: EChartElementVisibilityProps;
diff --git a/app/client/src/widgets/ChartWidget/component/LayoutBuilders/EChartsLayoutBuilder.ts b/app/client/src/widgets/ChartWidget/component/LayoutBuilders/EChartsLayoutBuilder.ts
index f9e7fb0e8f..57c19fb3c4 100644
--- a/app/client/src/widgets/ChartWidget/component/LayoutBuilders/EChartsLayoutBuilder.ts
+++ b/app/client/src/widgets/ChartWidget/component/LayoutBuilders/EChartsLayoutBuilder.ts
@@ -9,7 +9,7 @@ import { EChartElementVisibilityCalculator } from "./EChartsElementVisibilityCal
 import { EChartsXAxisLayoutBuilder } from "./EChartsXAxisLayoutBuilder";
 import { EChartsYAxisLayoutBuilder } from "./EChartsYAxisLayoutBuilder";
 
-type LayoutProps = {
+interface LayoutProps {
   allowScroll: boolean;
   widgetHeight: number;
   widgetWidth: number;
@@ -19,7 +19,7 @@ type LayoutProps = {
   seriesConfigs: AllChartData;
   font: string;
   longestLabels: LongestLabelParams;
-};
+}
 
 export class EChartsLayoutBuilder {
   gridMinimumHeight = 80;
diff --git a/app/client/src/widgets/CheckboxWidget/component/index.tsx b/app/client/src/widgets/CheckboxWidget/component/index.tsx
index 05114cd4bf..d84f2ea60b 100644
--- a/app/client/src/widgets/CheckboxWidget/component/index.tsx
+++ b/app/client/src/widgets/CheckboxWidget/component/index.tsx
@@ -8,12 +8,12 @@ import { LabelPosition } from "components/constants";
 import { FontStyleTypes } from "constants/WidgetConstants";
 import { Checkbox } from "components/wds";
 
-type StyledCheckboxContainerProps = {
+interface StyledCheckboxContainerProps {
   isValid: boolean;
   noContainerPadding?: boolean;
   labelPosition?: LabelPosition;
   minHeight?: number;
-};
+}
 
 const DEFAULT_BORDER_RADIUS = "0";
 const DEFAULT_BACKGROUND_COLOR = Colors.GREEN_SOLID;
diff --git a/app/client/src/widgets/CurrencyInputWidget/component/CurrencyCodeDropdown.tsx b/app/client/src/widgets/CurrencyInputWidget/component/CurrencyCodeDropdown.tsx
index 4b70d6d83e..6d34dfc074 100644
--- a/app/client/src/widgets/CurrencyInputWidget/component/CurrencyCodeDropdown.tsx
+++ b/app/client/src/widgets/CurrencyInputWidget/component/CurrencyCodeDropdown.tsx
@@ -101,8 +101,8 @@ export const PopoverStyles = createGlobalStyle<{
     }
 
     .${props.portalClassName}  .${Classes.INPUT}:focus, .${
-    props.portalClassName
-  }  .${Classes.INPUT}:active {
+      props.portalClassName
+    }  .${Classes.INPUT}:active {
       border: 1px solid ${props.accentColor} !important;
       box-shadow: 0px 0px 0px 2px ${lightenColor(props.accentColor)} !important;
     }
diff --git a/app/client/src/widgets/IconButtonWidget/component/index.tsx b/app/client/src/widgets/IconButtonWidget/component/index.tsx
index 05f7a641dd..fae7eeb477 100644
--- a/app/client/src/widgets/IconButtonWidget/component/index.tsx
+++ b/app/client/src/widgets/IconButtonWidget/component/index.tsx
@@ -41,13 +41,13 @@ const TooltipStyles = createGlobalStyle`
   }
 `;
 
-type IconButtonContainerProps = {
+interface IconButtonContainerProps {
   disabled?: boolean;
   buttonColor?: string;
   buttonVariant?: ButtonVariant;
   hasOnClickAction?: boolean;
   renderMode: RenderMode;
-};
+}
 
 const IconButtonContainer = styled.div<IconButtonContainerProps>`
   display: flex;
diff --git a/app/client/src/widgets/InputWidget/component/CurrencyCodeDropdown.tsx b/app/client/src/widgets/InputWidget/component/CurrencyCodeDropdown.tsx
index 817a072caf..ddb0f74784 100644
--- a/app/client/src/widgets/InputWidget/component/CurrencyCodeDropdown.tsx
+++ b/app/client/src/widgets/InputWidget/component/CurrencyCodeDropdown.tsx
@@ -66,8 +66,8 @@ export const PopoverStyles = createGlobalStyle<{
     }
 
     .${props.portalClassName}  .${Classes.INPUT}:focus, .${
-    props.portalClassName
-  }  .${Classes.INPUT}:active {
+      props.portalClassName
+    }  .${Classes.INPUT}:active {
       border: 1px solid ${props.accentColor} !important;
     }
 
diff --git a/app/client/src/widgets/InputWidget/component/ISDCodeDropdown.tsx b/app/client/src/widgets/InputWidget/component/ISDCodeDropdown.tsx
index e6bbf5797d..0c987adc04 100644
--- a/app/client/src/widgets/InputWidget/component/ISDCodeDropdown.tsx
+++ b/app/client/src/widgets/InputWidget/component/ISDCodeDropdown.tsx
@@ -61,8 +61,8 @@ export const PopoverStyles = createGlobalStyle<{
     }
 
     .${props.portalClassName}  .${Classes.INPUT}:focus, .${
-    props.portalClassName
-  }  .${Classes.INPUT}:active {
+      props.portalClassName
+    }  .${Classes.INPUT}:active {
       border: 1px solid ${props.accentColor} !important;
       box-shadow:  0px 0px 0px 3px ${lightenColor(
         props.accentColor,
diff --git a/app/client/src/widgets/InputWidgetV3/index.ts b/app/client/src/widgets/InputWidgetV3/index.ts
deleted file mode 100644
index 145b0faa90..0000000000
--- a/app/client/src/widgets/InputWidgetV3/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { InputWidget } from "./widget";
-export { InputWidget };
diff --git a/app/client/src/widgets/JSONFormWidget/component/Accordion.tsx b/app/client/src/widgets/JSONFormWidget/component/Accordion.tsx
index 146cda686b..841a3c3759 100644
--- a/app/client/src/widgets/JSONFormWidget/component/Accordion.tsx
+++ b/app/client/src/widgets/JSONFormWidget/component/Accordion.tsx
@@ -14,17 +14,17 @@ type AccordionProps = React.PropsWithChildren<{
   title?: string;
 }>;
 
-type StyledToggleHeaderProps = {
+interface StyledToggleHeaderProps {
   isOpen: boolean;
-};
+}
 
-type StyledWrapperProps = {
+interface StyledWrapperProps {
   backgroundColor?: string;
   borderColor?: string;
   borderRadius?: string;
   borderWidth?: number;
   boxShadow?: string;
-};
+}
 
 const COLLAPSE_PADDING = 10;
 const WRAPPER_MARGIN_BOTTOM = 8;
diff --git a/app/client/src/widgets/JSONFormWidget/component/Field.tsx b/app/client/src/widgets/JSONFormWidget/component/Field.tsx
index cfc6cb27f7..6718ab45e3 100644
--- a/app/client/src/widgets/JSONFormWidget/component/Field.tsx
+++ b/app/client/src/widgets/JSONFormWidget/component/Field.tsx
@@ -22,9 +22,9 @@ type FieldProps<TValue> = React.PropsWithChildren<
   } & FieldLabelProps
 >;
 
-type StyledWrapperProps = {
+interface StyledWrapperProps {
   direction: "row" | "column";
-};
+}
 
 const StyledWrapper = styled.div<StyledWrapperProps>`
   margin-bottom: ${FIELD_MARGIN_BOTTOM}px;
diff --git a/app/client/src/widgets/JSONFormWidget/component/FieldLabel.tsx b/app/client/src/widgets/JSONFormWidget/component/FieldLabel.tsx
index 5b5ca4863a..c0cd258c4c 100644
--- a/app/client/src/widgets/JSONFormWidget/component/FieldLabel.tsx
+++ b/app/client/src/widgets/JSONFormWidget/component/FieldLabel.tsx
@@ -14,20 +14,20 @@ const HelpIcon = importSvg(async () => import("assets/icons/control/help.svg"));
 
 type AlignField = AlignWidget;
 
-type StyledLabelTextProps = {
+interface StyledLabelTextProps {
   color: string;
   fontSize: string;
   fontStyle: string;
   fontWeight: string;
   isRequiredField: boolean;
   textDecoration: string;
-};
+}
 
-export type LabelStyles = {
+export interface LabelStyles {
   labelStyle?: string;
   labelTextColor?: string;
   labelTextSize?: string;
-};
+}
 
 export type FieldLabelProps = PropsWithChildren<
   LabelStyles & {
@@ -39,13 +39,13 @@ export type FieldLabelProps = PropsWithChildren<
   }
 >;
 
-type StyledLabelTextWrapperProps = {
+interface StyledLabelTextWrapperProps {
   direction: FieldLabelProps["direction"];
-};
+}
 
-type StyledLabelProps = {
+interface StyledLabelProps {
   direction?: FieldLabelProps["direction"];
-};
+}
 
 const LABEL_TEXT_WRAPPER_MARGIN_BOTTOM = 4;
 const LABEL_TEXT_MARGIN_RIGHT_WITH_REQUIRED = 2;
diff --git a/app/client/src/widgets/JSONFormWidget/component/Form.tsx b/app/client/src/widgets/JSONFormWidget/component/Form.tsx
index 7bab74c022..ac2681e5b7 100644
--- a/app/client/src/widgets/JSONFormWidget/component/Form.tsx
+++ b/app/client/src/widgets/JSONFormWidget/component/Form.tsx
@@ -40,19 +40,19 @@ export type FormProps<TValues = any> = PropsWithChildren<{
   updateFormData: (values: TValues, skipConversion?: boolean) => void;
 }>;
 
-type StyledFormProps = {
+interface StyledFormProps {
   fixedFooter: boolean;
   scrollContents: boolean;
-};
+}
 
-type StyledFormBodyProps = {
+interface StyledFormBodyProps {
   stretchBodyVertically: boolean;
-};
+}
 
-type StyledFooterProps = {
+interface StyledFooterProps {
   fixedFooter: boolean;
   backgroundColor?: string;
-};
+}
 
 const BUTTON_WIDTH = 110;
 const FOOTER_BUTTON_GAP = 10;
diff --git a/app/client/src/widgets/JSONFormWidget/component/NestedFormWrapper.tsx b/app/client/src/widgets/JSONFormWidget/component/NestedFormWrapper.tsx
index dc76982810..eb399d668e 100644
--- a/app/client/src/widgets/JSONFormWidget/component/NestedFormWrapper.tsx
+++ b/app/client/src/widgets/JSONFormWidget/component/NestedFormWrapper.tsx
@@ -2,14 +2,14 @@ import styled from "styled-components";
 
 import { Colors } from "constants/Colors";
 
-type StyledWrapperProps = {
+interface StyledWrapperProps {
   backgroundColor?: string;
   borderColor?: string;
   borderRadius?: string;
   borderWidth?: number;
   boxShadow?: string;
   withoutPadding?: boolean;
-};
+}
 
 const NESTED_FORM_WRAPPER_PADDING = 10;
 const DEFAULT_BORDER_RADIUS = 0;
diff --git a/app/client/src/widgets/JSONFormWidget/component/index.tsx b/app/client/src/widgets/JSONFormWidget/component/index.tsx
index 18b5548e8a..ac27cf7935 100644
--- a/app/client/src/widgets/JSONFormWidget/component/index.tsx
+++ b/app/client/src/widgets/JSONFormWidget/component/index.tsx
@@ -22,11 +22,11 @@ import {
 } from "../constants/messages";
 import { createMessage } from "@appsmith/constants/messages";
 
-type StyledContainerProps = {
+interface StyledContainerProps {
   backgroundColor?: string;
-};
+}
 
-export type JSONFormComponentProps<TValues = any> = {
+export interface JSONFormComponentProps<TValues = any> {
   backgroundColor?: string;
   borderColor?: Color;
   borderRadius?: number;
@@ -63,7 +63,7 @@ export type JSONFormComponentProps<TValues = any> = {
   updateWidgetProperty: (propertyName: string, propertyValue: any) => void;
   widgetId: string;
   showConnectDataOverlay?: boolean;
-};
+}
 
 const StyledContainer = styled(WidgetStyleContainer)<StyledContainerProps>`
   background: ${({ backgroundColor }) => backgroundColor || "#fff"};
diff --git a/app/client/src/widgets/JSONFormWidget/component/useFixedFooter.ts b/app/client/src/widgets/JSONFormWidget/component/useFixedFooter.ts
index 93b47f890c..1a341f559f 100644
--- a/app/client/src/widgets/JSONFormWidget/component/useFixedFooter.ts
+++ b/app/client/src/widgets/JSONFormWidget/component/useFixedFooter.ts
@@ -1,11 +1,11 @@
 import { throttle } from "lodash";
 import { useLayoutEffect, useRef } from "react";
 
-type UseFixedFooterProps = {
+interface UseFixedFooterProps {
   fixedFooter: boolean;
   activeClassName: string;
   ref: React.MutableRefObject<HTMLDivElement | null>;
-};
+}
 
 const ERROR_MARGIN = 2;
 
diff --git a/app/client/src/widgets/JSONFormWidget/constants.ts b/app/client/src/widgets/JSONFormWidget/constants.ts
index 14abbab5e2..5f3a726f65 100644
--- a/app/client/src/widgets/JSONFormWidget/constants.ts
+++ b/app/client/src/widgets/JSONFormWidget/constants.ts
@@ -40,11 +40,14 @@ export type FieldTypeKey = keyof typeof FieldType;
 
 export const inverseFieldType = Object.entries(FieldType).reduce<
   Record<FieldType, FieldTypeKey>
->((previousValue, currentValue) => {
-  const [key, value] = currentValue;
-  previousValue[value] = key as FieldTypeKey;
-  return previousValue;
-}, {} as Record<FieldType, FieldTypeKey>);
+>(
+  (previousValue, currentValue) => {
+    const [key, value] = currentValue;
+    previousValue[value] = key as FieldTypeKey;
+    return previousValue;
+  },
+  {} as Record<FieldType, FieldTypeKey>,
+);
 
 export enum DataType {
   STRING = "string",
@@ -62,7 +65,7 @@ export enum DataType {
 export type Obj = Record<string, any>;
 export type JSON = Obj | Obj[];
 
-export type FieldComponentBaseProps = {
+export interface FieldComponentBaseProps {
   defaultValue?: string | number;
   isDisabled: boolean;
   shouldAllowAutofill?: boolean;
@@ -73,14 +76,14 @@ export type FieldComponentBaseProps = {
   labelTextColor?: string;
   labelTextSize?: string;
   tooltip?: string;
-};
+}
 
-export type FieldEventProps = {
+export interface FieldEventProps {
   onFocus?: string;
   onBlur?: string;
-};
+}
 
-export type BaseFieldComponentProps<TProps = any> = {
+export interface BaseFieldComponentProps<TProps = any> {
   hideLabel?: boolean;
   isRootField?: boolean;
   fieldClassName: string;
@@ -88,7 +91,7 @@ export type BaseFieldComponentProps<TProps = any> = {
   propertyPath: string;
   passedDefaultValue?: unknown;
   schemaItem: SchemaItem & TProps;
-};
+}
 
 export type Schema = Record<string, SchemaItem>;
 
@@ -121,7 +124,7 @@ export type SchemaItem = FieldComponentBaseProps & {
   sourceData: any;
 };
 
-export type ComponentDefaultValuesFnProps<TSourceData = any> = {
+export interface ComponentDefaultValuesFnProps<TSourceData = any> {
   sourceDataPath?: string;
   fieldType: FieldType;
   bindingTemplate: {
@@ -131,16 +134,16 @@ export type ComponentDefaultValuesFnProps<TSourceData = any> = {
   isCustomField: boolean;
   sourceData: TSourceData;
   skipDefaultValueProcessing: boolean;
-};
+}
 
 // This defines a react component with componentDefaultValues property attached to it.
-export type FieldComponent = {
+export interface FieldComponent {
   (props: BaseFieldComponentProps): JSX.Element | null;
   componentDefaultValues?:
     | FieldComponentBaseProps
     | ((props: ComponentDefaultValuesFnProps) => FieldComponentBaseProps);
   isValidType?: (value: any, options?: any) => boolean;
-};
+}
 
 export type FieldState<TObj> =
   | {
diff --git a/app/client/src/widgets/JSONFormWidget/fields/ArrayField.tsx b/app/client/src/widgets/JSONFormWidget/fields/ArrayField.tsx
index 5fae14661a..5a437c4600 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/ArrayField.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/ArrayField.tsx
@@ -51,9 +51,9 @@ type ArrayComponentProps = FieldComponentBaseProps & {
 
 type ArrayFieldProps = BaseFieldComponentProps<ArrayComponentProps>;
 
-type StyledButtonProps = {
+interface StyledButtonProps {
   color?: string;
-};
+}
 
 const COMPONENT_DEFAULT_VALUES: ArrayComponentProps = {
   backgroundColor: Colors.GREY_1,
diff --git a/app/client/src/widgets/JSONFormWidget/fields/BaseInputField.tsx b/app/client/src/widgets/JSONFormWidget/fields/BaseInputField.tsx
index eb14013bd0..aee255070c 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/BaseInputField.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/BaseInputField.tsx
@@ -57,10 +57,10 @@ export type BaseInputComponentProps = FieldComponentBaseProps &
     validation?: boolean;
   };
 
-export type OnValueChangeOptions = {
+export interface OnValueChangeOptions {
   fieldOnChangeHandler: (...event: any[]) => void;
   isValueValid: boolean;
-};
+}
 
 type BaseInputFieldProps<TSchemaItem extends SchemaItem = SchemaItem> =
   BaseFieldComponentProps<BaseInputComponentProps & TSchemaItem> & {
@@ -73,13 +73,13 @@ type BaseInputFieldProps<TSchemaItem extends SchemaItem = SchemaItem> =
     isValid: (schemaItem: TSchemaItem, value?: string | null) => boolean;
   };
 
-type IsValidOptions = {
+interface IsValidOptions {
   fieldType: FieldType;
-};
+}
 
-type StyledInputWrapperProps = {
+interface StyledInputWrapperProps {
   multiline: boolean;
-};
+}
 
 const COMPONENT_DEFAULT_VALUES: BaseInputComponentProps = {
   isDisabled: false,
diff --git a/app/client/src/widgets/JSONFormWidget/fields/CurrencyInputField.tsx b/app/client/src/widgets/JSONFormWidget/fields/CurrencyInputField.tsx
index 82eba113a4..9c381d427a 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/CurrencyInputField.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/CurrencyInputField.tsx
@@ -25,7 +25,7 @@ type CurrencyInputComponentProps = BaseInputComponentProps & {
 export type CurrencyInputFieldProps =
   BaseFieldComponentProps<CurrencyInputComponentProps>;
 
-type CurrencyTypeDropdownComponentProps = {
+interface CurrencyTypeDropdownComponentProps {
   allowCurrencyChange?: boolean;
   borderRadius?: string;
   currencyCountryCode: string;
@@ -33,7 +33,7 @@ type CurrencyTypeDropdownComponentProps = {
   accentColor?: string;
   propertyPath: string;
   fieldName: string;
-};
+}
 
 const COMPONENT_DEFAULT_VALUES: CurrencyInputComponentProps = {
   currencyCountryCode: getDefaultCurrency().currency,
diff --git a/app/client/src/widgets/JSONFormWidget/fields/FieldRenderer.tsx b/app/client/src/widgets/JSONFormWidget/fields/FieldRenderer.tsx
index 4f4841b5c1..a0fb61754b 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/FieldRenderer.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/FieldRenderer.tsx
@@ -6,13 +6,13 @@ import FormContext from "../FormContext";
 import type { SchemaItem } from "../constants";
 import { FIELD_MAP } from "../constants";
 
-type FieldRendererProps = {
+interface FieldRendererProps {
   fieldName: ControllerRenderProps["name"];
   options?: Record<string, any>;
   passedDefaultValue?: unknown;
   propertyPath: string;
   schemaItem: SchemaItem;
-};
+}
 
 function FieldRenderer({
   fieldName,
diff --git a/app/client/src/widgets/JSONFormWidget/fields/InputField.tsx b/app/client/src/widgets/JSONFormWidget/fields/InputField.tsx
index eac394218e..d073a5e35b 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/InputField.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/InputField.tsx
@@ -15,9 +15,9 @@ type InputComponentProps = BaseInputComponentProps & {
 
 export type InputFieldProps = BaseFieldComponentProps<InputComponentProps>;
 
-type IsValidOptions = {
+interface IsValidOptions {
   fieldType: FieldType;
-};
+}
 
 const COMPONENT_DEFAULT_VALUES: InputComponentProps = {
   iconAlign: "left",
diff --git a/app/client/src/widgets/JSONFormWidget/fields/ObjectField.tsx b/app/client/src/widgets/JSONFormWidget/fields/ObjectField.tsx
index acc4246758..1be1828567 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/ObjectField.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/ObjectField.tsx
@@ -37,9 +37,9 @@ type ObjectFieldProps = Omit<
   name: string;
 };
 
-type StyledWrapperProps = {
+interface StyledWrapperProps {
   withBottomMargin: boolean;
-};
+}
 
 const COMPONENT_DEFAULT_VALUES: ObjectComponentProps = {
   isDisabled: false,
diff --git a/app/client/src/widgets/JSONFormWidget/fields/PhoneInputField.tsx b/app/client/src/widgets/JSONFormWidget/fields/PhoneInputField.tsx
index 5cd46c104f..8a17c183e8 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/PhoneInputField.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/PhoneInputField.tsx
@@ -22,13 +22,13 @@ type PhoneInputComponentProps = BaseInputComponentProps & {
 export type PhoneInputFieldProps =
   BaseFieldComponentProps<PhoneInputComponentProps>;
 
-type ISDCodeDropdownComponentProps = {
+interface ISDCodeDropdownComponentProps {
   allowDialCodeChange: boolean;
   dialCode: string;
   fieldName: string;
   isDisabled: boolean;
   propertyPath: string;
-};
+}
 
 const COMPONENT_DEFAULT_VALUES: PhoneInputComponentProps = {
   allowDialCodeChange: false,
diff --git a/app/client/src/widgets/JSONFormWidget/fields/SelectField.tsx b/app/client/src/widgets/JSONFormWidget/fields/SelectField.tsx
index ab30dcf193..75cb37c52e 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/SelectField.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/SelectField.tsx
@@ -19,9 +19,9 @@ import { isNil } from "lodash";
 import { Colors } from "constants/Colors";
 import { BASE_LABEL_TEXT_SIZE } from "../component/FieldLabel";
 
-type MetaProps = {
+interface MetaProps {
   filterText?: string;
-};
+}
 
 type DefaultValue = string | number | DropdownOption | null | undefined;
 
diff --git a/app/client/src/widgets/JSONFormWidget/fields/useBlurAndFocusEvents.ts b/app/client/src/widgets/JSONFormWidget/fields/useBlurAndFocusEvents.ts
index 5712903203..b8be3d34b9 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/useBlurAndFocusEvents.ts
+++ b/app/client/src/widgets/JSONFormWidget/fields/useBlurAndFocusEvents.ts
@@ -9,11 +9,11 @@ type BaseEvents = Pick<
   "onfocus" | "onblur" | "addEventListener" | "removeEventListener"
 >;
 
-type UseEventsProps = {
+interface UseEventsProps {
   fieldBlurHandler?: ControllerRenderProps["onBlur"];
   onFocusDynamicString?: string;
   onBlurDynamicString?: string;
-};
+}
 
 function useBlurAndFocusEvents<TElement extends BaseEvents>({
   fieldBlurHandler,
diff --git a/app/client/src/widgets/JSONFormWidget/fields/useObserveAccessor.ts b/app/client/src/widgets/JSONFormWidget/fields/useObserveAccessor.ts
index 8e2b1059cf..04878b1a1e 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/useObserveAccessor.ts
+++ b/app/client/src/widgets/JSONFormWidget/fields/useObserveAccessor.ts
@@ -3,9 +3,9 @@ import { useFormContext } from "react-hook-form";
 
 import FormContext from "../FormContext";
 
-type UseUpdateAccessorProps = {
+interface UseUpdateAccessorProps {
   accessor: string;
-};
+}
 
 /**
  * This hook observes changes in the accessor and triggers a re-computation
diff --git a/app/client/src/widgets/JSONFormWidget/fields/useRegisterFieldValidity.ts b/app/client/src/widgets/JSONFormWidget/fields/useRegisterFieldValidity.ts
index 83891a53f5..27c100e90a 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/useRegisterFieldValidity.ts
+++ b/app/client/src/widgets/JSONFormWidget/fields/useRegisterFieldValidity.ts
@@ -8,11 +8,11 @@ import { klona } from "klona";
 import FormContext from "../FormContext";
 import type { FieldType } from "../constants";
 
-export type UseRegisterFieldValidityProps = {
+export interface UseRegisterFieldValidityProps {
   isValid: boolean;
   fieldName: ControllerProps["name"];
   fieldType: FieldType;
-};
+}
 /**
  * This hook is used to register the isValid property of the field
  * the meta property "fieldState".
diff --git a/app/client/src/widgets/JSONFormWidget/fields/useUpdateInternalMetaState.ts b/app/client/src/widgets/JSONFormWidget/fields/useUpdateInternalMetaState.ts
index 7fdea211b0..3f7b2ded78 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/useUpdateInternalMetaState.ts
+++ b/app/client/src/widgets/JSONFormWidget/fields/useUpdateInternalMetaState.ts
@@ -5,9 +5,9 @@ import { klona } from "klona";
 import type { DebouncedExecuteActionPayload } from "widgets/MetaHOC";
 import FormContext from "../FormContext";
 
-export type UseUpdateInternalMetaStateProps = {
+export interface UseUpdateInternalMetaStateProps {
   propertyName?: string;
-};
+}
 
 const DEBOUNCE_TIMEOUT = 100;
 
diff --git a/app/client/src/widgets/JSONFormWidget/helper.ts b/app/client/src/widgets/JSONFormWidget/helper.ts
index 6dc76b076f..f00195cb31 100644
--- a/app/client/src/widgets/JSONFormWidget/helper.ts
+++ b/app/client/src/widgets/JSONFormWidget/helper.ts
@@ -6,6 +6,7 @@ import {
   getDynamicBindings,
   combineDynamicBindings,
 } from "utils/DynamicBindingUtils";
+import type { Column } from "../../WidgetQueryGenerators/types";
 import type { FieldThemeStylesheet, Schema, SchemaItem } from "./constants";
 import {
   ARRAY_ITEM_KEY,
@@ -16,12 +17,12 @@ import {
 import moment from "moment";
 import { ISO_DATE_FORMAT } from "constants/WidgetValidation";
 
-type ConvertFormDataOptions = {
+interface ConvertFormDataOptions {
   fromId: keyof SchemaItem | (keyof SchemaItem)[];
   toId: keyof SchemaItem;
   useSourceData?: boolean;
   sourceData?: unknown;
-};
+}
 
 /**
  * This function finds the value from the object by using the id provided. The id
@@ -363,9 +364,7 @@ export const isEmpty = (value?: string | null): value is null | undefined => {
   return value === "" || isNil(value);
 };
 
-export const generateSchemaWithDefaultValues = (
-  columns: Array<Record<string, unknown>>,
-) => {
+export const generateSchemaWithDefaultValues = (columns: Column[]) => {
   const typeMappings: Record<string, unknown> = {
     number: 0,
     string: "",
diff --git a/app/client/src/widgets/JSONFormWidget/schemaParser.ts b/app/client/src/widgets/JSONFormWidget/schemaParser.ts
index da913cf137..29c9c1bf5b 100644
--- a/app/client/src/widgets/JSONFormWidget/schemaParser.ts
+++ b/app/client/src/widgets/JSONFormWidget/schemaParser.ts
@@ -31,7 +31,7 @@ import { getFieldStylesheet } from "./helper";
 
 type Obj = Record<string, unknown>;
 
-type ParserOptions = {
+interface ParserOptions {
   baseSchemaPath: string | null;
   currSourceData?: unknown;
   fieldThemeStylesheets?: FieldThemeStylesheet;
@@ -48,26 +48,26 @@ type ParserOptions = {
   sourceDataPath?: string;
   widgetName: string;
   identifier: string;
-};
+}
 
-type SchemaItemsByFieldOptions = {
+interface SchemaItemsByFieldOptions {
   fieldThemeStylesheets?: FieldThemeStylesheet;
   schema: Schema;
   schemaItem: SchemaItem;
   schemaItemPath: string;
   widgetName: string;
-};
+}
 
-type GetKeysFromSchemaOptions = {
+interface GetKeysFromSchemaOptions {
   onlyNonCustomFieldKeys?: boolean;
   onlyCustomFieldKeys?: boolean;
-};
+}
 
-type ParseOptions = {
+interface ParseOptions {
   currSourceData?: unknown;
   schema?: Schema;
   fieldThemeStylesheets?: FieldThemeStylesheet;
-};
+}
 
 function isObject(val: unknown): val is Obj {
   return typeof val === "object" && !Array.isArray(val) && val !== null;
@@ -367,7 +367,7 @@ class SchemaParser {
    * @param schema Previous generated schema if present.
    */
   static parse = (widgetName: string, options: ParseOptions) => {
-    const { currSourceData, schema = {}, fieldThemeStylesheets } = options;
+    const { currSourceData, fieldThemeStylesheets, schema = {} } = options;
     if (!currSourceData)
       return { schema, modifiedSchemaItems: {}, removedSchemaItems: [] };
 
@@ -709,9 +709,9 @@ class SchemaParser {
   static convertObjectToSchema = ({
     baseSchemaPath,
     currSourceData,
-    removedSchemaItems,
     modifiedSchemaItems,
     prevSchema = {},
+    removedSchemaItems,
     sourceDataPath,
     ...rest
   }: Omit<ParserOptions, "identifier">): Schema => {
diff --git a/app/client/src/widgets/JSONFormWidget/widget/helper.ts b/app/client/src/widgets/JSONFormWidget/widget/helper.ts
index 82c339deff..87d07dd8a7 100644
--- a/app/client/src/widgets/JSONFormWidget/widget/helper.ts
+++ b/app/client/src/widgets/JSONFormWidget/widget/helper.ts
@@ -21,26 +21,26 @@ import {
 import { countFields } from "../helper";
 import SchemaParser from "../schemaParser";
 
-type FieldStateItem = {
+interface FieldStateItem {
   isRequired?: boolean;
   isVisible?: boolean;
   isDisabled?: boolean;
   isValid?: boolean;
   filterText?: string;
-};
+}
 
 type MetaFieldState = FieldState<FieldStateItem>;
 
 type PathList = Array<{ key: string }>;
-type ComputedSchema = {
+interface ComputedSchema {
   status: ComputedSchemaStatus;
   schema: Schema;
   dynamicPropertyPathList?: PathList;
   modifiedSchemaItems: Record<string, SchemaItem>;
   removedSchemaItems: string[];
-};
+}
 
-type ComputeSchemaProps = {
+interface ComputeSchemaProps {
   currSourceData?: JSON;
   prevSourceData?: JSON;
   prevSchema?: Schema;
@@ -48,7 +48,7 @@ type ComputeSchemaProps = {
   currentDynamicPropertyPathList?: PathList;
   fieldThemeStylesheets: FieldThemeStylesheet;
   prevDynamicPropertyPathList?: PathList;
-};
+}
 
 export enum ComputedSchemaStatus {
   LIMIT_EXCEEDED = "LIMIT_EXCEEDED",
diff --git a/app/client/src/widgets/JSONFormWidget/widget/index.tsx b/app/client/src/widgets/JSONFormWidget/widget/index.tsx
index 3565e647a0..a7eaea49c9 100644
--- a/app/client/src/widgets/JSONFormWidget/widget/index.tsx
+++ b/app/client/src/widgets/JSONFormWidget/widget/index.tsx
@@ -104,11 +104,11 @@ export type MetaInternalFieldState = FieldState<{
   filterText?: string;
 }>;
 
-export type JSONFormWidgetState = {
+export interface JSONFormWidgetState {
   resetObserverCallback: () => void;
   isSubmitting: boolean;
   metaInternalFieldState: MetaInternalFieldState;
-};
+}
 
 export type Action = ExecuteTriggerPayload & {
   updateDependencyType?: ActionUpdateDependency;
@@ -270,9 +270,10 @@ class JSONFormWidget extends BaseWidget<
             (column) => `${column.name}`,
           );
           modify = {
-            sourceData: `{{_.pick(${
-              formConfig?.otherFields?.defaultValues
-            },${selectedColumnNames.map((name) => `'${name}'`).join(",")})}}`,
+            sourceData: `{{_.pick(${formConfig?.otherFields
+              ?.defaultValues},${selectedColumnNames
+              .map((name) => `'${name}'`)
+              .join(",")})}}`,
             title: `Update Row ${primaryKey} {{${formConfig?.otherFields?.defaultValues}.${primaryKey}}}`,
             onSubmit: queryConfig?.update.run,
           };
diff --git a/app/client/src/widgets/ListWidgetV2/MetaWidgetGenerator.test.ts b/app/client/src/widgets/ListWidgetV2/MetaWidgetGenerator.test.ts
index c43ea86f6e..5edb1ff059 100644
--- a/app/client/src/widgets/ListWidgetV2/MetaWidgetGenerator.test.ts
+++ b/app/client/src/widgets/ListWidgetV2/MetaWidgetGenerator.test.ts
@@ -15,17 +15,17 @@ import CanvasWidget from "widgets/CanvasWidget";
 import ContainerWidget from "widgets/ContainerWidget";
 import { registerWidgets } from "WidgetProvider/factory/registrationHelper";
 
-type Validator = {
+interface Validator {
   widgetType: string;
   occurrence: number;
-};
+}
 
-type InitProps = {
+interface InitProps {
   optionsProps?: Partial<GeneratorOptions>;
   constructorProps?: Partial<ConstructorProps>;
   passedCache?: Cache;
   listWidgetId?: string;
-};
+}
 
 const data = [
   { id: 1, name: "Blue" },
diff --git a/app/client/src/widgets/ListWidgetV2/MetaWidgetGenerator.ts b/app/client/src/widgets/ListWidgetV2/MetaWidgetGenerator.ts
index 3c52019e8f..90a9611658 100644
--- a/app/client/src/widgets/ListWidgetV2/MetaWidgetGenerator.ts
+++ b/app/client/src/widgets/ListWidgetV2/MetaWidgetGenerator.ts
@@ -50,30 +50,30 @@ type ReferenceCache = Record<
   | undefined
 >;
 
-type UpdateSiblingsOptions = {
+interface UpdateSiblingsOptions {
   templateWidgetId: string;
   originalMetaWidgetId: string;
   metaWidget: MetaWidget;
-};
+}
 
-type GenerateDefaultCacheOptions = {
+interface GenerateDefaultCacheOptions {
   lookupId: string;
   templateWidget: FlattenedWidgetProps;
   generateEntityDefinition: boolean;
-};
+}
 
-export type HookOptions = {
+export interface HookOptions {
   childMetaWidgets: MetaWidgets;
   rowReferences: Record<string, string | undefined>;
-};
+}
 
 type Hook = (metaWidget: MetaWidget, options: HookOptions) => void;
 
-type Hooks = {
+interface Hooks {
   afterMetaWidgetGenerate?: Hook;
-};
+}
 
-export type GeneratorOptions = {
+export interface GeneratorOptions {
   containerParentId: string;
   containerWidgetId: string;
   currTemplateWidgets: TemplateWidgets;
@@ -92,9 +92,9 @@ export type GeneratorOptions = {
   serverSidePagination: boolean;
   templateHeight: number;
   widgetName: string;
-};
+}
 
-export type ConstructorProps = {
+export interface ConstructorProps {
   getWidgetCache: () => MetaWidgetCache | undefined;
   getWidgetReferenceCache: () => ReferenceCache | undefined;
   infiniteScroll: boolean;
@@ -106,51 +106,51 @@ export type ConstructorProps = {
   renderMode: string;
   setWidgetCache: (data: MetaWidgetCache) => void;
   setWidgetReferenceCache: (data: ReferenceCache) => void;
-};
+}
 
-type TemplateWidgetStatus = {
+interface TemplateWidgetStatus {
   added: Set<string>;
   updated: Set<string>;
   removed: Set<string>;
   unchanged: Set<string>;
-};
+}
 
-type CacheDataOption = {
+interface CacheDataOption {
   keepMetaWidgetData: boolean;
   key: string;
-};
+}
 
-type GenerateMetaWidgetProps = {
+interface GenerateMetaWidgetProps {
   rowIndex: number;
   templateWidgetId: string;
   parentId: string;
   options?: CacheDataOption;
-};
+}
 
-type GenerateMetaWidgetChildrenProps = {
+interface GenerateMetaWidgetChildrenProps {
   rowIndex: number;
   parentId: string;
   templateWidget: FlattenedWidgetProps;
   options?: CacheDataOption;
-};
+}
 
-type GeneratedMetaWidget = {
+interface GeneratedMetaWidget {
   metaWidgetId?: string;
   metaWidgetName?: string;
   childMetaWidgets?: MetaWidgets;
   metaWidget?: MetaWidget;
-};
+}
 
-type CachedRows = {
+interface CachedRows {
   prev: Set<string>;
   curr: Set<string>;
-};
+}
 
-type LevelProperty = {
+interface LevelProperty {
   currentIndex: number;
   currentItem: string;
   currentView: Record<string, string>;
-};
+}
 
 type VirtualizerInstance = Virtualizer<HTMLDivElement, HTMLDivElement>;
 type VirtualizerOptionsProps = VirtualizerOptions<
@@ -158,15 +158,15 @@ type VirtualizerOptionsProps = VirtualizerOptions<
   HTMLDivElement
 >;
 
-type AddDynamicPathsPropertiesOptions = {
+interface AddDynamicPathsPropertiesOptions {
   excludedPaths?: string[];
-};
+}
 
-type ViewMetaWidget = {
+interface ViewMetaWidget {
   metaWidgetId: string;
   isClonedItem: boolean;
   templateWidgetId: string;
-};
+}
 
 type Siblings = Record<string, string[]>;
 
@@ -914,8 +914,8 @@ class MetaWidgetGenerator {
               }
               return newObj;
               })(${metaContainerName}.data, ${JSON.stringify(
-            BLACKLISTED_ENTITY_DEFINITION_IN_LEVEL_DATA[type],
-          )} )
+                BLACKLISTED_ENTITY_DEFINITION_IN_LEVEL_DATA[type],
+              )} )
           }}`,
         },
       },
@@ -1665,8 +1665,8 @@ class MetaWidgetGenerator {
           // "Input1: { value: List1_Input1_1.value, text: List1_Input1_1.text }"
           dependantBinding[templateWidgetName] = `
             ${templateWidgetName}: {${
-            dependantMetaWidget?.entityDefinition || ""
-          }}
+              dependantMetaWidget?.entityDefinition || ""
+            }}
           `;
         }
       });
diff --git a/app/client/src/widgets/ListWidgetV2/Queue.ts b/app/client/src/widgets/ListWidgetV2/Queue.ts
index b072e80763..873888cad2 100644
--- a/app/client/src/widgets/ListWidgetV2/Queue.ts
+++ b/app/client/src/widgets/ListWidgetV2/Queue.ts
@@ -1,9 +1,9 @@
 type Primitive = string | number | boolean;
 
-export type Item<T extends Primitive> = {
+export interface Item<T extends Primitive> {
   type: T;
   metadata?: Record<string, unknown>;
-};
+}
 
 const isPrimitive = (value: unknown) =>
   ["string", "boolean", "number"].includes(typeof value);
diff --git a/app/client/src/widgets/ListWidgetV2/component/ListPagination.tsx b/app/client/src/widgets/ListWidgetV2/component/ListPagination.tsx
index 0897d9075e..095988f529 100644
--- a/app/client/src/widgets/ListWidgetV2/component/ListPagination.tsx
+++ b/app/client/src/widgets/ListWidgetV2/component/ListPagination.tsx
@@ -439,7 +439,7 @@ export function ServerSideListPagination(props: ServerSideListPaginationProps) {
         title="Previous Page"
       >
         <button
-          area-label="prev page"
+          aria-label="prev page"
           className="rc-pagination-item-link"
           onClick={() => {
             if (props.pageNo > 1) props.prevPageClick();
@@ -462,7 +462,7 @@ export function ServerSideListPagination(props: ServerSideListPaginationProps) {
         title="Next Page"
       >
         <button
-          area-label="next page"
+          aria-label="next page"
           className="rc-pagination-item-link"
           onClick={() => {
             props.nextPageClick();
diff --git a/app/client/src/widgets/ListWidgetV2/component/Loader.tsx b/app/client/src/widgets/ListWidgetV2/component/Loader.tsx
index f451f6f853..223601525d 100644
--- a/app/client/src/widgets/ListWidgetV2/component/Loader.tsx
+++ b/app/client/src/widgets/ListWidgetV2/component/Loader.tsx
@@ -3,11 +3,11 @@ import styled from "styled-components";
 import { range } from "lodash";
 import { WIDGET_PADDING } from "constants/WidgetConstants";
 
-type LoaderProps = {
+interface LoaderProps {
   pageSize: number;
   itemSpacing?: number;
   templateHeight: number;
-};
+}
 
 type LoaderItemProps = Pick<LoaderProps, "templateHeight" | "itemSpacing">;
 type StyledWrapperProps = Pick<LoaderProps, "itemSpacing">;
diff --git a/app/client/src/widgets/ListWidgetV2/widget/index.tsx b/app/client/src/widgets/ListWidgetV2/widget/index.tsx
index a7e3b88917..fb4eebbed4 100644
--- a/app/client/src/widgets/ListWidgetV2/widget/index.tsx
+++ b/app/client/src/widgets/ListWidgetV2/widget/index.tsx
@@ -81,16 +81,16 @@ export type MetaWidget<TProps = void> = TProps extends void
   ? BaseMetaWidget
   : TProps & BaseMetaWidget;
 
-export type LevelData = {
+export interface LevelData {
   [level: string]: {
     currentIndex: number;
     currentItem: string;
     currentRowCache: LevelDataRowCache;
     autocomplete: Record<string, unknown>;
   };
-};
+}
 
-export type MetaWidgetCacheProps = {
+export interface MetaWidgetCacheProps {
   entityDefinition: string;
   metaWidgetId: string;
   metaWidgetName: string;
@@ -103,7 +103,7 @@ export type MetaWidgetCacheProps = {
   type: string;
   viewIndex: number;
   prevViewIndex?: number;
-};
+}
 
 type LevelDataMetaWidgetCacheProps = Omit<
   MetaWidgetCacheProps,
@@ -114,9 +114,9 @@ export type MetaWidgetRowCache = Record<string, MetaWidgetCacheProps>;
 
 type LevelDataRowCache = Record<string, LevelDataMetaWidgetCacheProps>;
 
-export type MetaWidgetCache = {
+export interface MetaWidgetCache {
   [key: string]: MetaWidgetRowCache | undefined;
-};
+}
 
 type ExtendedCanvasWidgetStructure = CanvasWidgetStructure & {
   canExtend?: boolean;
@@ -124,12 +124,12 @@ type ExtendedCanvasWidgetStructure = CanvasWidgetStructure & {
   isListWidgetCanvas?: boolean;
 };
 
-type RenderChildrenOption = {
+interface RenderChildrenOption {
   componentWidth: number;
   parentColumnSpace: number;
   selectedItemKey?: string | null;
   startIndex: number;
-};
+}
 
 const LIST_WIDGET_PAGINATION_HEIGHT = 36;
 const EMPTY_BINDING = "{{{}}}";
diff --git a/app/client/src/widgets/ListWidgetV2/widget/propertyConfig.ts b/app/client/src/widgets/ListWidgetV2/widget/propertyConfig.ts
index 6778480489..4b921b3d76 100644
--- a/app/client/src/widgets/ListWidgetV2/widget/propertyConfig.ts
+++ b/app/client/src/widgets/ListWidgetV2/widget/propertyConfig.ts
@@ -30,7 +30,7 @@ export const primaryColumnValidation = (
   props: ListWidgetProps,
   _: any,
 ) => {
-  const { listData = [], dynamicPropertyPathList = [] } = props;
+  const { dynamicPropertyPathList = [], listData = [] } = props;
   const isArray = Array.isArray(inputValue);
   const isJSModeEnabled = Boolean(
     dynamicPropertyPathList.find((d) => d.key === "primaryKeys"),
diff --git a/app/client/src/widgets/MapChartWidget/CustomMapConstants.ts b/app/client/src/widgets/MapChartWidget/CustomMapConstants.ts
index f2238884b1..2aff9c843f 100644
--- a/app/client/src/widgets/MapChartWidget/CustomMapConstants.ts
+++ b/app/client/src/widgets/MapChartWidget/CustomMapConstants.ts
@@ -1,6 +1,8 @@
 export const CUSTOM_MAP_PLUGINS: Record<string, any> = {
   world: require(`fusionmaps/maps/fusioncharts.world.js`),
-  worldwithantarctica: require(`fusionmaps/maps/fusioncharts.worldwithantarctica.js`),
+  worldwithantarctica: require(
+    `fusionmaps/maps/fusioncharts.worldwithantarctica.js`,
+  ),
   europe: require(`fusionmaps/maps/fusioncharts.europe.js`),
   northamerica: require(`fusionmaps/maps/fusioncharts.northamerica.js`),
   southamerica: require(`fusionmaps/maps/fusioncharts.southamerica.js`),
diff --git a/app/client/src/widgets/MapWidget/component/Map.tsx b/app/client/src/widgets/MapWidget/component/Map.tsx
index 8860cac152..1b0da59cd7 100644
--- a/app/client/src/widgets/MapWidget/component/Map.tsx
+++ b/app/client/src/widgets/MapWidget/component/Map.tsx
@@ -128,9 +128,9 @@ const Map = (props: MapProps) => {
       />
       {map && (
         <MarkersOrCluster
-          key={`markers-${allowClustering ? "cluster" : "markers"}-${
-            markers?.length
-          }`}
+          key={`markers-${
+            allowClustering ? "cluster" : "markers"
+          }-${markers?.length}`}
           map={map}
           markers={markers}
           selectMarker={selectMarker}
diff --git a/app/client/src/widgets/MapWidget/component/SearchBox.tsx b/app/client/src/widgets/MapWidget/component/SearchBox.tsx
index b830b427da..41fce2814a 100644
--- a/app/client/src/widgets/MapWidget/component/SearchBox.tsx
+++ b/app/client/src/widgets/MapWidget/component/SearchBox.tsx
@@ -3,12 +3,12 @@ import React, { useRef, useEffect } from "react";
 
 type Places = google.maps.places.PlaceResult[] | undefined;
 
-type SearchBoxProps = {
+interface SearchBoxProps {
   isEnabled: boolean;
   map?: google.maps.Map;
   placeholder?: string;
   updateCenter: (lat: number, long: number) => void;
-};
+}
 
 const StyledInput = styled.input`
   position: absolute;
diff --git a/app/client/src/widgets/MapWidget/widget/index.tsx b/app/client/src/widgets/MapWidget/widget/index.tsx
index 57c799a1de..424e52740e 100644
--- a/app/client/src/widgets/MapWidget/widget/index.tsx
+++ b/app/client/src/widgets/MapWidget/widget/index.tsx
@@ -52,11 +52,11 @@ const DisabledContainer = styled.div<{
 
 const DefaultCenter = { ...DEFAULT_CENTER, long: DEFAULT_CENTER.lng };
 
-type Center = {
+interface Center {
   lat: number;
   long: number;
   [x: string]: any;
-};
+}
 
 class MapWidget extends BaseWidget<MapWidgetProps, WidgetState> {
   static defaultProps = {};
diff --git a/app/client/src/widgets/MenuButtonWidget/component/index.tsx b/app/client/src/widgets/MenuButtonWidget/component/index.tsx
index 2181b515dc..223f02179b 100644
--- a/app/client/src/widgets/MenuButtonWidget/component/index.tsx
+++ b/app/client/src/widgets/MenuButtonWidget/component/index.tsx
@@ -42,8 +42,8 @@ const PopoverStyles = createGlobalStyle<{
   borderRadius: string;
 }>`
   .menu-button-popover, .${BlueprintClasses.MINIMAL}.menu-button-popover.${
-  Classes.POPOVER2
-} {
+    Classes.POPOVER2
+  } {
     background: none;
     box-shadow: 0 6px 20px 0px rgba(0, 0, 0, 0.15) !important;
     margin-top: 8px !important;
diff --git a/app/client/src/widgets/MetaHOC.tsx b/app/client/src/widgets/MetaHOC.tsx
index 01a900bfe5..d888e4c01d 100644
--- a/app/client/src/widgets/MetaHOC.tsx
+++ b/app/client/src/widgets/MetaHOC.tsx
@@ -40,7 +40,9 @@ export interface WithMeta {
   ) => void;
 }
 
-type WidgetMetaProps = { metaState: Record<string, unknown> };
+interface WidgetMetaProps {
+  metaState: Record<string, unknown>;
+}
 type metaHOCProps = WidgetProps & WidgetMetaProps;
 
 function withMeta(WrappedWidget: typeof BaseWidget) {
diff --git a/app/client/src/widgets/ModalWidget/component/index.tsx b/app/client/src/widgets/ModalWidget/component/index.tsx
index 69420cf3a0..38e766c3ff 100644
--- a/app/client/src/widgets/ModalWidget/component/index.tsx
+++ b/app/client/src/widgets/ModalWidget/component/index.tsx
@@ -37,7 +37,7 @@ const Wrapper = styled.div<{
   border-radius: ${({ $borderRadius }) => $borderRadius};
 `;
 
-export type ModalComponentProps = {
+export interface ModalComponentProps {
   isOpen: boolean;
   onClose: (e: any) => void;
   onModalClose?: () => void;
@@ -55,7 +55,7 @@ export type ModalComponentProps = {
   positioning?: Positioning;
   spacing?: Spacing;
   alignment?: Alignment;
-};
+}
 
 /* eslint-disable react/display-name */
 export default function ModalComponent(props: ModalComponentProps) {
diff --git a/app/client/src/widgets/MultiSelectWidget/component/index.tsx b/app/client/src/widgets/MultiSelectWidget/component/index.tsx
index c4dc8df9f0..37e94b277b 100644
--- a/app/client/src/widgets/MultiSelectWidget/component/index.tsx
+++ b/app/client/src/widgets/MultiSelectWidget/component/index.tsx
@@ -149,10 +149,12 @@ function MultiSelectComponent({
   // input is always a string.
   const filterOption = useCallback(
     (input, option) =>
-      String(option?.props.label).toLowerCase().indexOf(input.toLowerCase()) >=
-        0 ||
-      String(option?.props.value).toLowerCase().indexOf(input.toLowerCase()) >=
-        0,
+      String(option?.props.label)
+        .toLowerCase()
+        .indexOf(input.toLowerCase()) >= 0 ||
+      String(option?.props.value)
+        .toLowerCase()
+        .indexOf(input.toLowerCase()) >= 0,
     [],
   );
 
diff --git a/app/client/src/widgets/NumberSliderWidget/use-move.ts b/app/client/src/widgets/NumberSliderWidget/use-move.ts
index a8072c763d..a6780dab43 100644
--- a/app/client/src/widgets/NumberSliderWidget/use-move.ts
+++ b/app/client/src/widgets/NumberSliderWidget/use-move.ts
@@ -1,10 +1,10 @@
 import { useEffect, useRef, useState } from "react";
 import { clamp } from "./utils";
 
-type MousePosition = {
+interface MousePosition {
   x: number;
   y: number;
-};
+}
 
 type Direction = "ltr" | "rtl";
 
diff --git a/app/client/src/widgets/NumberSliderWidget/utils.ts b/app/client/src/widgets/NumberSliderWidget/utils.ts
index c8340f7906..2806886e63 100644
--- a/app/client/src/widgets/NumberSliderWidget/utils.ts
+++ b/app/client/src/widgets/NumberSliderWidget/utils.ts
@@ -1,11 +1,11 @@
 import { Colors } from "constants/Colors";
 import { darkenColor } from "widgets/WidgetUtils";
 
-type Position = {
+interface Position {
   value: number;
   min: number;
   max: number;
-};
+}
 
 /**
  *
@@ -16,7 +16,7 @@ export function getPosition({ max, min, value }: Position) {
   return Math.min(Math.max(position, 0), 100);
 }
 
-type ChangeValue = {
+interface ChangeValue {
   value: number;
   min: number;
   max: number;
@@ -26,7 +26,7 @@ type ChangeValue = {
    * container width is passed in case of RangeSlider
    */
   containerWidth?: number;
-};
+}
 
 export function getChangeValue({
   containerWidth,
@@ -59,11 +59,11 @@ export function clamp(value: number, min: number, max: number) {
   return Math.min(Math.max(value, min), max);
 }
 
-type MarkedFilled = {
+interface MarkedFilled {
   mark: { value: number; label?: any };
   offset?: number;
   value: number;
-};
+}
 
 export function isMarkedFilled({ mark, offset, value }: MarkedFilled) {
   return typeof offset === "number"
diff --git a/app/client/src/widgets/PhoneInputWidget/component/ISDCodeDropdown.tsx b/app/client/src/widgets/PhoneInputWidget/component/ISDCodeDropdown.tsx
index bf8dd38d17..f01ace763e 100644
--- a/app/client/src/widgets/PhoneInputWidget/component/ISDCodeDropdown.tsx
+++ b/app/client/src/widgets/PhoneInputWidget/component/ISDCodeDropdown.tsx
@@ -10,10 +10,10 @@ import { Classes } from "@blueprintjs/core";
 import { lightenColor } from "widgets/WidgetUtils";
 import { CANVAS_ART_BOARD } from "constants/componentClassNameConstants";
 
-type DropdownTriggerIconWrapperProp = {
+interface DropdownTriggerIconWrapperProp {
   allowDialCodeChange: boolean;
   disabled?: boolean;
-};
+}
 
 const DropdownTriggerIconWrapper = styled.button<DropdownTriggerIconWrapperProp>`
   height: 100%;
@@ -124,8 +124,8 @@ export const PopoverStyles = createGlobalStyle<{
     }
 
     .${props.portalClassName}  .${Classes.INPUT}:focus, .${
-    props.portalClassName
-  }  .${Classes.INPUT}:active {
+      props.portalClassName
+    }  .${Classes.INPUT}:active {
       box-shadow: 0px 0px 0px 2px ${lightenColor(props.accentColor)} !important;
       border: 1px solid ${props.accentColor} !important;
     }
diff --git a/app/client/src/widgets/QRGeneratorWidget/component/index.tsx b/app/client/src/widgets/QRGeneratorWidget/component/index.tsx
index 5db43f745e..7ea5cdf3af 100644
--- a/app/client/src/widgets/QRGeneratorWidget/component/index.tsx
+++ b/app/client/src/widgets/QRGeneratorWidget/component/index.tsx
@@ -27,10 +27,10 @@ export interface TextComponentProps extends ComponentProps {
   overflow: OverflowTypes;
 }
 
-type State = {
+interface State {
   isTruncated: boolean;
   showModal: boolean;
-};
+}
 
 type TextRef = React.Ref<Text> | undefined;
 
diff --git a/app/client/src/widgets/SwitchWidget/component/index.tsx b/app/client/src/widgets/SwitchWidget/component/index.tsx
index ff738bf7d8..3b515c9031 100644
--- a/app/client/src/widgets/SwitchWidget/component/index.tsx
+++ b/app/client/src/widgets/SwitchWidget/component/index.tsx
@@ -112,6 +112,7 @@ function SwitchComponent({
   inputRef,
   isDisabled,
   isDynamicHeightEnabled,
+  isLabelInline,
   isLoading,
   isSwitchedOn,
   label,
@@ -119,9 +120,8 @@ function SwitchComponent({
   labelStyle,
   labelTextColor,
   labelTextSize,
-  onChange,
   minHeight,
-  isLabelInline,
+  onChange,
 }: SwitchComponentProps): JSX.Element {
   const switchAlignClass =
     labelPosition === LabelPosition.Right ? "left" : "right";
diff --git a/app/client/src/widgets/TableWidget/component/CascadeFields.tsx b/app/client/src/widgets/TableWidget/component/CascadeFields.tsx
index 4c824c0f77..f454dfdb8a 100644
--- a/app/client/src/widgets/TableWidget/component/CascadeFields.tsx
+++ b/app/client/src/widgets/TableWidget/component/CascadeFields.tsx
@@ -262,7 +262,7 @@ function RenderInput(props: {
   );
 }
 
-type CascadeFieldProps = {
+interface CascadeFieldProps {
   columns: DropdownOption[];
   column: string;
   condition: Condition;
@@ -274,9 +274,9 @@ type CascadeFieldProps = {
   removeFilter: (index: number) => void;
   accentColor: string;
   borderRadius: string;
-};
+}
 
-type CascadeFieldState = {
+interface CascadeFieldState {
   column: string;
   condition: Condition;
   value: any;
@@ -287,7 +287,7 @@ type CascadeFieldState = {
   showDateInput: boolean;
   isDeleted: boolean;
   isUpdate: boolean;
-};
+}
 
 const getConditions = (props: CascadeFieldProps) => {
   const columnValue = props.column || "";
diff --git a/app/client/src/widgets/TableWidget/component/Constants.ts b/app/client/src/widgets/TableWidget/component/Constants.ts
index 56d199f2af..0531a9d335 100644
--- a/app/client/src/widgets/TableWidget/component/Constants.ts
+++ b/app/client/src/widgets/TableWidget/component/Constants.ts
@@ -8,12 +8,12 @@ import type {
   ButtonVariant,
 } from "components/constants";
 
-export type TableSizes = {
+export interface TableSizes {
   COLUMN_HEADER_HEIGHT: number;
   TABLE_HEADER_HEIGHT: number;
   ROW_HEIGHT: number;
   ROW_FONT_SIZE: number;
-};
+}
 
 export enum CompactModeTypes {
   SHORT = "SHORT",
diff --git a/app/client/src/widgets/TableWidget/component/TableDataDownload.tsx b/app/client/src/widgets/TableWidget/component/TableDataDownload.tsx
index ef60e76aea..d492092523 100644
--- a/app/client/src/widgets/TableWidget/component/TableDataDownload.tsx
+++ b/app/client/src/widgets/TableWidget/component/TableDataDownload.tsx
@@ -62,10 +62,10 @@ interface TableDataDownloadProps {
 
 type FileDownloadType = "CSV" | "EXCEL";
 
-type DataCellProps = {
+interface DataCellProps {
   value: string | number;
   type: "string" | "number";
-};
+}
 
 interface DownloadOptionProps {
   label: string;
diff --git a/app/client/src/widgets/TableWidget/widget/index.tsx b/app/client/src/widgets/TableWidget/widget/index.tsx
index 9852e5becf..3143147bed 100644
--- a/app/client/src/widgets/TableWidget/widget/index.tsx
+++ b/app/client/src/widgets/TableWidget/widget/index.tsx
@@ -802,13 +802,13 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
     | Record<string, ColumnProperties>
     | undefined => {
     const {
-      sanitizedTableData = [],
-      primaryColumns = {},
       columnNameMap = {},
       columnTypeMap = {},
       derivedColumns = {},
       hiddenColumns = [],
       migrated,
+      primaryColumns = {},
+      sanitizedTableData = [],
     } = this.props;
     // Bail out if the data doesn't exist.
     // This is a temporary measure,
@@ -885,7 +885,7 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
   updateColumnProperties = (
     tableColumns?: Record<string, ColumnProperties>,
   ) => {
-    const { primaryColumns = {}, derivedColumns = {} } = this.props;
+    const { derivedColumns = {}, primaryColumns = {} } = this.props;
     const { columnOrder, migrated } = this.props;
     if (tableColumns) {
       const previousColumnIds = Object.keys(primaryColumns);
@@ -1148,14 +1148,14 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
 
   getWidgetView() {
     const {
-      totalRecordsCount,
       delimiter,
-      pageSize,
       filteredTableData = [],
       isVisibleDownload,
       isVisibleFilters,
       isVisiblePagination,
       isVisibleSearch,
+      pageSize,
+      totalRecordsCount,
     } = this.props;
     const tableColumns = this.getTableColumns() || [];
     const transformedData = this.transformData(filteredTableData, tableColumns);
diff --git a/app/client/src/widgets/TableWidget/widget/propertyUtils.ts b/app/client/src/widgets/TableWidget/widget/propertyUtils.ts
index faca55fe68..78384c0e35 100644
--- a/app/client/src/widgets/TableWidget/widget/propertyUtils.ts
+++ b/app/client/src/widgets/TableWidget/widget/propertyUtils.ts
@@ -168,7 +168,7 @@ export const updateColumnStyles = (
   propertyPath: string,
   propertyValue: any,
 ): Array<{ propertyPath: string; propertyValue: any }> | undefined => {
-  const { primaryColumns, derivedColumns = {} } = props;
+  const { derivedColumns = {}, primaryColumns } = props;
   const propertiesToUpdate: Array<{
     propertyPath: string;
     propertyValue: any;
diff --git a/app/client/src/widgets/TableWidgetV2/component/Constants.ts b/app/client/src/widgets/TableWidgetV2/component/Constants.ts
index 890db2ad18..96f6337d4d 100644
--- a/app/client/src/widgets/TableWidgetV2/component/Constants.ts
+++ b/app/client/src/widgets/TableWidgetV2/component/Constants.ts
@@ -18,7 +18,7 @@ import type { ColumnTypes } from "../constants";
 import type { TimePrecision } from "widgets/DatePickerWidget2/constants";
 import { generateReactKey } from "widgets/WidgetUtils";
 
-export type TableSizes = {
+export interface TableSizes {
   COLUMN_HEADER_HEIGHT: number;
   TABLE_HEADER_HEIGHT: number;
   ROW_HEIGHT: number;
@@ -27,7 +27,7 @@ export type TableSizes = {
   EDIT_ICON_TOP: number;
   ROW_VIRTUAL_OFFSET: number;
   VERTICAL_EDITOR_PADDING: number;
-};
+}
 
 export enum CompactModeTypes {
   SHORT = "SHORT",
@@ -472,7 +472,7 @@ export enum IMAGE_VERTICAL_ALIGN {
   BOTTOM = "flex-end",
 }
 
-export type BaseCellComponentProps = {
+export interface BaseCellComponentProps {
   compactMode: string;
   isHidden: boolean;
   allowCellWrapping?: boolean;
@@ -484,7 +484,7 @@ export type BaseCellComponentProps = {
   textColor?: string;
   textSize?: string;
   isCellDisabled?: boolean;
-};
+}
 
 export enum CheckboxState {
   UNCHECKED = 0,
diff --git a/app/client/src/widgets/TableWidgetV2/component/Table.tsx b/app/client/src/widgets/TableWidgetV2/component/Table.tsx
index 2beb66f032..1dc3994eb0 100644
--- a/app/client/src/widgets/TableWidgetV2/component/Table.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/Table.tsx
@@ -138,7 +138,7 @@ const defaultColumn = {
   width: 150,
 };
 
-export type HeaderComponentProps = {
+export interface HeaderComponentProps {
   enableDrag: () => void;
   disableDrag: () => void;
   multiRowSelection?: boolean;
@@ -163,7 +163,7 @@ export type HeaderComponentProps = {
   headerWidth?: number;
   rowSelectionState: 0 | 1 | 2 | null;
   widgetId: string;
-};
+}
 
 const emptyArr: any = [];
 
diff --git a/app/client/src/widgets/TableWidgetV2/component/TableBody/Row.tsx b/app/client/src/widgets/TableWidgetV2/component/TableBody/Row.tsx
index 117e11be41..fd2a87dce9 100644
--- a/app/client/src/widgets/TableWidgetV2/component/TableBody/Row.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/TableBody/Row.tsx
@@ -7,12 +7,12 @@ import { renderEmptyRows } from "../cellComponents/EmptyCell";
 import { renderBodyCheckBoxCell } from "../cellComponents/SelectionCheckboxCell";
 import { MULTISELECT_CHECKBOX_WIDTH, StickyType } from "../Constants";
 
-type RowType = {
+interface RowType {
   className?: string;
   index: number;
   row: ReactTableRowType<Record<string, unknown>>;
   style?: ListChildComponentProps["style"];
-};
+}
 
 export function Row(props: RowType) {
   const {
diff --git a/app/client/src/widgets/TableWidgetV2/component/TableBody/index.tsx b/app/client/src/widgets/TableWidgetV2/component/TableBody/index.tsx
index 5b3990c821..e887f55f77 100644
--- a/app/client/src/widgets/TableWidgetV2/component/TableBody/index.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/TableBody/index.tsx
@@ -69,7 +69,7 @@ const rowRenderer = React.memo((rowProps: ListChildComponentProps) => {
   }
 }, areEqual);
 
-type BodyPropsType = {
+interface BodyPropsType {
   getTableBodyProps(
     propGetter?: TableBodyPropGetter<Record<string, unknown>> | undefined,
   ): TableBodyProps;
@@ -79,7 +79,7 @@ type BodyPropsType = {
   width?: number;
   tableSizes: TableSizes;
   innerElementType?: ReactElementType;
-};
+}
 
 const TableVirtualBodyComponent = React.forwardRef(
   (props: BodyPropsType, ref: Ref<SimpleBar>) => {
diff --git a/app/client/src/widgets/TableWidgetV2/component/cellComponents/Button.tsx b/app/client/src/widgets/TableWidgetV2/component/cellComponents/Button.tsx
index e0a0e73802..8b8667ffb9 100644
--- a/app/client/src/widgets/TableWidgetV2/component/cellComponents/Button.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/cellComponents/Button.tsx
@@ -18,14 +18,14 @@ const StyledButton = styled(BaseButton)<{
     compactMode === "SHORT" ? "24px" : "28px"};
 `;
 
-type ButtonProps = {
+interface ButtonProps {
   isCellVisible: boolean;
   isSelected: boolean;
   isDisabled?: boolean;
   action: ButtonColumnActions;
   compactMode?: string;
   onCommandClick: (dynamicTrigger: string, onComplete: () => void) => void;
-};
+}
 
 export function Button(props: ButtonProps) {
   const [loading, setLoading] = useState(false);
diff --git a/app/client/src/widgets/TableWidgetV2/component/cellComponents/DateCell.tsx b/app/client/src/widgets/TableWidgetV2/component/cellComponents/DateCell.tsx
index e42e5b9779..9379eb1729 100644
--- a/app/client/src/widgets/TableWidgetV2/component/cellComponents/DateCell.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/cellComponents/DateCell.tsx
@@ -55,11 +55,11 @@ const COMPONENT_DEFAULT_VALUES = {
   timePrecision: TimePrecision.MINUTE,
 };
 
-type editPropertyType = {
+interface editPropertyType {
   alias: string;
   onDateSelectedString: string;
   rowIndex: number;
-};
+}
 
 const DEFAULT_BORDER_RADIUS = "0";
 
diff --git a/app/client/src/widgets/TableWidgetV2/component/cellComponents/HeaderCell.tsx b/app/client/src/widgets/TableWidgetV2/component/cellComponents/HeaderCell.tsx
index 8cc7db2337..136e307ad3 100644
--- a/app/client/src/widgets/TableWidgetV2/component/cellComponents/HeaderCell.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/cellComponents/HeaderCell.tsx
@@ -85,11 +85,11 @@ const TitleWrapper = styled.div`
   }
 `;
 
-type TitleProps = {
+interface TitleProps {
   children: React.ReactNode;
   tableWidth?: number;
   width?: number;
-};
+}
 
 function Title(props: TitleProps) {
   const ref = createRef<HTMLDivElement>();
@@ -127,7 +127,7 @@ function Title(props: TitleProps) {
 
 const ICON_SIZE = 16;
 
-type HeaderProps = {
+interface HeaderProps {
   canFreezeColumn?: boolean;
   columnName: string;
   columnIndex: number;
@@ -158,7 +158,7 @@ type HeaderProps = {
     e: React.DragEvent<HTMLDivElement>,
     destinationIndex: number,
   ) => void;
-};
+}
 
 const HeaderCellComponent = (props: HeaderProps) => {
   const { column, editMode, isSortable } = props;
diff --git a/app/client/src/widgets/TableWidgetV2/component/cellComponents/ImageCell.tsx b/app/client/src/widgets/TableWidgetV2/component/cellComponents/ImageCell.tsx
index a6167d9d2a..66ce26513a 100644
--- a/app/client/src/widgets/TableWidgetV2/component/cellComponents/ImageCell.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/cellComponents/ImageCell.tsx
@@ -31,20 +31,20 @@ type renderImageType = BaseCellComponentProps & {
 
 export function ImageCell(props: renderImageType) {
   const {
-    compactMode,
-    value,
-    isHidden,
-    isCellVisible,
-    onClick = noop,
     allowCellWrapping,
-    horizontalAlignment,
-    verticalAlignment,
     cellBackground,
+    compactMode,
     fontStyle,
-    textColor,
-    textSize,
+    horizontalAlignment,
     imageSize,
     isCellDisabled,
+    isCellVisible,
+    isHidden,
+    onClick = noop,
+    textColor,
+    textSize,
+    value,
+    verticalAlignment,
   } = props;
 
   if (!value) {
diff --git a/app/client/src/widgets/TableWidgetV2/component/cellComponents/InlineCellEditor.tsx b/app/client/src/widgets/TableWidgetV2/component/cellComponents/InlineCellEditor.tsx
index 6626299bf4..cca2c292d7 100644
--- a/app/client/src/widgets/TableWidgetV2/component/cellComponents/InlineCellEditor.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/cellComponents/InlineCellEditor.tsx
@@ -99,7 +99,7 @@ const Wrapper = styled.div<{
   }
 `;
 
-type InlineEditorPropsType = {
+interface InlineEditorPropsType {
   accentColor: string;
   compactMode: string;
   inputType: InputTypes.TEXT | InputTypes.NUMBER;
@@ -116,10 +116,11 @@ type InlineEditorPropsType = {
   widgetId: string;
   paddedInput: boolean;
   autoFocus: boolean;
-};
+}
 
 export function InlineCellEditor({
   accentColor,
+  allowCellWrapping,
   autoFocus,
   compactMode,
   inputType = InputTypes.TEXT,
@@ -129,10 +130,9 @@ export function InlineCellEditor({
   onDiscard,
   onSave,
   textSize,
-  value,
-  allowCellWrapping,
-  verticalAlignment,
   validationErrorMessage,
+  value,
+  verticalAlignment,
   widgetId,
 }: InlineEditorPropsType) {
   const inputRef = useRef<HTMLTextAreaElement | HTMLInputElement>(null);
diff --git a/app/client/src/widgets/TableWidgetV2/component/cellComponents/PlainTextCell.tsx b/app/client/src/widgets/TableWidgetV2/component/cellComponents/PlainTextCell.tsx
index a75061c0ee..94d7e9a398 100644
--- a/app/client/src/widgets/TableWidgetV2/component/cellComponents/PlainTextCell.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/cellComponents/PlainTextCell.tsx
@@ -58,11 +58,11 @@ export type RenderDefaultPropsType = BaseCellComponentProps & {
   isNewRow: boolean;
 };
 
-type editPropertyType = {
+interface editPropertyType {
   alias: string;
   onSubmitString: string;
   rowIndex: number;
-};
+}
 
 export function getCellText(
   value: unknown,
diff --git a/app/client/src/widgets/TableWidgetV2/component/header/TableColumnHeader.tsx b/app/client/src/widgets/TableWidgetV2/component/header/TableColumnHeader.tsx
index bfd35a8366..c3e051bdd5 100644
--- a/app/client/src/widgets/TableWidgetV2/component/header/TableColumnHeader.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/header/TableColumnHeader.tsx
@@ -8,7 +8,7 @@ import { renderHeaderCheckBoxCell } from "../cellComponents/SelectionCheckboxCel
 import { renderEmptyRows } from "../cellComponents/EmptyCell";
 import styled from "styled-components";
 
-export type TableColumnHeaderProps = {
+export interface TableColumnHeaderProps {
   enableDrag: () => void;
   disableDrag: () => void;
   multiRowSelection?: boolean;
@@ -32,7 +32,7 @@ export type TableColumnHeaderProps = {
   headerWidth?: number;
   rowSelectionState: 0 | 1 | 2 | null;
   widgetId: string;
-};
+}
 
 const StyledHeaderGroup = styled.div<{
   headerWidth: number;
diff --git a/app/client/src/widgets/TableWidgetV2/component/header/actions/Download.tsx b/app/client/src/widgets/TableWidgetV2/component/header/actions/Download.tsx
index 33fd7fa8ca..c44111cdb4 100644
--- a/app/client/src/widgets/TableWidgetV2/component/header/actions/Download.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/header/actions/Download.tsx
@@ -75,10 +75,10 @@ interface TableDataDownloadProps {
 
 type FileDownloadType = "CSV" | "EXCEL";
 
-type DataCellProps = {
+interface DataCellProps {
   value: string | number;
   type: "string" | "number";
-};
+}
 
 interface DownloadOptionProps {
   label: string;
diff --git a/app/client/src/widgets/TableWidgetV2/component/header/actions/filter/CascadeFields.tsx b/app/client/src/widgets/TableWidgetV2/component/header/actions/filter/CascadeFields.tsx
index 6a9b012ac4..a14bd1a70a 100644
--- a/app/client/src/widgets/TableWidgetV2/component/header/actions/filter/CascadeFields.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/header/actions/filter/CascadeFields.tsx
@@ -308,7 +308,7 @@ function RenderInput(props: {
   );
 }
 
-type CascadeFieldProps = {
+interface CascadeFieldProps {
   columns: DropdownOption[];
   column: string;
   condition: Condition;
@@ -325,9 +325,9 @@ type CascadeFieldProps = {
   removeFilter: (index: number) => void;
   accentColor: string;
   borderRadius: string;
-};
+}
 
-type CascadeFieldState = {
+interface CascadeFieldState {
   column: string;
   condition: Condition;
   value: any;
@@ -339,7 +339,7 @@ type CascadeFieldState = {
   isDeleted: boolean;
   isUpdate: boolean;
   isOperatorChange: boolean;
-};
+}
 
 const getConditions = (props: CascadeFieldProps) => {
   const columnValue = props.column || "";
diff --git a/app/client/src/widgets/TableWidgetV2/constants.ts b/app/client/src/widgets/TableWidgetV2/constants.ts
index 47386f5c5f..7510ec1293 100644
--- a/app/client/src/widgets/TableWidgetV2/constants.ts
+++ b/app/client/src/widgets/TableWidgetV2/constants.ts
@@ -13,14 +13,15 @@ import type { ColumnAction } from "components/propertyControls/ColumnActionSelec
 import type { Alignment } from "@blueprintjs/core";
 import type { IconName } from "@blueprintjs/icons";
 import type { ButtonVariant } from "components/constants";
+import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
 
-export type EditableCell = {
+export interface EditableCell {
   column: string;
   index: number;
   value: string | number | null;
   initialValue: string;
   inputValue: string;
-};
+}
 
 export enum PaginationDirection {
   INITIAL = "INITIAL",
@@ -180,12 +181,12 @@ export const DEFAULT_MENU_VARIANT = "PRIMARY";
 
 export const DEFAULT_MENU_BUTTON_LABEL = "Open menu";
 
-export type TransientDataPayload = {
+export interface TransientDataPayload {
   [key: string]: string | number | boolean;
   __originalIndex__: number;
-};
+}
 
-export type OnColumnEventArgs = {
+export interface OnColumnEventArgs {
   rowIndex: number;
   action: string;
   onComplete?: () => void;
@@ -193,7 +194,7 @@ export type OnColumnEventArgs = {
   eventType: EventType;
   row?: Record<string, unknown>;
   additionalData?: Record<string, unknown>;
-};
+}
 
 export const ICON_NAMES = Object.keys(IconNames).map(
   (name: string) => IconNames[name as keyof typeof IconNames],
@@ -225,3 +226,6 @@ export const defaultEditableCell = {
 };
 
 export const DEFAULT_COLUMN_NAME = "Table Column";
+
+export const ALLOW_TABLE_WIDGET_SERVER_SIDE_FILTERING =
+  FEATURE_FLAG["release_table_serverside_filtering_enabled"];
diff --git a/app/client/src/widgets/TableWidgetV2/widget/index.tsx b/app/client/src/widgets/TableWidgetV2/widget/index.tsx
index d1f95a9a99..c913b538fa 100644
--- a/app/client/src/widgets/TableWidgetV2/widget/index.tsx
+++ b/app/client/src/widgets/TableWidgetV2/widget/index.tsx
@@ -50,6 +50,7 @@ import type {
 } from "../constants";
 import {
   ActionColumnTypes,
+  ALLOW_TABLE_WIDGET_SERVER_SIDE_FILTERING,
   ColumnTypes,
   DEFAULT_BUTTON_LABEL,
   DEFAULT_COLUMN_WIDTH,
@@ -214,7 +215,11 @@ class TableWidgetV2 extends BaseWidget<TableWidgetProps, WidgetState> {
       delimiter: ",",
       version: 2,
       inlineEditingSaveOption: InlineEditingSaveOptions.ROW_LEVEL,
-      enableServerSideFiltering: false,
+      enableServerSideFiltering: TableWidgetV2.getFeatureFlag(
+        ALLOW_TABLE_WIDGET_SERVER_SIDE_FILTERING,
+      )
+        ? false
+        : undefined,
     };
   }
 
@@ -442,9 +447,12 @@ class TableWidgetV2 extends BaseWidget<TableWidgetProps, WidgetState> {
         isAddRowInProgress: "bool",
         previousPageVisited: generateTypeDef(widget.previousPageVisited),
         nextPageVisited: generateTypeDef(widget.nextPageButtonClicked),
-        filters: generateTypeDef(widget.filters),
       };
 
+      if (this.getFeatureFlag(ALLOW_TABLE_WIDGET_SERVER_SIDE_FILTERING)) {
+        config["filters"] = generateTypeDef(widget.filters);
+      }
+
       return config;
     };
   }
@@ -594,7 +602,7 @@ class TableWidgetV2 extends BaseWidget<TableWidgetProps, WidgetState> {
   createTablePrimaryColumns = ():
     | Record<string, ColumnProperties>
     | undefined => {
-    const { tableData = [], primaryColumns = {} } = this.props;
+    const { primaryColumns = {}, tableData = [] } = this.props;
 
     if (!_.isArray(tableData) || tableData.length === 0) {
       return;
@@ -1168,15 +1176,15 @@ class TableWidgetV2 extends BaseWidget<TableWidgetProps, WidgetState> {
 
   getWidgetView() {
     const {
-      totalRecordsCount,
       delimiter,
-      pageSize,
       filteredTableData = [],
       isVisibleDownload,
       isVisibleFilters,
       isVisiblePagination,
       isVisibleSearch,
+      pageSize,
       primaryColumns,
+      totalRecordsCount,
     } = this.props;
 
     const tableColumns = this.getTableColumns() || emptyArr;
@@ -1500,13 +1508,13 @@ class TableWidgetV2 extends BaseWidget<TableWidgetProps, WidgetState> {
    * This function just pushes the meta update
    */
   pushOnColumnEvent = ({
-    rowIndex,
     action,
-    onComplete = noop,
-    triggerPropertyName,
-    eventType,
-    row,
     additionalData = {},
+    eventType,
+    onComplete = noop,
+    row,
+    rowIndex,
+    triggerPropertyName,
   }: OnColumnEventArgs) => {
     const { filteredTableData = [], pushBatchMetaUpdates } = this.props;
 
@@ -1529,13 +1537,13 @@ class TableWidgetV2 extends BaseWidget<TableWidgetProps, WidgetState> {
    * Function to handle customColumn button type click interactions
    */
   onColumnEvent = ({
-    rowIndex,
     action,
-    onComplete = noop,
-    triggerPropertyName,
-    eventType,
-    row,
     additionalData = {},
+    eventType,
+    onComplete = noop,
+    row,
+    rowIndex,
+    triggerPropertyName,
   }: OnColumnEventArgs) => {
     if (action) {
       const { commitBatchMetaUpdates } = this.props;
@@ -1868,11 +1876,11 @@ class TableWidgetV2 extends BaseWidget<TableWidgetProps, WidgetState> {
 
     const isHidden = !column.isVisible;
     const {
+      compactMode = CompactModeTypes.DEFAULT,
       filteredTableData = [],
       multiRowSelection,
       selectedRowIndex,
       selectedRowIndices,
-      compactMode = CompactModeTypes.DEFAULT,
     } = this.props;
     let row;
     let originalIndex: number;
diff --git a/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/contentConfig.ts b/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/contentConfig.ts
index ffc5c1dd36..1f75fe5883 100644
--- a/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/contentConfig.ts
+++ b/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/contentConfig.ts
@@ -7,6 +7,7 @@ import { ValidationTypes } from "constants/WidgetValidation";
 import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
 import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
 import type { TableWidgetProps } from "widgets/TableWidgetV2/constants";
+import { ALLOW_TABLE_WIDGET_SERVER_SIDE_FILTERING } from "../../constants";
 import { InlineEditingSaveOptions } from "widgets/TableWidgetV2/constants";
 import { composePropertyUpdateHook } from "widgets/WidgetUtils";
 import {
@@ -19,6 +20,7 @@ import {
   updateInlineEditingSaveOptionHook,
 } from "../propertyUtils";
 import panelConfig from "./PanelConfig";
+import Widget from "../index";
 
 export default [
   {
@@ -240,6 +242,8 @@ export default [
         isBindProperty: false,
         isTriggerProperty: false,
         defaultValue: false,
+        hidden: () =>
+          !Widget.getFeatureFlag(ALLOW_TABLE_WIDGET_SERVER_SIDE_FILTERING),
       },
       {
         propertyName: "onTableFilterUpdate",
diff --git a/app/client/src/widgets/TabsWidget/component/PageTabs.tsx b/app/client/src/widgets/TabsWidget/component/PageTabs.tsx
index e6c7b257da..ff5e8138c8 100644
--- a/app/client/src/widgets/TabsWidget/component/PageTabs.tsx
+++ b/app/client/src/widgets/TabsWidget/component/PageTabs.tsx
@@ -151,7 +151,7 @@ function PageTabContainer({
   return <div ref={tabContainerRef}>{children}</div>;
 }
 
-type Props = {
+interface Props {
   tabs: Array<{
     id: string;
     label: string;
@@ -165,7 +165,7 @@ type Props = {
   selectedTabWidgetId: string;
   backgroundColor?: string;
   accentColor?: string;
-};
+}
 
 export function PageTabs(props: Props) {
   const { tabChange, tabs } = props;
diff --git a/app/client/src/widgets/TabsWidget/widget/index.tsx b/app/client/src/widgets/TabsWidget/widget/index.tsx
index 9fad19af62..9be8e3c5fb 100644
--- a/app/client/src/widgets/TabsWidget/widget/index.tsx
+++ b/app/client/src/widgets/TabsWidget/widget/index.tsx
@@ -597,8 +597,8 @@ class TabsWidget extends BaseWidget<
     let selectedTabWidgetId = this.props.selectedTabWidgetId;
     if (this.props.children) {
       selectedTabWidgetId =
-        this.props.children.find((tab) =>
-          this.props.selectedWidgetAncestry?.includes(tab.widgetId),
+        this.props.children.find(
+          (tab) => this.props.selectedWidgetAncestry?.includes(tab.widgetId),
         )?.widgetId ?? this.props.selectedTabWidgetId;
     }
     return selectedTabWidgetId;
diff --git a/app/client/src/widgets/TextWidget/component/index.tsx b/app/client/src/widgets/TextWidget/component/index.tsx
index c92308b33f..fe3d8bfc9b 100644
--- a/app/client/src/widgets/TextWidget/component/index.tsx
+++ b/app/client/src/widgets/TextWidget/component/index.tsx
@@ -225,10 +225,10 @@ export interface TextComponentProps extends ComponentProps {
   minHeight?: number;
 }
 
-type State = {
+interface State {
   isTruncated: boolean;
   showModal: boolean;
-};
+}
 
 type TextRef = React.Ref<Text> | undefined;
 
diff --git a/app/client/src/widgets/WidgetUtils.ts b/app/client/src/widgets/WidgetUtils.ts
index 8f60f05e20..01e5323a7b 100644
--- a/app/client/src/widgets/WidgetUtils.ts
+++ b/app/client/src/widgets/WidgetUtils.ts
@@ -39,9 +39,9 @@ import { WIDGET_COMPONENT_BOUNDARY_CLASS } from "constants/componentClassNameCon
 import punycode from "punycode";
 import type { FlattenedWidgetProps } from "reducers/entityReducers/canvasWidgetsReducer";
 
-type SanitizeOptions = {
+interface SanitizeOptions {
   existingKeys?: string[];
-};
+}
 
 const REACT_ELEMENT_PROPS = "__reactProps$";
 
@@ -394,8 +394,8 @@ export const PopoverStyles = createGlobalStyle<{
     }
 
     .${portalClassName} .${DTClasses.DATEPICKER_FOOTER} .${
-    Classes.BUTTON
-  }:hover {
+      Classes.BUTTON
+    }:hover {
       background-color: ${lightenColor(accentColor)};
     }
 
@@ -408,10 +408,10 @@ export const PopoverStyles = createGlobalStyle<{
     }
 
     .${portalClassName} .${DTClasses.DATEPICKER_YEAR_SELECT} select + .${
-    Classes.ICON
-  }, .${portalClassName} .${DTClasses.DATEPICKER_MONTH_SELECT} select + .${
-    Classes.ICON
-  } {
+      Classes.ICON
+    }, .${portalClassName} .${DTClasses.DATEPICKER_MONTH_SELECT} select + .${
+      Classes.ICON
+    } {
       color: var(--wds-color-icon) !important;
     }
 
@@ -424,8 +424,8 @@ export const PopoverStyles = createGlobalStyle<{
     }
 
     .${portalClassName} .${DTClasses.DATERANGEPICKER_SHORTCUTS} li a.${
-    Classes.ACTIVE
-  } {
+      Classes.ACTIVE
+    } {
       color: ${getComplementaryGrayscaleColor(accentColor)};
       background-color: ${accentColor};
     }
diff --git a/app/client/src/widgets/index.ts b/app/client/src/widgets/index.ts
index 37d42f992d..6543af7e26 100644
--- a/app/client/src/widgets/index.ts
+++ b/app/client/src/widgets/index.ts
@@ -57,8 +57,9 @@ import RangeSliderWidget from "./RangeSliderWidget";
 import CategorySliderWidget from "./CategorySliderWidget";
 import CodeScannerWidget from "./CodeScannerWidget";
 import ListWidgetV2 from "./ListWidgetV2";
-import { ButtonWidget as ButtonWidgetV2 } from "./ButtonWidgetV2";
-import { InputWidget as InputWidgetV3 } from "./InputWidgetV3";
+import { WDSButtonWidget } from "./wds/WDSButtonWidget";
+import { WDSInputWidget } from "./wds/WDSInputWidget";
+import { WDSCheckboxWidget } from "./wds/WDSCheckboxWidget";
 import type BaseWidget from "./BaseWidget";
 
 const Widgets = [
@@ -111,8 +112,9 @@ const Widgets = [
   CategorySliderWidget,
   CodeScannerWidget,
   ListWidgetV2,
-  ButtonWidgetV2,
-  InputWidgetV3,
+  WDSButtonWidget,
+  WDSInputWidget,
+  WDSCheckboxWidget,
 
   //Deprecated Widgets
   InputWidget,
diff --git a/app/client/src/widgets/useDropdown.tsx b/app/client/src/widgets/useDropdown.tsx
index 9a18ba3aec..9fc95e1d77 100644
--- a/app/client/src/widgets/useDropdown.tsx
+++ b/app/client/src/widgets/useDropdown.tsx
@@ -15,12 +15,12 @@ const BackDropContainer = styled.div`
   display: none;
 `;
 
-type useDropdownProps = {
+interface useDropdownProps {
   inputRef: React.RefObject<HTMLInputElement>;
   renderMode?: RenderMode;
   onDropdownOpen?: () => void;
   onDropdownClose?: () => void;
-};
+}
 const FOCUS_TIMEOUT = 500;
 
 // TODO: Refactor More functionalities in MultiSelect, MultiTreeSelect and TreeSelect Components
diff --git a/app/client/src/widgets/BaseInputWidgetV2/component/types.ts b/app/client/src/widgets/wds/WDSBaseInputWidget/component/types.ts
similarity index 100%
rename from app/client/src/widgets/BaseInputWidgetV2/component/types.ts
rename to app/client/src/widgets/wds/WDSBaseInputWidget/component/types.ts
diff --git a/app/client/src/widgets/BaseInputWidgetV2/icon.svg b/app/client/src/widgets/wds/WDSBaseInputWidget/icon.svg
similarity index 100%
rename from app/client/src/widgets/BaseInputWidgetV2/icon.svg
rename to app/client/src/widgets/wds/WDSBaseInputWidget/icon.svg
diff --git a/app/client/src/widgets/BaseInputWidgetV2/index.ts b/app/client/src/widgets/wds/WDSBaseInputWidget/index.ts
similarity index 61%
rename from app/client/src/widgets/BaseInputWidgetV2/index.ts
rename to app/client/src/widgets/wds/WDSBaseInputWidget/index.ts
index 911d41d428..f2620b0595 100644
--- a/app/client/src/widgets/BaseInputWidgetV2/index.ts
+++ b/app/client/src/widgets/wds/WDSBaseInputWidget/index.ts
@@ -1,5 +1,5 @@
-import { BaseInputWidget } from "./widget";
+import { WDSBaseInputWidget } from "./widget";
 
-export { BaseInputWidget };
+export { WDSBaseInputWidget };
 export type { BaseInputWidgetProps } from "./widget/types";
 export type { BaseInputComponentProps } from "./component/types";
diff --git a/app/client/src/widgets/BaseInputWidgetV2/widget/contentConfig.ts b/app/client/src/widgets/wds/WDSBaseInputWidget/widget/contentConfig.ts
similarity index 100%
rename from app/client/src/widgets/BaseInputWidgetV2/widget/contentConfig.ts
rename to app/client/src/widgets/wds/WDSBaseInputWidget/widget/contentConfig.ts
diff --git a/app/client/src/widgets/BaseInputWidgetV2/widget/index.tsx b/app/client/src/widgets/wds/WDSBaseInputWidget/widget/index.tsx
similarity index 98%
rename from app/client/src/widgets/BaseInputWidgetV2/widget/index.tsx
rename to app/client/src/widgets/wds/WDSBaseInputWidget/widget/index.tsx
index be03d244df..486ff0618a 100644
--- a/app/client/src/widgets/BaseInputWidgetV2/widget/index.tsx
+++ b/app/client/src/widgets/wds/WDSBaseInputWidget/widget/index.tsx
@@ -12,7 +12,7 @@ import { FILL_WIDGET_MIN_WIDTH } from "constants/minWidthConstants";
 import { ResponsiveBehavior } from "layoutSystems/common/utils/constants";
 import type { WidgetBaseConfiguration } from "WidgetProvider/constants";
 
-class BaseInputWidget<
+class WDSBaseInputWidget<
   T extends BaseInputWidgetProps,
   K extends WidgetState,
 > extends BaseWidget<T, K> {
@@ -146,8 +146,8 @@ class BaseInputWidget<
   }
 
   static getWidgetType(): WidgetType {
-    return "BASE_INPUT_WIDGET_V2";
+    return "WDS_BASE_INPUT_WIDGET";
   }
 }
 
-export { BaseInputWidget };
+export { WDSBaseInputWidget };
diff --git a/app/client/src/widgets/BaseInputWidgetV2/widget/types.ts b/app/client/src/widgets/wds/WDSBaseInputWidget/widget/types.ts
similarity index 100%
rename from app/client/src/widgets/BaseInputWidgetV2/widget/types.ts
rename to app/client/src/widgets/wds/WDSBaseInputWidget/widget/types.ts
diff --git a/app/client/src/widgets/ButtonWidgetV2/component/Container.tsx b/app/client/src/widgets/wds/WDSButtonWidget/component/Container.tsx
similarity index 70%
rename from app/client/src/widgets/ButtonWidgetV2/component/Container.tsx
rename to app/client/src/widgets/wds/WDSButtonWidget/component/Container.tsx
index a09eb4e7dc..047c6daafb 100644
--- a/app/client/src/widgets/ButtonWidgetV2/component/Container.tsx
+++ b/app/client/src/widgets/wds/WDSButtonWidget/component/Container.tsx
@@ -7,30 +7,29 @@ const StyledContainer = styled.div<ContainerProps>`
   height: 100%;
   position: relative;
 
-  ${({ maxWidth, minHeight, minWidth }) =>
-    css`
-      & [data-button] {
-        display: flex;
-        width: auto;
-        ${minWidth ? `min-width: ${minWidth}px;` : ""}
-        ${minHeight ? `min-height: ${minHeight}px;` : ""}
+  ${({ maxWidth, minHeight, minWidth }) => css`
+    & [data-button] {
+      display: flex;
+      width: auto;
+      ${minWidth ? `min-width: ${minWidth}px;` : ""}
+      ${minHeight ? `min-height: ${minHeight}px;` : ""}
         ${maxWidth ? `max-width: ${maxWidth}px;` : ""}
-      }
-    `}
+    }
+  `}
 
   .grecaptcha-badge {
     visibility: hidden;
   }
 `;
 
-type ContainerProps = {
+interface ContainerProps {
   children?: React.ReactNode;
   renderMode?: RenderMode;
   showInAllModes?: boolean;
   minWidth?: number;
   maxWidth?: number;
   minHeight?: number;
-};
+}
 
 export function Container(props: ContainerProps) {
   const { children, ...rest } = props;
diff --git a/app/client/src/widgets/ButtonWidgetV2/component/RecaptchaV2.tsx b/app/client/src/widgets/wds/WDSButtonWidget/component/RecaptchaV2.tsx
similarity index 100%
rename from app/client/src/widgets/ButtonWidgetV2/component/RecaptchaV2.tsx
rename to app/client/src/widgets/wds/WDSButtonWidget/component/RecaptchaV2.tsx
index fab1348d9c..6c230d84d3 100644
--- a/app/client/src/widgets/ButtonWidgetV2/component/RecaptchaV2.tsx
+++ b/app/client/src/widgets/wds/WDSButtonWidget/component/RecaptchaV2.tsx
@@ -19,12 +19,12 @@ export function RecaptchaV2(props: RecaptchaV2Props) {
     props.handleRecaptchaV2Loading && props.handleRecaptchaV2Loading(isloading);
   };
   const {
-    isLoading,
     isDisabled,
-    recaptchaKey,
-    onRecaptchaSubmitSuccess,
-    onRecaptchaSubmitError = noop,
+    isLoading,
     onPress: onClickProp,
+    onRecaptchaSubmitError = noop,
+    onRecaptchaSubmitSuccess,
+    recaptchaKey,
   } = props;
   const onClick = () => {
     if (isDisabled) return onClickProp;
diff --git a/app/client/src/widgets/ButtonWidgetV2/component/RecaptchaV3.tsx b/app/client/src/widgets/wds/WDSButtonWidget/component/RecaptchaV3.tsx
similarity index 100%
rename from app/client/src/widgets/ButtonWidgetV2/component/RecaptchaV3.tsx
rename to app/client/src/widgets/wds/WDSButtonWidget/component/RecaptchaV3.tsx
index b37f11ae67..eb7229dc6a 100644
--- a/app/client/src/widgets/ButtonWidgetV2/component/RecaptchaV3.tsx
+++ b/app/client/src/widgets/wds/WDSButtonWidget/component/RecaptchaV3.tsx
@@ -17,10 +17,10 @@ export function RecaptchaV3(props: RecaptchaV3Props) {
   };
 
   const {
-    recaptchaKey,
     onPress: onClickProp,
-    onRecaptchaSubmitSuccess,
     onRecaptchaSubmitError = noop,
+    onRecaptchaSubmitSuccess,
+    recaptchaKey,
   } = props;
 
   const onClick: ButtonComponentProps["onPress"] = () => {
diff --git a/app/client/src/widgets/ButtonWidgetV2/component/index.tsx b/app/client/src/widgets/wds/WDSButtonWidget/component/index.tsx
similarity index 97%
rename from app/client/src/widgets/ButtonWidgetV2/component/index.tsx
rename to app/client/src/widgets/wds/WDSButtonWidget/component/index.tsx
index 27385ae54a..a5918bedb0 100644
--- a/app/client/src/widgets/ButtonWidgetV2/component/index.tsx
+++ b/app/client/src/widgets/wds/WDSButtonWidget/component/index.tsx
@@ -8,7 +8,7 @@ import type { UseRecaptchaProps } from "./useRecaptcha";
 import { Button, Tooltip } from "@design-system/widgets";
 import type { ButtonProps } from "@design-system/widgets";
 
-export type ButtonComponentProps = {
+export interface ButtonComponentProps {
   text?: string;
   tooltip?: string;
   minWidth?: number;
@@ -23,7 +23,7 @@ export type ButtonComponentProps = {
   type: ButtonProps["type"];
   onPress?: ButtonProps["onPress"];
   iconPosition?: ButtonProps["iconPosition"];
-};
+}
 
 function ButtonComponent(props: ButtonComponentProps & UseRecaptchaProps) {
   const { iconName, maxWidth, minHeight, minWidth, text, tooltip, ...rest } =
diff --git a/app/client/src/widgets/ButtonWidgetV2/component/useRecaptcha.tsx b/app/client/src/widgets/wds/WDSButtonWidget/component/useRecaptcha.tsx
similarity index 92%
rename from app/client/src/widgets/ButtonWidgetV2/component/useRecaptcha.tsx
rename to app/client/src/widgets/wds/WDSButtonWidget/component/useRecaptcha.tsx
index 197f4c4030..fbde7102aa 100644
--- a/app/client/src/widgets/ButtonWidgetV2/component/useRecaptcha.tsx
+++ b/app/client/src/widgets/wds/WDSButtonWidget/component/useRecaptcha.tsx
@@ -3,20 +3,20 @@ import { RecaptchaV3 } from "./RecaptchaV3";
 import type { ButtonComponentProps } from ".";
 import type { RecaptchaType } from "components/constants";
 
-export type UseRecaptchaProps = {
+export interface UseRecaptchaProps {
   recaptchaKey?: string;
   recaptchaType?: RecaptchaType;
   onRecaptchaSubmitError?: (error: string) => void;
   onRecaptchaSubmitSuccess?: (token: string) => void;
   handleRecaptchaV2Loading?: (isLoading: boolean) => void;
-};
+}
 
 export type RecaptchaProps = ButtonComponentProps & UseRecaptchaProps;
 
-type UseRecaptchaReturn = {
+interface UseRecaptchaReturn {
   onClick?: (...args: any[]) => void;
   recpatcha?: React.ReactElement;
-};
+}
 
 export const useRecaptcha = (props: RecaptchaProps): UseRecaptchaReturn => {
   const { onPress: onClickProp, recaptchaKey } = props;
diff --git a/app/client/src/widgets/ButtonWidgetV2/icon.svg b/app/client/src/widgets/wds/WDSButtonWidget/icon.svg
similarity index 100%
rename from app/client/src/widgets/ButtonWidgetV2/icon.svg
rename to app/client/src/widgets/wds/WDSButtonWidget/icon.svg
diff --git a/app/client/src/widgets/wds/WDSButtonWidget/index.tsx b/app/client/src/widgets/wds/WDSButtonWidget/index.tsx
new file mode 100644
index 0000000000..f19a7a0c59
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSButtonWidget/index.tsx
@@ -0,0 +1,3 @@
+import { WDSButtonWidget } from "./widget";
+
+export { WDSButtonWidget };
diff --git a/app/client/src/widgets/ButtonWidgetV2/widget/contentConfig.tsx b/app/client/src/widgets/wds/WDSButtonWidget/widget/contentConfig.tsx
similarity index 100%
rename from app/client/src/widgets/ButtonWidgetV2/widget/contentConfig.tsx
rename to app/client/src/widgets/wds/WDSButtonWidget/widget/contentConfig.tsx
diff --git a/app/client/src/widgets/ButtonWidgetV2/widget/index.tsx b/app/client/src/widgets/wds/WDSButtonWidget/widget/index.tsx
similarity index 97%
rename from app/client/src/widgets/ButtonWidgetV2/widget/index.tsx
rename to app/client/src/widgets/wds/WDSButtonWidget/widget/index.tsx
index 76cd437ad5..b389e141de 100644
--- a/app/client/src/widgets/ButtonWidgetV2/widget/index.tsx
+++ b/app/client/src/widgets/wds/WDSButtonWidget/widget/index.tsx
@@ -18,7 +18,7 @@ import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
 import type { ExecutionResult } from "constants/AppsmithActionConstants/ActionConstants";
 import { ResponsiveBehavior } from "layoutSystems/common/utils/constants";
 
-class ButtonWidget extends BaseWidget<ButtonWidgetProps, ButtonWidgetState> {
+class WDSButtonWidget extends BaseWidget<ButtonWidgetProps, ButtonWidgetState> {
   constructor(props: ButtonWidgetProps) {
     super(props);
 
@@ -27,7 +27,7 @@ class ButtonWidget extends BaseWidget<ButtonWidgetProps, ButtonWidgetState> {
     };
   }
 
-  static type = "BUTTON_WIDGET_V2";
+  static type = "WDS_BUTTON_WIDGET";
 
   static getConfig() {
     return {
@@ -232,4 +232,4 @@ class ButtonWidget extends BaseWidget<ButtonWidgetProps, ButtonWidgetState> {
   }
 }
 
-export { ButtonWidget };
+export { WDSButtonWidget };
diff --git a/app/client/src/widgets/ButtonWidgetV2/widget/styleConfig.tsx b/app/client/src/widgets/wds/WDSButtonWidget/widget/styleConfig.tsx
similarity index 100%
rename from app/client/src/widgets/ButtonWidgetV2/widget/styleConfig.tsx
rename to app/client/src/widgets/wds/WDSButtonWidget/widget/styleConfig.tsx
diff --git a/app/client/src/widgets/ButtonWidgetV2/widget/types.ts b/app/client/src/widgets/wds/WDSButtonWidget/widget/types.ts
similarity index 100%
rename from app/client/src/widgets/ButtonWidgetV2/widget/types.ts
rename to app/client/src/widgets/wds/WDSButtonWidget/widget/types.ts
diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/config/autocompleteConfig.ts b/app/client/src/widgets/wds/WDSCheckboxWidget/config/autocompleteConfig.ts
new file mode 100644
index 0000000000..25bc941e64
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSCheckboxWidget/config/autocompleteConfig.ts
@@ -0,0 +1,10 @@
+import { DefaultAutocompleteDefinitions } from "widgets/WidgetUtils";
+
+export const autocompleteConfig = {
+  "!doc":
+    "Checkbox is a simple UI widget you can use when you want users to make a binary choice",
+  "!url": "https://docs.appsmith.com/widget-reference/checkbox",
+  isVisible: DefaultAutocompleteDefinitions.isVisible,
+  isChecked: "bool",
+  isDisabled: "bool",
+};
diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/config/defaultsConfig.ts b/app/client/src/widgets/wds/WDSCheckboxWidget/config/defaultsConfig.ts
new file mode 100644
index 0000000000..2a28e04369
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSCheckboxWidget/config/defaultsConfig.ts
@@ -0,0 +1,17 @@
+import { FILL_WIDGET_MIN_WIDTH } from "constants/minWidthConstants";
+import { ResponsiveBehavior } from "layoutSystems/common/utils/constants";
+
+export const defaultsConfig = {
+  rows: 4,
+  columns: 12,
+  label: "Label",
+  defaultCheckedState: true,
+  widgetName: "Checkbox",
+  version: 1,
+  labelPosition: "left",
+  isDisabled: false,
+  isRequired: false,
+  animateLoading: true,
+  responsiveBehavior: ResponsiveBehavior.Fill,
+  minWidth: FILL_WIDGET_MIN_WIDTH,
+};
diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/config/featuresConfig.ts b/app/client/src/widgets/wds/WDSCheckboxWidget/config/featuresConfig.ts
new file mode 100644
index 0000000000..1d15274bb2
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSCheckboxWidget/config/featuresConfig.ts
@@ -0,0 +1,6 @@
+export const featuresConfig = {
+  dynamicHeight: {
+    sectionIndex: 2,
+    active: true,
+  },
+};
diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/config/index.ts b/app/client/src/widgets/wds/WDSCheckboxWidget/config/index.ts
new file mode 100644
index 0000000000..9c9abc2424
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSCheckboxWidget/config/index.ts
@@ -0,0 +1,7 @@
+export * from "./propertyPaneConfig";
+export { metaConfig } from "./metaConfig";
+export { settersConfig } from "./settersConfig";
+export { methodsConfig } from "./methodsConfig";
+export { defaultsConfig } from "./defaultsConfig";
+export { featuresConfig } from "./featuresConfig";
+export { autocompleteConfig } from "./autocompleteConfig";
diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/config/metaConfig.ts b/app/client/src/widgets/wds/WDSCheckboxWidget/config/metaConfig.ts
new file mode 100644
index 0000000000..30902d0e1f
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSCheckboxWidget/config/metaConfig.ts
@@ -0,0 +1,10 @@
+import IconSVG from "../icon.svg";
+import { WIDGET_TAGS } from "constants/WidgetConstants";
+
+export const metaConfig = {
+  name: "Checkbox",
+  iconSVG: IconSVG,
+  tags: [WIDGET_TAGS.TOGGLES],
+  needsMeta: true,
+  searchTags: ["boolean"],
+};
diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/config/methodsConfig.ts b/app/client/src/widgets/wds/WDSCheckboxWidget/config/methodsConfig.ts
new file mode 100644
index 0000000000..abc9e021f3
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSCheckboxWidget/config/methodsConfig.ts
@@ -0,0 +1,18 @@
+import type {
+  PropertyUpdates,
+  SnipingModeProperty,
+} from "WidgetProvider/constants";
+
+export const methodsConfig = {
+  getSnipingModeUpdates: (
+    propValueMap: SnipingModeProperty,
+  ): PropertyUpdates[] => {
+    return [
+      {
+        propertyPath: "defaultCheckedState",
+        propertyValue: propValueMap.data,
+        isDynamicPropertyPath: true,
+      },
+    ];
+  },
+};
diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/config/propertyPaneConfig/contentConfig.ts b/app/client/src/widgets/wds/WDSCheckboxWidget/config/propertyPaneConfig/contentConfig.ts
new file mode 100644
index 0000000000..297d035054
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSCheckboxWidget/config/propertyPaneConfig/contentConfig.ts
@@ -0,0 +1,109 @@
+import { ValidationTypes } from "constants/WidgetValidation";
+
+export const propertyPaneContentConfig = [
+  {
+    sectionName: "Label",
+    children: [
+      {
+        propertyName: "label",
+        label: "Text",
+        controlType: "INPUT_TEXT",
+        helpText: "Displays a label next to the widget",
+        placeholderText: "I agree to the T&C",
+        isBindProperty: true,
+        isTriggerProperty: false,
+        validation: { type: ValidationTypes.TEXT },
+      },
+      {
+        helpText: "Sets the label position of the widget",
+        propertyName: "labelPosition",
+        label: "Position",
+        controlType: "ICON_TABS",
+        fullWidth: true,
+        options: [
+          { label: "Left", value: "left" },
+          { label: "Right", value: "right" },
+        ],
+        defaultValue: "left",
+        isBindProperty: false,
+        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: [
+      {
+        propertyName: "defaultCheckedState",
+        label: "Default state",
+        helpText: "Sets the default checked state of the widget",
+        controlType: "SWITCH",
+        isJSConvertible: true,
+        isBindProperty: true,
+        isTriggerProperty: false,
+        validation: { type: ValidationTypes.BOOLEAN },
+      },
+      {
+        propertyName: "isVisible",
+        label: "Visible",
+        helpText: "Controls the visibility of the widget",
+        controlType: "SWITCH",
+        isJSConvertible: true,
+        isBindProperty: true,
+        isTriggerProperty: false,
+        validation: { type: ValidationTypes.BOOLEAN },
+      },
+      {
+        propertyName: "isDisabled",
+        label: "Disabled",
+        controlType: "SWITCH",
+        helpText: "Disables input to this widget",
+        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 the check state is changed",
+        propertyName: "onCheckChange",
+        label: "onCheckChange",
+        controlType: "ACTION_SELECTOR",
+        isJSConvertible: true,
+        isBindProperty: true,
+        isTriggerProperty: true,
+      },
+    ],
+  },
+];
diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/config/propertyPaneConfig/index.ts b/app/client/src/widgets/wds/WDSCheckboxWidget/config/propertyPaneConfig/index.ts
new file mode 100644
index 0000000000..7f43d3bde5
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSCheckboxWidget/config/propertyPaneConfig/index.ts
@@ -0,0 +1 @@
+export { propertyPaneContentConfig } from "./contentConfig";
diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/config/propertyPaneConfig/styleConfig.ts b/app/client/src/widgets/wds/WDSCheckboxWidget/config/propertyPaneConfig/styleConfig.ts
new file mode 100644
index 0000000000..a7666dd337
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSCheckboxWidget/config/propertyPaneConfig/styleConfig.ts
@@ -0,0 +1 @@
+export const propertyPaneStyleConfig = [];
diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/config/settersConfig.ts b/app/client/src/widgets/wds/WDSCheckboxWidget/config/settersConfig.ts
new file mode 100644
index 0000000000..ca84b77d5e
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSCheckboxWidget/config/settersConfig.ts
@@ -0,0 +1,21 @@
+export const settersConfig = {
+  __setters: {
+    setVisibility: {
+      path: "isVisible",
+      type: "boolean",
+    },
+    setDisabled: {
+      path: "isDisabled",
+      type: "boolean",
+    },
+    setRequired: {
+      path: "isRequired",
+      type: "boolean",
+    },
+    setValue: {
+      path: "defaultCheckedState",
+      type: "boolean",
+      accessor: "isChecked",
+    },
+  },
+};
diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/icon.svg b/app/client/src/widgets/wds/WDSCheckboxWidget/icon.svg
new file mode 100644
index 0000000000..a56d336f43
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSCheckboxWidget/icon.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23 23V0.999969H1V23H23ZM4.14285 4.14282V19.8572H19.8571V4.14282H4.14285ZM7.93655 10.538L5.71423 12.7603L10.1589 17.2049L17.9371 9.42669L15.7148 7.20438L10.1589 12.7603L7.93655 10.538Z" fill="#4C5664"/>
+</svg>
diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/index.ts b/app/client/src/widgets/wds/WDSCheckboxWidget/index.ts
new file mode 100644
index 0000000000..afe91f3da5
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSCheckboxWidget/index.ts
@@ -0,0 +1,3 @@
+import { WDSCheckboxWidget } from "./widget";
+
+export { WDSCheckboxWidget };
diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/widget/index.tsx b/app/client/src/widgets/wds/WDSCheckboxWidget/widget/index.tsx
new file mode 100644
index 0000000000..9444175eab
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSCheckboxWidget/widget/index.tsx
@@ -0,0 +1,112 @@
+import React from "react";
+import { Checkbox } from "@design-system/widgets";
+import type { SetterConfig } from "entities/AppTheming";
+import type { DerivedPropertiesMap } from "WidgetProvider/factory";
+import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
+
+import * as config from "./../config";
+import BaseWidget from "widgets/BaseWidget";
+import type { CheckboxWidgetProps } from "./types";
+import type { WidgetState } from "widgets/BaseWidget";
+
+class WDSCheckboxWidget extends BaseWidget<CheckboxWidgetProps, WidgetState> {
+  static type = "WDS_CHECKBOX_WIDGET";
+
+  static getConfig() {
+    return config.metaConfig;
+  }
+
+  static getFeatures() {
+    return config.featuresConfig;
+  }
+
+  static getDefaults() {
+    return config.defaultsConfig;
+  }
+
+  static getMethods() {
+    return config.methodsConfig;
+  }
+
+  static getAutoLayoutConfig() {
+    return {};
+  }
+
+  static getAutocompleteDefinitions() {
+    return config.autocompleteConfig;
+  }
+
+  static getPropertyPaneContentConfig() {
+    return config.propertyPaneContentConfig;
+  }
+
+  static getPropertyPaneStyleConfig() {
+    return [];
+  }
+
+  static getDefaultPropertiesMap(): Record<string, string> {
+    return {
+      isChecked: "defaultCheckedState",
+    };
+  }
+
+  static getDerivedPropertiesMap(): DerivedPropertiesMap {
+    return {
+      value: `{{!!this.isChecked}}`,
+      isValid: `{{ this.isRequired ? !!this.isChecked : true }}`,
+    };
+  }
+
+  static getMetaPropertiesMap(): Record<string, any> {
+    return {
+      isChecked: undefined,
+      isDirty: false,
+    };
+  }
+
+  static getSetterConfig(): SetterConfig {
+    return config.settersConfig;
+  }
+
+  componentDidUpdate(prevProps: CheckboxWidgetProps) {
+    if (
+      this.props.defaultCheckedState !== prevProps.defaultCheckedState &&
+      this.props.isDirty
+    ) {
+      this.props.updateWidgetMetaProperty("isDirty", false);
+    }
+  }
+
+  onChange = (isChecked: boolean) => {
+    if (!this.props.isDirty) {
+      this.props.updateWidgetMetaProperty("isDirty", true);
+    }
+
+    this.props.updateWidgetMetaProperty("isChecked", isChecked, {
+      triggerPropertyName: "onCheckChange",
+      dynamicString: this.props.onCheckChange,
+      event: {
+        type: EventType.ON_CHECK_CHANGE,
+      },
+    });
+  };
+
+  getWidgetView() {
+    return (
+      <Checkbox
+        id={this.props.widgetId}
+        isDisabled={this.props.isDisabled}
+        isRequired={this.props.isRequired}
+        isSelected={!!this.props.isChecked}
+        key={this.props.widgetId}
+        labelPosition={this.props.labelPosition}
+        onChange={this.onChange}
+        validationState={this.props.isValid ? "valid" : "invalid"}
+      >
+        {this.props.label}
+      </Checkbox>
+    );
+  }
+}
+
+export { WDSCheckboxWidget };
diff --git a/app/client/src/widgets/wds/WDSCheckboxWidget/widget/types.ts b/app/client/src/widgets/wds/WDSCheckboxWidget/widget/types.ts
new file mode 100644
index 0000000000..cf842602e5
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSCheckboxWidget/widget/types.ts
@@ -0,0 +1,11 @@
+import type { WidgetProps } from "widgets/BaseWidget";
+
+export interface CheckboxWidgetProps extends WidgetProps {
+  label: string;
+  defaultCheckedState: boolean;
+  isChecked?: boolean;
+  isDisabled?: boolean;
+  onCheckChange?: string;
+  isRequired?: boolean;
+  labelPosition?: "left" | "right";
+}
diff --git a/app/client/src/widgets/InputWidgetV3/component/index.tsx b/app/client/src/widgets/wds/WDSInputWidget/component/index.tsx
similarity index 99%
rename from app/client/src/widgets/InputWidgetV3/component/index.tsx
rename to app/client/src/widgets/wds/WDSInputWidget/component/index.tsx
index bd4b0ee5a2..4a4bc7ed80 100644
--- a/app/client/src/widgets/InputWidgetV3/component/index.tsx
+++ b/app/client/src/widgets/wds/WDSInputWidget/component/index.tsx
@@ -104,6 +104,7 @@ function InputComponent(props: InputComponentProps) {
       startIcon={startIcon}
       type={type}
       validationState={props.validationStatus}
+      value={props.value}
     />
   );
 }
diff --git a/app/client/src/widgets/InputWidgetV3/component/types.ts b/app/client/src/widgets/wds/WDSInputWidget/component/types.ts
similarity index 87%
rename from app/client/src/widgets/InputWidgetV3/component/types.ts
rename to app/client/src/widgets/wds/WDSInputWidget/component/types.ts
index 5d97a09015..b57be8aeee 100644
--- a/app/client/src/widgets/InputWidgetV3/component/types.ts
+++ b/app/client/src/widgets/wds/WDSInputWidget/component/types.ts
@@ -1,4 +1,4 @@
-import type { BaseInputComponentProps } from "widgets/BaseInputWidgetV2";
+import type { BaseInputComponentProps } from "../../WDSBaseInputWidget";
 
 import type { INPUT_TYPES } from "../constants";
 import type { IconName } from "@blueprintjs/icons";
diff --git a/app/client/src/widgets/InputWidgetV3/constants.ts b/app/client/src/widgets/wds/WDSInputWidget/constants.ts
similarity index 100%
rename from app/client/src/widgets/InputWidgetV3/constants.ts
rename to app/client/src/widgets/wds/WDSInputWidget/constants.ts
diff --git a/app/client/src/widgets/InputWidgetV3/icon.svg b/app/client/src/widgets/wds/WDSInputWidget/icon.svg
similarity index 100%
rename from app/client/src/widgets/InputWidgetV3/icon.svg
rename to app/client/src/widgets/wds/WDSInputWidget/icon.svg
diff --git a/app/client/src/widgets/wds/WDSInputWidget/index.ts b/app/client/src/widgets/wds/WDSInputWidget/index.ts
new file mode 100644
index 0000000000..e1603804fd
--- /dev/null
+++ b/app/client/src/widgets/wds/WDSInputWidget/index.ts
@@ -0,0 +1,3 @@
+import { WDSInputWidget } from "./widget";
+
+export { WDSInputWidget };
diff --git a/app/client/src/widgets/InputWidgetV3/widget/derived.js b/app/client/src/widgets/wds/WDSInputWidget/widget/derived.js
similarity index 100%
rename from app/client/src/widgets/InputWidgetV3/widget/derived.js
rename to app/client/src/widgets/wds/WDSInputWidget/widget/derived.js
diff --git a/app/client/src/widgets/InputWidgetV3/widget/derived.test.ts b/app/client/src/widgets/wds/WDSInputWidget/widget/derived.test.ts
similarity index 100%
rename from app/client/src/widgets/InputWidgetV3/widget/derived.test.ts
rename to app/client/src/widgets/wds/WDSInputWidget/widget/derived.test.ts
diff --git a/app/client/src/widgets/InputWidgetV3/widget/helper.test.ts b/app/client/src/widgets/wds/WDSInputWidget/widget/helper.test.ts
similarity index 100%
rename from app/client/src/widgets/InputWidgetV3/widget/helper.test.ts
rename to app/client/src/widgets/wds/WDSInputWidget/widget/helper.test.ts
diff --git a/app/client/src/widgets/InputWidgetV3/widget/helper.ts b/app/client/src/widgets/wds/WDSInputWidget/widget/helper.ts
similarity index 100%
rename from app/client/src/widgets/InputWidgetV3/widget/helper.ts
rename to app/client/src/widgets/wds/WDSInputWidget/widget/helper.ts
diff --git a/app/client/src/widgets/InputWidgetV3/widget/index.tsx b/app/client/src/widgets/wds/WDSInputWidget/widget/index.tsx
similarity index 96%
rename from app/client/src/widgets/InputWidgetV3/widget/index.tsx
rename to app/client/src/widgets/wds/WDSInputWidget/widget/index.tsx
index be5ef3cbc6..211dbccfae 100644
--- a/app/client/src/widgets/InputWidgetV3/widget/index.tsx
+++ b/app/client/src/widgets/wds/WDSInputWidget/widget/index.tsx
@@ -20,16 +20,16 @@ import type { WidgetState } from "widgets/BaseWidget";
 import type { SetterConfig } from "entities/AppTheming";
 import { WIDGET_TAGS } from "constants/WidgetConstants";
 import derivedProperties from "./parsedDerivedProperties";
-import { BaseInputWidget } from "widgets/BaseInputWidgetV2";
+import { WDSBaseInputWidget } from "../../WDSBaseInputWidget";
 import type { InputWidgetProps, KeyDownEvent } from "./types";
 import type { DerivedPropertiesMap } from "WidgetProvider/factory";
 import { FILL_WIDGET_MIN_WIDTH } from "constants/minWidthConstants";
 import { DefaultAutocompleteDefinitions } from "widgets/WidgetUtils";
-import type { BaseInputWidgetProps } from "widgets/BaseInputWidgetV2";
+import type { BaseInputWidgetProps } from "../../WDSBaseInputWidget";
 import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
 import { ResponsiveBehavior } from "layoutSystems/common/utils/constants";
 
-class InputWidget extends BaseInputWidget<InputWidgetProps, WidgetState> {
+class WDSInputWidget extends WDSBaseInputWidget<InputWidgetProps, WidgetState> {
   static getConfig() {
     return {
       name: "Input",
@@ -52,7 +52,7 @@ class InputWidget extends BaseInputWidget<InputWidgetProps, WidgetState> {
 
   static getDefaults() {
     return {
-      ...BaseInputWidget.getDefaults(),
+      ...WDSBaseInputWidget.getDefaults(),
       rows: 7,
       labelPosition: "top",
       inputType: "TEXT",
@@ -307,7 +307,7 @@ class InputWidget extends BaseInputWidget<InputWidgetProps, WidgetState> {
     );
   }
 
-  static type = "INPUT_WIDGET_V3";
+  static type = "WDS_INPUT_WIDGET";
 }
 
-export { InputWidget };
+export { WDSInputWidget };
diff --git a/app/client/src/widgets/InputWidgetV3/widget/parsedDerivedProperties.ts b/app/client/src/widgets/wds/WDSInputWidget/widget/parsedDerivedProperties.ts
similarity index 100%
rename from app/client/src/widgets/InputWidgetV3/widget/parsedDerivedProperties.ts
rename to app/client/src/widgets/wds/WDSInputWidget/widget/parsedDerivedProperties.ts
diff --git a/app/client/src/widgets/InputWidgetV3/widget/propertyPaneConfig/contentConfig.ts b/app/client/src/widgets/wds/WDSInputWidget/widget/propertyPaneConfig/contentConfig.ts
similarity index 100%
rename from app/client/src/widgets/InputWidgetV3/widget/propertyPaneConfig/contentConfig.ts
rename to app/client/src/widgets/wds/WDSInputWidget/widget/propertyPaneConfig/contentConfig.ts
index d0da39e758..212e1380d2 100644
--- a/app/client/src/widgets/InputWidgetV3/widget/propertyPaneConfig/contentConfig.ts
+++ b/app/client/src/widgets/wds/WDSInputWidget/widget/propertyPaneConfig/contentConfig.ts
@@ -74,29 +74,6 @@ export const propertyPaneContentConfig = [
     sectionName: "Label",
     children: [],
   },
-  {
-    sectionName: "General",
-    children: [
-      {
-        propertyName: "shouldAllowAutofill",
-        label: "Allow autofill",
-        helpText: "Allow users to autofill values from browser",
-        controlType: "SWITCH",
-        isJSConvertible: true,
-        isBindProperty: true,
-        isTriggerProperty: false,
-        validation: { type: ValidationTypes.BOOLEAN },
-        hidden: (props: InputWidgetProps) => {
-          //should be shown for only inputWidgetV2 and for email or password input types
-          return !(
-            isInputTypeEmailOrPassword(props?.inputType) &&
-            props.type === "INPUT_WIDGET_V3"
-          );
-        },
-        dependencies: ["inputType"],
-      },
-    ],
-  },
   {
     sectionName: "Validation",
     children: [
@@ -192,4 +169,27 @@ export const propertyPaneContentConfig = [
       },
     ],
   },
+  {
+    sectionName: "General",
+    children: [
+      {
+        propertyName: "shouldAllowAutofill",
+        label: "Allow autofill",
+        helpText: "Allow users to autofill values from browser",
+        controlType: "SWITCH",
+        isJSConvertible: true,
+        isBindProperty: true,
+        isTriggerProperty: false,
+        validation: { type: ValidationTypes.BOOLEAN },
+        hidden: (props: InputWidgetProps) => {
+          //should be shown for only inputWidgetV2 and for email or password input types
+          return !(
+            isInputTypeEmailOrPassword(props?.inputType) &&
+            props.type === "INPUT_WIDGET_V3"
+          );
+        },
+        dependencies: ["inputType"],
+      },
+    ],
+  },
 ];
diff --git a/app/client/src/widgets/InputWidgetV3/widget/propertyPaneConfig/index.ts b/app/client/src/widgets/wds/WDSInputWidget/widget/propertyPaneConfig/index.ts
similarity index 100%
rename from app/client/src/widgets/InputWidgetV3/widget/propertyPaneConfig/index.ts
rename to app/client/src/widgets/wds/WDSInputWidget/widget/propertyPaneConfig/index.ts
diff --git a/app/client/src/widgets/InputWidgetV3/widget/propertyPaneConfig/styleConfig.ts b/app/client/src/widgets/wds/WDSInputWidget/widget/propertyPaneConfig/styleConfig.ts
similarity index 100%
rename from app/client/src/widgets/InputWidgetV3/widget/propertyPaneConfig/styleConfig.ts
rename to app/client/src/widgets/wds/WDSInputWidget/widget/propertyPaneConfig/styleConfig.ts
diff --git a/app/client/src/widgets/InputWidgetV3/widget/propertyPaneConfig/validations/defaultValueValidation.ts b/app/client/src/widgets/wds/WDSInputWidget/widget/propertyPaneConfig/validations/defaultValueValidation.ts
similarity index 100%
rename from app/client/src/widgets/InputWidgetV3/widget/propertyPaneConfig/validations/defaultValueValidation.ts
rename to app/client/src/widgets/wds/WDSInputWidget/widget/propertyPaneConfig/validations/defaultValueValidation.ts
diff --git a/app/client/src/widgets/InputWidgetV3/widget/propertyPaneConfig/validations/index.test.ts b/app/client/src/widgets/wds/WDSInputWidget/widget/propertyPaneConfig/validations/index.test.ts
similarity index 100%
rename from app/client/src/widgets/InputWidgetV3/widget/propertyPaneConfig/validations/index.test.ts
rename to app/client/src/widgets/wds/WDSInputWidget/widget/propertyPaneConfig/validations/index.test.ts
diff --git a/app/client/src/widgets/InputWidgetV3/widget/propertyPaneConfig/validations/index.ts b/app/client/src/widgets/wds/WDSInputWidget/widget/propertyPaneConfig/validations/index.ts
similarity index 100%
rename from app/client/src/widgets/InputWidgetV3/widget/propertyPaneConfig/validations/index.ts
rename to app/client/src/widgets/wds/WDSInputWidget/widget/propertyPaneConfig/validations/index.ts
diff --git a/app/client/src/widgets/InputWidgetV3/widget/propertyPaneConfig/validations/maxValueValidation.ts b/app/client/src/widgets/wds/WDSInputWidget/widget/propertyPaneConfig/validations/maxValueValidation.ts
similarity index 100%
rename from app/client/src/widgets/InputWidgetV3/widget/propertyPaneConfig/validations/maxValueValidation.ts
rename to app/client/src/widgets/wds/WDSInputWidget/widget/propertyPaneConfig/validations/maxValueValidation.ts
diff --git a/app/client/src/widgets/InputWidgetV3/widget/propertyPaneConfig/validations/minValueValidation.ts b/app/client/src/widgets/wds/WDSInputWidget/widget/propertyPaneConfig/validations/minValueValidation.ts
similarity index 100%
rename from app/client/src/widgets/InputWidgetV3/widget/propertyPaneConfig/validations/minValueValidation.ts
rename to app/client/src/widgets/wds/WDSInputWidget/widget/propertyPaneConfig/validations/minValueValidation.ts
diff --git a/app/client/src/widgets/InputWidgetV3/widget/types.ts b/app/client/src/widgets/wds/WDSInputWidget/widget/types.ts
similarity index 85%
rename from app/client/src/widgets/InputWidgetV3/widget/types.ts
rename to app/client/src/widgets/wds/WDSInputWidget/widget/types.ts
index 4bd7d8df40..c679394bb9 100644
--- a/app/client/src/widgets/InputWidgetV3/widget/types.ts
+++ b/app/client/src/widgets/wds/WDSInputWidget/widget/types.ts
@@ -1,7 +1,7 @@
 import type { IconName } from "@blueprintjs/icons";
 
 import type { InputComponentProps } from "../component/types";
-import type { BaseInputWidgetProps } from "widgets/BaseInputWidgetV2/widget/types";
+import type { BaseInputWidgetProps } from "../../WDSBaseInputWidget";
 
 export interface InputWidgetProps extends BaseInputWidgetProps {
   defaultText?: string | number;
@@ -21,10 +21,10 @@ export interface InputWidgetProps extends BaseInputWidgetProps {
   iconAlign?: "left" | "right";
 }
 
-export type Validation = {
+export interface Validation {
   errorMessage?: string;
   validationStatus?: InputComponentProps["validationStatus"];
-};
+}
 
 export type KeyDownEvent = React.KeyboardEvent<
   HTMLTextAreaElement | HTMLInputElement
diff --git a/app/client/src/workers/Evaluation/JSObject/__test__/mutation.test.ts b/app/client/src/workers/Evaluation/JSObject/__test__/mutation.test.ts
index dfffa85de9..4af11f511e 100644
--- a/app/client/src/workers/Evaluation/JSObject/__test__/mutation.test.ts
+++ b/app/client/src/workers/Evaluation/JSObject/__test__/mutation.test.ts
@@ -1,4 +1,4 @@
-import type { DataTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { ENTITY_TYPE_VALUE } from "entities/DataTree/dataTreeFactory";
 import { createEvaluationContext } from "workers/Evaluation/evaluate";
 import JSObjectCollection from "../Collection";
diff --git a/app/client/src/workers/Evaluation/JSObject/index.ts b/app/client/src/workers/Evaluation/JSObject/index.ts
index b4d5bceb4c..56ac11224f 100644
--- a/app/client/src/workers/Evaluation/JSObject/index.ts
+++ b/app/client/src/workers/Evaluation/JSObject/index.ts
@@ -1,9 +1,6 @@
 import { get, isEmpty, merge, set } from "lodash";
-import type {
-  ConfigTree,
-  DataTree,
-  JSActionEntity,
-} from "@appsmith/entities/DataTree/types";
+import type { JSActionEntity } from "@appsmith/entities/DataTree/types";
+import type { ConfigTree, DataTree } from "entities/DataTree/dataTreeTypes";
 import { EvalErrorTypes, getEvalValuePath } from "utils/DynamicBindingUtils";
 import type { JSUpdate, ParsedJSSubAction } from "utils/JSPaneUtils";
 import { parseJSObject, isJSFunctionProperty } from "@shared/ast";
diff --git a/app/client/src/workers/Evaluation/JSObject/test.ts b/app/client/src/workers/Evaluation/JSObject/test.ts
index ab20d4c79a..90a400ecf9 100644
--- a/app/client/src/workers/Evaluation/JSObject/test.ts
+++ b/app/client/src/workers/Evaluation/JSObject/test.ts
@@ -1,4 +1,4 @@
-import type { ConfigTree, UnEvalTree } from "@appsmith/entities/DataTree/types";
+import type { ConfigTree, UnEvalTree } from "entities/DataTree/dataTreeTypes";
 import { getUpdatedLocalUnEvalTreeAfterJSUpdates } from ".";
 
 describe("updateJSCollectionInUnEvalTree", function () {
diff --git a/app/client/src/workers/Evaluation/JSObject/utils.ts b/app/client/src/workers/Evaluation/JSObject/utils.ts
index 5310a6e254..ee1aa042be 100644
--- a/app/client/src/workers/Evaluation/JSObject/utils.ts
+++ b/app/client/src/workers/Evaluation/JSObject/utils.ts
@@ -1,10 +1,12 @@
+import type {
+  JSActionEntityConfig,
+  JSActionEntity,
+} from "@appsmith/entities/DataTree/types";
 import type {
   ConfigTree,
   DataTree,
   DataTreeEntity,
-  JSActionEntityConfig,
-  JSActionEntity,
-} from "@appsmith/entities/DataTree/types";
+} from "entities/DataTree/dataTreeTypes";
 import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
 import type { ParsedBody, ParsedJSSubAction } from "utils/JSPaneUtils";
 import { unset, set, get, find } from "lodash";
diff --git a/app/client/src/workers/Evaluation/__tests__/Actions.test.ts b/app/client/src/workers/Evaluation/__tests__/Actions.test.ts
index c9549bb6e1..f3a1d100d9 100644
--- a/app/client/src/workers/Evaluation/__tests__/Actions.test.ts
+++ b/app/client/src/workers/Evaluation/__tests__/Actions.test.ts
@@ -1,4 +1,5 @@
-import type { DataTree, ActionEntity } from "@appsmith/entities/DataTree/types";
+import type { ActionEntity } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { ENTITY_TYPE_VALUE } from "entities/DataTree/dataTreeFactory";
 import { PluginType } from "entities/Action";
 import type { EvalContext } from "workers/Evaluation/evaluate";
diff --git a/app/client/src/workers/Evaluation/__tests__/errorModifier.test.ts b/app/client/src/workers/Evaluation/__tests__/errorModifier.test.ts
index 3855e42b96..130167e1d7 100644
--- a/app/client/src/workers/Evaluation/__tests__/errorModifier.test.ts
+++ b/app/client/src/workers/Evaluation/__tests__/errorModifier.test.ts
@@ -1,4 +1,4 @@
-import type { DataTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { errorModifier } from "../errorModifier";
 import DependencyMap from "entities/DependencyMap";
 import { APP_MODE } from "entities/App";
diff --git a/app/client/src/workers/Evaluation/__tests__/evaluate.test.ts b/app/client/src/workers/Evaluation/__tests__/evaluate.test.ts
index 2ba23a7b47..1d561ba6e5 100644
--- a/app/client/src/workers/Evaluation/__tests__/evaluate.test.ts
+++ b/app/client/src/workers/Evaluation/__tests__/evaluate.test.ts
@@ -2,7 +2,8 @@ import evaluate, {
   evaluateAsync,
   convertAllDataTypesToString,
 } from "workers/Evaluation/evaluate";
-import type { DataTree, WidgetEntity } from "@appsmith/entities/DataTree/types";
+import type { WidgetEntity } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { ENTITY_TYPE_VALUE } from "entities/DataTree/dataTreeFactory";
 import { RenderModes } from "constants/WidgetConstants";
 import setupEvalEnv from "../handlers/setupEvalEnv";
diff --git a/app/client/src/workers/Evaluation/__tests__/evaluation.test.ts b/app/client/src/workers/Evaluation/__tests__/evaluation.test.ts
index ff16a9cbf6..e277b90c5a 100644
--- a/app/client/src/workers/Evaluation/__tests__/evaluation.test.ts
+++ b/app/client/src/workers/Evaluation/__tests__/evaluation.test.ts
@@ -1,11 +1,10 @@
 import type {
-  ConfigTree,
   WidgetEntity,
-  UnEvalTree,
   WidgetEntityConfig,
   ActionEntityConfig,
   ActionEntity,
 } from "@appsmith/entities/DataTree/types";
+import type { UnEvalTree, ConfigTree } from "entities/DataTree/dataTreeTypes";
 import {
   ENTITY_TYPE_VALUE,
   EvaluationSubstitutionType,
@@ -988,4 +987,38 @@ describe("DataTreeEvaluator", () => {
     // @ts-expect-error: Types are not available
     expect(dataTree3.Api2.config.body).toBe("{ 'name': \"Test\" }");
   });
+  it("Prevents data mutation in eval cycle", () => {
+    const { configEntity, unEvalEntity } = generateDataTreeWidget(
+      {
+        ...BASE_WIDGET_CONFIG,
+        ...BASE_WIDGET,
+        widgetName: "TextX",
+        text: "{{Text1.text = 123}}",
+        dynamicBindingPathList: [{ key: "text" }],
+        type: "TEXT_WIDGET",
+      },
+      {},
+      new Set(),
+    );
+    const updatedUnEvalTree = {
+      ...unEvalTree,
+      TextX: unEvalEntity,
+    };
+    const updatedConfigTree = {
+      ...configTree,
+      TextX: configEntity,
+    };
+    const { evalOrder, nonDynamicFieldValidationOrder, unEvalUpdates } =
+      evaluator.setupUpdateTree(updatedUnEvalTree, updatedConfigTree);
+    expect(evalOrder).toContain("TextX.text");
+    evaluator.evalAndValidateSubTree(
+      evalOrder,
+      nonDynamicFieldValidationOrder,
+      updatedConfigTree,
+      unEvalUpdates,
+    );
+    const dataTree = evaluator.evalTree;
+    expect(dataTree).toHaveProperty("TextX.text", 123);
+    expect(dataTree).toHaveProperty("Text1.text", "Label");
+  });
 });
diff --git a/app/client/src/workers/Evaluation/__tests__/setters.test.ts b/app/client/src/workers/Evaluation/__tests__/setters.test.ts
index 3df4337fcd..c1cf7f8f8f 100644
--- a/app/client/src/workers/Evaluation/__tests__/setters.test.ts
+++ b/app/client/src/workers/Evaluation/__tests__/setters.test.ts
@@ -2,7 +2,7 @@ import { generateDataTreeWidget } from "entities/DataTree/dataTreeWidget";
 import setters from "../setters";
 import TableWidget from "widgets/TableWidgetV2/widget";
 import { RenderModes } from "constants/WidgetConstants";
-import type { ConfigTree, DataTree } from "@appsmith/entities/DataTree/types";
+import type { ConfigTree, DataTree } from "entities/DataTree/dataTreeTypes";
 import { createEvaluationContext } from "../evaluate";
 import { registerWidgets } from "WidgetProvider/factory/registrationHelper";
 
diff --git a/app/client/src/workers/Evaluation/__tests__/timeout.test.ts b/app/client/src/workers/Evaluation/__tests__/timeout.test.ts
index c78811c365..966671e114 100644
--- a/app/client/src/workers/Evaluation/__tests__/timeout.test.ts
+++ b/app/client/src/workers/Evaluation/__tests__/timeout.test.ts
@@ -1,5 +1,6 @@
 import { PluginType } from "entities/Action";
-import type { DataTree, ActionEntity } from "@appsmith/entities/DataTree/types";
+import type { ActionEntity } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { ENTITY_TYPE_VALUE } from "entities/DataTree/dataTreeFactory";
 import { createEvaluationContext } from "../evaluate";
 import { addPlatformFunctionsToEvalContext } from "@appsmith/workers/Evaluation/Actions";
diff --git a/app/client/src/workers/Evaluation/dataStore/index.ts b/app/client/src/workers/Evaluation/dataStore/index.ts
index 71948f0b7d..b42d577d2a 100644
--- a/app/client/src/workers/Evaluation/dataStore/index.ts
+++ b/app/client/src/workers/Evaluation/dataStore/index.ts
@@ -1,6 +1,6 @@
 import { convertPathToString } from "@appsmith/workers/Evaluation/evaluationUtils";
 import type { Diff } from "deep-diff";
-import type { DataTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { get, set, unset } from "lodash";
 
 export type TDataStore = Record<string, Record<string, unknown>>;
@@ -8,27 +8,32 @@ export default class DataStore {
   private static store: TDataStore = {};
 
   static setActionData(fullPath: string, value: unknown) {
-    set(this.store, fullPath, value);
+    set(DataStore.store, fullPath, value);
   }
 
   static getActionData(fullPath: string): unknown | undefined {
-    return get(this.store, fullPath, undefined);
+    return get(DataStore.store, fullPath, undefined);
   }
   static getDataStore() {
-    return this.store;
+    return DataStore.store;
   }
   static deleteActionData(fullPath: string) {
-    unset(this.store, fullPath);
+    unset(DataStore.store, fullPath);
   }
   static clear() {
-    this.store = {};
+    DataStore.store = {};
   }
+
+  static replaceDataStore(store: TDataStore) {
+    DataStore.store = store;
+  }
+
   static update(dataTreeDiff: Diff<DataTree, DataTree>[]) {
     const deleteDiffs = dataTreeDiff.filter((diff) => diff.kind === "D");
     deleteDiffs.forEach((diff) => {
       const deletedPath = diff.path || [];
       const deletedPathString = convertPathToString(deletedPath);
-      this.deleteActionData(deletedPathString);
+      DataStore.deleteActionData(deletedPathString);
     });
   }
 }
diff --git a/app/client/src/workers/Evaluation/dataStore/utils.ts b/app/client/src/workers/Evaluation/dataStore/utils.ts
index 5d23d3d8f0..eddce7c81b 100644
--- a/app/client/src/workers/Evaluation/dataStore/utils.ts
+++ b/app/client/src/workers/Evaluation/dataStore/utils.ts
@@ -1,4 +1,4 @@
-import type { DataTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import type { TDataStore } from ".";
 import {
   isAction,
diff --git a/app/client/src/workers/Evaluation/domApis.ts b/app/client/src/workers/Evaluation/domApis.ts
index e481d5ba2a..acfadf32ea 100644
--- a/app/client/src/workers/Evaluation/domApis.ts
+++ b/app/client/src/workers/Evaluation/domApis.ts
@@ -96,9 +96,12 @@ const DOM_API_NAMES = [
   "toJSON",
 ] as const;
 
-const DOM_APIS = DOM_API_NAMES.reduce((acc, key) => {
-  acc[key] = true;
-  return acc;
-}, {} as Record<string, true | undefined>);
+const DOM_APIS = DOM_API_NAMES.reduce(
+  (acc, key) => {
+    acc[key] = true;
+    return acc;
+  },
+  {} as Record<string, true | undefined>,
+);
 
 export default DOM_APIS;
diff --git a/app/client/src/workers/Evaluation/errorModifier.ts b/app/client/src/workers/Evaluation/errorModifier.ts
index f8fa16ed33..701c091582 100644
--- a/app/client/src/workers/Evaluation/errorModifier.ts
+++ b/app/client/src/workers/Evaluation/errorModifier.ts
@@ -1,4 +1,4 @@
-import type { ConfigTree, DataTree } from "@appsmith/entities/DataTree/types";
+import type { ConfigTree, DataTree } from "entities/DataTree/dataTreeTypes";
 import { getAllAsyncFunctions } from "@appsmith/workers/Evaluation/Actions";
 import type { EvaluationError } from "utils/DynamicBindingUtils";
 import { PropertyEvaluationErrorCategory } from "utils/DynamicBindingUtils";
diff --git a/app/client/src/workers/Evaluation/evalTreeWithChanges.ts b/app/client/src/workers/Evaluation/evalTreeWithChanges.ts
index 0f9d8d4693..413840c1e0 100644
--- a/app/client/src/workers/Evaluation/evalTreeWithChanges.ts
+++ b/app/client/src/workers/Evaluation/evalTreeWithChanges.ts
@@ -2,7 +2,7 @@ import type {
   ConfigTree,
   DataTree,
   UnEvalTree,
-} from "@appsmith/entities/DataTree/types";
+} from "entities/DataTree/dataTreeTypes";
 import { dataTreeEvaluator } from "./handlers/evalTree";
 import type { DataTreeDiff } from "@appsmith/workers/Evaluation/evaluationUtils";
 import type { EvalMetaUpdates } from "@appsmith/workers/common/DataTreeEvaluator/types";
@@ -13,7 +13,6 @@ import { MessageType, sendMessage } from "utils/MessageUtil";
 import { MAIN_THREAD_ACTION } from "@appsmith/workers/Evaluation/evalWorkerActions";
 import type { UpdateDataTreeMessageData } from "sagas/EvalWorkerActionSagas";
 import type { JSUpdate } from "utils/JSPaneUtils";
-import { setEvalContext } from "./evaluate";
 import { generateOptimisedUpdatesAndSetPrevState } from "./helpers";
 
 export function evalTreeWithChanges(
@@ -55,13 +54,6 @@ export function evalTreeWithChanges(
 
     reValidatedPaths = updateResponse.reValidatedPaths;
 
-    setEvalContext({
-      dataTree: dataTreeEvaluator.getEvalTree(),
-      configTree: dataTreeEvaluator.getConfigTree(),
-      isDataField: false,
-      isTriggerBased: true,
-    });
-
     dataTree = makeEntityConfigsAsObjProperties(dataTreeEvaluator.evalTree, {
       evalProps: dataTreeEvaluator.evalProps,
       identicalEvalPathsPatches:
diff --git a/app/client/src/workers/Evaluation/evaluate.ts b/app/client/src/workers/Evaluation/evaluate.ts
index 815da264bc..78b22242e4 100644
--- a/app/client/src/workers/Evaluation/evaluate.ts
+++ b/app/client/src/workers/Evaluation/evaluate.ts
@@ -3,7 +3,7 @@ import type {
   ConfigTree,
   DataTree,
   DataTreeEntity,
-} from "@appsmith/entities/DataTree/types";
+} from "entities/DataTree/dataTreeTypes";
 import type { EvaluationError } from "utils/DynamicBindingUtils";
 import { PropertyEvaluationErrorType } from "utils/DynamicBindingUtils";
 import unescapeJS from "unescape-js";
@@ -18,10 +18,10 @@ import { addDataTreeToContext } from "@appsmith/workers/Evaluation/Actions";
 import log from "loglevel";
 import * as Sentry from "@sentry/react";
 
-export type EvalResult = {
+export interface EvalResult {
   result: any;
   errors: EvaluationError[];
-};
+}
 
 export enum EvaluationScriptType {
   EXPRESSION = "EXPRESSION",
@@ -187,13 +187,13 @@ export function sanitizeScript(js: string) {
  * globalContext will define it globally
  * requestId is used for completing promises
  */
-export type EvaluateContext = {
+export interface EvaluateContext {
   thisContext?: Record<string, any>;
   globalContext?: Record<string, any>;
   requestId?: string;
   eventType?: EventType;
   triggerMeta?: TriggerMeta;
-};
+}
 
 export const getUserScriptToEvaluate = (
   userScript: string,
diff --git a/app/client/src/workers/Evaluation/fns/__tests__/LocalStorage.test.ts b/app/client/src/workers/Evaluation/fns/__tests__/LocalStorage.test.ts
index f7d4ecd421..296e460a85 100644
--- a/app/client/src/workers/Evaluation/fns/__tests__/LocalStorage.test.ts
+++ b/app/client/src/workers/Evaluation/fns/__tests__/LocalStorage.test.ts
@@ -1,6 +1,7 @@
 import { addPlatformFunctionsToEvalContext } from "@appsmith/workers/Evaluation/Actions";
 import { PluginType } from "entities/Action";
-import type { DataTree, ActionEntity } from "@appsmith/entities/DataTree/types";
+import type { ActionEntity } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { createEvaluationContext } from "workers/Evaluation/evaluate";
 import initLocalStorage from "../overrides/localStorage";
 import { ENTITY_TYPE } from "pages/common/SearchSnippets";
diff --git a/app/client/src/workers/Evaluation/fns/__tests__/interval.test.ts b/app/client/src/workers/Evaluation/fns/__tests__/interval.test.ts
index c4d17b33e6..a28445581b 100644
--- a/app/client/src/workers/Evaluation/fns/__tests__/interval.test.ts
+++ b/app/client/src/workers/Evaluation/fns/__tests__/interval.test.ts
@@ -2,7 +2,8 @@ jest.useFakeTimers();
 
 import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
 import { PluginType } from "entities/Action";
-import type { DataTree, ActionEntity } from "@appsmith/entities/DataTree/types";
+import type { ActionEntity } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { ENTITY_TYPE_VALUE } from "entities/DataTree/dataTreeFactory";
 import { overrideWebAPIs } from "../overrides";
 import ExecutionMetaData from "../utils/ExecutionMetaData";
diff --git a/app/client/src/workers/Evaluation/fns/index.ts b/app/client/src/workers/Evaluation/fns/index.ts
index 73e737edc9..c0d56d0ff7 100644
--- a/app/client/src/workers/Evaluation/fns/index.ts
+++ b/app/client/src/workers/Evaluation/fns/index.ts
@@ -46,10 +46,8 @@ import {
   isAction,
   isAppsmithEntity,
 } from "@appsmith/workers/Evaluation/evaluationUtils";
-import type {
-  DataTreeEntity,
-  ActionEntity,
-} from "@appsmith/entities/DataTree/types";
+import type { ActionEntity } from "@appsmith/entities/DataTree/types";
+import type { DataTreeEntity } from "entities/DataTree/dataTreeTypes";
 import type {
   TGetGeoLocationActionType,
   TGetGeoLocationDescription,
@@ -65,9 +63,7 @@ import {
 } from "./geolocationFns";
 import { getFnWithGuards, isAsyncGuard } from "./utils/fnGuard";
 
-// cloudHosting -> to use in EE
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export const getPlatformFunctions = (cloudHosting: boolean) => {
+export const getPlatformFunctions = () => {
   return platformFns;
 };
 
@@ -189,11 +185,7 @@ export type ActionTriggerKeys =
   | TWatchGeoLocationActionType
   | TStopWatchGeoLocationActionType;
 
-export const getActionTriggerFunctionNames = (
-  // cloudHosting -> to use in ee
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  cloudHosting: boolean,
-): Record<string, string> => {
+export const getActionTriggerFunctionNames = (): Record<string, string> => {
   return ActionTriggerFunctionNames;
 };
 
diff --git a/app/client/src/workers/Evaluation/fns/mock.ts b/app/client/src/workers/Evaluation/fns/mock.ts
index 2899f040d0..392b70d9da 100644
--- a/app/client/src/workers/Evaluation/fns/mock.ts
+++ b/app/client/src/workers/Evaluation/fns/mock.ts
@@ -1,4 +1,4 @@
-import type { DataTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import { ENTITY_TYPE } from "pages/common/SearchSnippets";
 import { createEvaluationContext } from "workers/Evaluation/evaluate";
 
diff --git a/app/client/src/workers/Evaluation/fns/storeFns.ts b/app/client/src/workers/Evaluation/fns/storeFns.ts
index ea308f9682..e9605ab2dc 100644
--- a/app/client/src/workers/Evaluation/fns/storeFns.ts
+++ b/app/client/src/workers/Evaluation/fns/storeFns.ts
@@ -1,5 +1,7 @@
 import set from "lodash/set";
 import TriggerEmitter, { BatchKey } from "./utils/TriggerEmitter";
+import { dataTreeEvaluator } from "../handlers/evalTree";
+import unset from "lodash/unset";
 
 function storeFnDescriptor(key: string, value: string, persist = true) {
   return {
@@ -22,7 +24,10 @@ export async function storeValue(
   value: string,
   persist = true,
 ) {
-  set(this, ["appsmith", "store", key], value);
+  const evalTree = dataTreeEvaluator?.getEvalTree();
+  const path = ["appsmith", "store", key];
+  if (evalTree) set(evalTree, path, value);
+  set(this, path, value);
   TriggerEmitter.emit(
     BatchKey.process_store_updates,
     storeFnDescriptor(key, value, persist),
@@ -46,7 +51,10 @@ export type TRemoveValueDescription = ReturnType<
 export type TRemoveValueActionType = TRemoveValueDescription["type"];
 
 export async function removeValue(this: any, key: string) {
-  delete this.appsmith.store[key];
+  const evalTree = dataTreeEvaluator?.getEvalTree();
+  const path = ["appsmith", "store", key];
+  if (evalTree) unset(evalTree, path);
+  unset(this, path);
   TriggerEmitter.emit(
     BatchKey.process_store_updates,
     removeValueFnDescriptor(key),
@@ -66,6 +74,8 @@ export type TClearStoreDescription = ReturnType<typeof clearStoreFnDescriptor>;
 export type TClearStoreActionType = TClearStoreDescription["type"];
 
 export async function clearStore(this: any) {
+  const evalTree = dataTreeEvaluator?.getEvalTree();
+  if (evalTree) set(evalTree, ["appsmith", "store"], {});
   this.appsmith.store = {};
   TriggerEmitter.emit(BatchKey.process_store_updates, clearStoreFnDescriptor());
   return {};
diff --git a/app/client/src/workers/Evaluation/fns/utils/jsObjectFnFactory.ts b/app/client/src/workers/Evaluation/fns/utils/jsObjectFnFactory.ts
index 63e0f9d5f8..ae36010961 100644
--- a/app/client/src/workers/Evaluation/fns/utils/jsObjectFnFactory.ts
+++ b/app/client/src/workers/Evaluation/fns/utils/jsObjectFnFactory.ts
@@ -11,12 +11,12 @@ declare global {
     ) => any;
   }
 }
-export type PostProcessorArg = {
+export interface PostProcessorArg {
   executionMetaData: ReturnType<typeof ExecutionMetaData.getExecutionMetaData>;
   jsFnFullName: string;
   executionResponse: unknown;
   isSuccess: boolean;
-};
+}
 
 export type PostProcessor = (args: PostProcessorArg) => void;
 export interface JSExecutionData {
diff --git a/app/client/src/workers/Evaluation/getEntityForContext.ts b/app/client/src/workers/Evaluation/getEntityForContext.ts
index 592d098b5a..8037878d76 100644
--- a/app/client/src/workers/Evaluation/getEntityForContext.ts
+++ b/app/client/src/workers/Evaluation/getEntityForContext.ts
@@ -1,7 +1,5 @@
-import type {
-  DataTreeEntity,
-  JSActionEntity,
-} from "@appsmith/entities/DataTree/types";
+import type { JSActionEntity } from "@appsmith/entities/DataTree/types";
+import type { DataTreeEntity } from "entities/DataTree/dataTreeTypes";
 import { ENTITY_TYPE_VALUE } from "entities/DataTree/dataTreeFactory";
 import JSObjectCollection from "./JSObject/Collection";
 import { jsObjectFunctionFactory } from "./fns/utils/jsObjectFnFactory";
diff --git a/app/client/src/workers/Evaluation/handlers/evalExpression.ts b/app/client/src/workers/Evaluation/handlers/evalExpression.ts
index 9f48afc9ec..3018159cec 100644
--- a/app/client/src/workers/Evaluation/handlers/evalExpression.ts
+++ b/app/client/src/workers/Evaluation/handlers/evalExpression.ts
@@ -1,3 +1,4 @@
+import { klona } from "klona/full";
 import { evaluateAsync } from "../evaluate";
 import type { EvalWorkerASyncRequest } from "../types";
 import { dataTreeEvaluator } from "./evalTree";
@@ -8,5 +9,5 @@ export default function (request: EvalWorkerASyncRequest) {
   const evalTree = dataTreeEvaluator?.evalTree;
   const configTree = dataTreeEvaluator?.configTree;
   if (!evalTree || !configTree) return {};
-  return evaluateAsync(expression, evalTree, configTree, {}, undefined);
+  return evaluateAsync(expression, klona(evalTree), configTree, {}, undefined);
 }
diff --git a/app/client/src/workers/Evaluation/handlers/evalTree.ts b/app/client/src/workers/Evaluation/handlers/evalTree.ts
index 4cea458c17..4d8a58853d 100644
--- a/app/client/src/workers/Evaluation/handlers/evalTree.ts
+++ b/app/client/src/workers/Evaluation/handlers/evalTree.ts
@@ -1,4 +1,4 @@
-import type { ConfigTree, DataTree } from "@appsmith/entities/DataTree/types";
+import type { ConfigTree, DataTree } from "entities/DataTree/dataTreeTypes";
 import type ReplayEntity from "entities/Replay";
 import ReplayCanvas from "entities/Replay/ReplayEntity/ReplayCanvas";
 import { isEmpty } from "lodash";
@@ -20,7 +20,6 @@ import type {
 } from "../types";
 import { clearAllIntervals } from "../fns/overrides/interval";
 import JSObjectCollection from "workers/Evaluation/JSObject/Collection";
-import { setEvalContext } from "../evaluate";
 import { getJSVariableCreatedEvents } from "../JSObject/JSVariableEvents";
 import { errorModifier } from "../errorModifier";
 import { generateOptimisedUpdatesAndSetPrevState } from "../helpers";
@@ -117,13 +116,6 @@ export default function (request: EvalWorkerSyncRequest) {
 
       const dataTreeResponse = dataTreeEvaluator.evalAndValidateFirstTree();
 
-      setEvalContext({
-        dataTree: dataTreeEvaluator.evalTree,
-        configTree,
-        isDataField: false,
-        isTriggerBased: true,
-      });
-
       dataTree = makeEntityConfigsAsObjProperties(dataTreeResponse.evalTree, {
         evalProps: dataTreeEvaluator.evalProps,
         identicalEvalPathsPatches:
@@ -164,13 +156,6 @@ export default function (request: EvalWorkerSyncRequest) {
 
       reValidatedPaths = updateResponse.reValidatedPaths;
 
-      setEvalContext({
-        dataTree: dataTreeEvaluator.evalTree,
-        configTree,
-        isDataField: false,
-        isTriggerBased: true,
-      });
-
       dataTree = makeEntityConfigsAsObjProperties(dataTreeEvaluator.evalTree, {
         evalProps: dataTreeEvaluator.evalProps,
         identicalEvalPathsPatches:
diff --git a/app/client/src/workers/Evaluation/handlers/evalTrigger.ts b/app/client/src/workers/Evaluation/handlers/evalTrigger.ts
index 33732a6e3a..8970a242ca 100644
--- a/app/client/src/workers/Evaluation/handlers/evalTrigger.ts
+++ b/app/client/src/workers/Evaluation/handlers/evalTrigger.ts
@@ -24,17 +24,16 @@ export default async function (request: EvalWorkerASyncRequest) {
       unEvalTree.configTree,
     );
 
-  dataTreeEvaluator.evalAndValidateSubTree(
+  const { contextTree } = dataTreeEvaluator.evalAndValidateSubTree(
     evalOrder,
     nonDynamicFieldValidationOrder,
     unEvalTree.configTree,
     unEvalUpdates,
   );
-  const evalTree = dataTreeEvaluator.evalTree;
 
   return dataTreeEvaluator.evaluateTriggers(
     dynamicTrigger,
-    evalTree,
+    contextTree,
     unEvalTree.configTree,
     callbackData,
     {
diff --git a/app/client/src/workers/Evaluation/handlers/jsLibrary.ts b/app/client/src/workers/Evaluation/handlers/jsLibrary.ts
index 600d2ba89e..f45992d918 100644
--- a/app/client/src/workers/Evaluation/handlers/jsLibrary.ts
+++ b/app/client/src/workers/Evaluation/handlers/jsLibrary.ts
@@ -306,8 +306,8 @@ function generateUniqueAccessor(
   ) {
     return validVar;
   }
-  const index = 1;
-  while (true && index < 100) {
+  let index = 0;
+  while (index++ < 100) {
     const name = `Library_${index}`;
     if (!takenAccessors.includes(name) && !takenNamesMap.hasOwnProperty(name)) {
       return name;
diff --git a/app/client/src/workers/Evaluation/handlers/setupEvalEnv.ts b/app/client/src/workers/Evaluation/handlers/setupEvalEnv.ts
index 0a9e7b5b65..fed0addbbe 100644
--- a/app/client/src/workers/Evaluation/handlers/setupEvalEnv.ts
+++ b/app/client/src/workers/Evaluation/handlers/setupEvalEnv.ts
@@ -3,6 +3,7 @@ import setupDOM from "../SetupDOM";
 import type { EvalWorkerSyncRequest } from "../types";
 import { addPlatformFunctionsToEvalContext } from "@appsmith/workers/Evaluation/Actions";
 import { overrideWebAPIs } from "../fns/overrides";
+import { WorkerEnv } from "./workerEnv";
 
 export default function (request: EvalWorkerSyncRequest) {
   self.$isDataField = false;
@@ -13,10 +14,9 @@ export default function (request: EvalWorkerSyncRequest) {
   });
   setupDOM();
   overrideWebAPIs(self);
-  Object.defineProperty(self, "$cloudHosting", {
-    value: request.data.cloudHosting,
-    enumerable: false,
-  });
+
+  WorkerEnv.setFeatureFlags(request.data.featureFlags);
+  WorkerEnv.setCloudHosting(request.data.cloudHosting);
   addPlatformFunctionsToEvalContext(self);
   return true;
 }
diff --git a/app/client/src/workers/Evaluation/handlers/workerEnv.ts b/app/client/src/workers/Evaluation/handlers/workerEnv.ts
new file mode 100644
index 0000000000..3f0be4ba9f
--- /dev/null
+++ b/app/client/src/workers/Evaluation/handlers/workerEnv.ts
@@ -0,0 +1,22 @@
+import type { FeatureFlags } from "@appsmith/entities/FeatureFlag";
+
+export class WorkerEnv {
+  static flags: any;
+  static cloudHosting: boolean;
+
+  static setFeatureFlags(featureFlags: FeatureFlags) {
+    WorkerEnv.flags = featureFlags;
+  }
+
+  static setCloudHosting(cloudHosting: boolean) {
+    WorkerEnv.cloudHosting = cloudHosting;
+  }
+
+  static getFeatureFlags() {
+    return WorkerEnv.flags;
+  }
+
+  static getCloudHosting() {
+    return WorkerEnv.cloudHosting;
+  }
+}
diff --git a/app/client/src/workers/Evaluation/helpers.ts b/app/client/src/workers/Evaluation/helpers.ts
index d56eec7ce6..be22577896 100644
--- a/app/client/src/workers/Evaluation/helpers.ts
+++ b/app/client/src/workers/Evaluation/helpers.ts
@@ -1,7 +1,7 @@
 import { serialiseToBigInt } from "@appsmith/workers/Evaluation/evaluationUtils";
 import type { Diff } from "deep-diff";
 import { diff } from "deep-diff";
-import type { DataTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import equal from "fast-deep-equal";
 import { get, isNumber, isObject } from "lodash";
 import { EvalErrorTypes } from "utils/DynamicBindingUtils";
diff --git a/app/client/src/workers/Evaluation/setters.ts b/app/client/src/workers/Evaluation/setters.ts
index 5c1f81afc2..b9b089f107 100644
--- a/app/client/src/workers/Evaluation/setters.ts
+++ b/app/client/src/workers/Evaluation/setters.ts
@@ -8,12 +8,12 @@ import { evalTreeWithChanges } from "./evalTreeWithChanges";
 import { dataTreeEvaluator } from "./handlers/evalTree";
 import { get, set } from "lodash";
 import { validate } from "./validations";
+import type { DataTreeEntityConfig } from "@appsmith/entities/DataTree/types";
 import type {
   ConfigTree,
   DataTree,
   DataTreeEntity,
-  DataTreeEntityConfig,
-} from "@appsmith/entities/DataTree/types";
+} from "entities/DataTree/dataTreeTypes";
 import { getFnWithGuards, isAsyncGuard } from "./fns/utils/fnGuard";
 import { shouldAddSetter } from "./evaluate";
 
diff --git a/app/client/src/workers/Evaluation/types.ts b/app/client/src/workers/Evaluation/types.ts
index c92ce164ee..ee5f1f7f82 100644
--- a/app/client/src/workers/Evaluation/types.ts
+++ b/app/client/src/workers/Evaluation/types.ts
@@ -1,7 +1,7 @@
 import type {
   ConfigTree,
   unEvalAndConfigTree,
-} from "@appsmith/entities/DataTree/types";
+} from "entities/DataTree/dataTreeTypes";
 import type { ActionValidationConfigMap } from "constants/PropertyControlConstants";
 import type { AppTheme } from "entities/AppTheming";
 
diff --git a/app/client/src/workers/common/DataTreeEvaluator/index.ts b/app/client/src/workers/common/DataTreeEvaluator/index.ts
index 0cdf836b56..2b536045a5 100644
--- a/app/client/src/workers/common/DataTreeEvaluator/index.ts
+++ b/app/client/src/workers/common/DataTreeEvaluator/index.ts
@@ -19,18 +19,21 @@ import {
 } from "utils/DynamicBindingUtils";
 import type { WidgetTypeConfigMap } from "WidgetProvider/factory";
 import type {
-  DataTree,
-  DataTreeEntity,
   WidgetEntity,
-  ConfigTree,
   WidgetEntityConfig,
   DataTreeEntityConfig,
-  UnEvalTree,
   ActionEntity,
   JSActionEntity,
   JSActionEntityConfig,
   PrivateWidgets,
+  ActionEntityConfig,
 } from "@appsmith/entities/DataTree/types";
+import type {
+  DataTree,
+  DataTreeEntity,
+  ConfigTree,
+  UnEvalTree,
+} from "entities/DataTree/dataTreeTypes";
 import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory";
 import { ENTITY_TYPE_VALUE } from "@appsmith/entities/DataTree/types";
 import type { DataTreeDiff } from "@appsmith/workers/Evaluation/evaluationUtils";
@@ -50,7 +53,6 @@ import {
   trimDependantChangePaths,
   overrideWidgetProperties,
   getAllPaths,
-  isValidEntity,
   isNewEntity,
   getStaleMetaStateIds,
   convertJSFunctionsToString,
@@ -81,7 +83,10 @@ import {
   THIS_DOT_PARAMS_KEY,
 } from "constants/AppsmithActionConstants/ActionConstants";
 import type { EvalResult, EvaluateContext } from "workers/Evaluation/evaluate";
-import evaluateSync, { evaluateAsync } from "workers/Evaluation/evaluate";
+import evaluateSync, {
+  evaluateAsync,
+  setEvalContext,
+} from "workers/Evaluation/evaluate";
 import { substituteDynamicBindingWithValues } from "workers/Evaluation/evaluationSubstitution";
 import { Severity } from "entities/AppsmithConsole";
 import { error as logError } from "loglevel";
@@ -123,9 +128,9 @@ import DataStore from "workers/Evaluation/dataStore";
 import { updateTreeWithData } from "workers/Evaluation/dataStore/utils";
 
 type SortedDependencies = Array<string>;
-export type EvalProps = {
+export interface EvalProps {
   [entityName: string]: DataTreeEvaluationProps;
-};
+}
 
 export type EvalPathsIdenticalToState = Record<string, string>;
 export default class DataTreeEvaluator {
@@ -338,9 +343,10 @@ export default class DataTreeEvaluator {
 
     const evaluationOrder = this.sortedDependencies;
 
+    const unEvalTreeClone = klonaJSON(this.oldUnEvalTree);
     // Evaluate
     const { evalMetaUpdates, evaluatedTree, staleMetaIds } = this.evaluateTree(
-      this.oldUnEvalTree,
+      unEvalTreeClone,
       evaluationOrder,
       undefined,
       this.oldConfigTree,
@@ -644,15 +650,15 @@ export default class DataTreeEvaluator {
     },
   ) {
     const {
+      configTree,
       dependenciesOfRemovedPaths = [],
+      findDifferenceTime = "0",
+      isNewWidgetAdded,
+      pathsToSkipFromEval = [],
       removedPaths = [],
       totalUpdateTreeSetupStartTime = performance.now(),
       translatedDiffs = [],
-      pathsToSkipFromEval = [],
-      findDifferenceTime = "0",
       updateDependencyMapTime = "0",
-      configTree,
-      isNewWidgetAdded,
     } = extraParams;
 
     updateEvalTreeWithJSCollectionState(this.evalTree, this.oldUnEvalTree);
@@ -771,10 +777,12 @@ export default class DataTreeEvaluator {
     evalMetaUpdates: EvalMetaUpdates;
     staleMetaIds: string[];
     reValidatedPaths: string[];
+    contextTree: DataTree;
   } {
     const evaluationStartTime = performance.now();
 
     const {
+      contextTree,
       evalMetaUpdates,
       evaluatedTree: newEvalTree,
       staleMetaIds,
@@ -818,6 +826,7 @@ export default class DataTreeEvaluator {
       evalMetaUpdates,
       staleMetaIds,
       reValidatedPaths: pathsToValidate,
+      contextTree,
     };
   }
 
@@ -919,7 +928,7 @@ export default class DataTreeEvaluator {
   }
 
   evaluateTree(
-    oldUnevalTree: DataTree,
+    unEvalTree: DataTree,
     evaluationOrder: Array<string>,
     options: {
       isFirstTree: boolean;
@@ -935,12 +944,24 @@ export default class DataTreeEvaluator {
     evaluatedTree: DataTree;
     evalMetaUpdates: EvalMetaUpdates;
     staleMetaIds: string[];
+    contextTree: DataTree;
   } {
-    const tree = klona(oldUnevalTree);
-    updateTreeWithData(tree, klonaJSON(DataStore.getDataStore()));
+    const safeTree = klona(unEvalTree);
+    const dataStore = DataStore.getDataStore();
+    const dataStoreClone = klonaJSON(dataStore);
 
+    updateTreeWithData(safeTree, dataStoreClone);
+    updateTreeWithData(unEvalTree, dataStore);
+
+    /**
+     * contextTree is a mutable dataTree, it gets passed as a context for each evaluation
+     * and gets updated both, with evaluated values and mutations.
+     *
+     * SafeTree is free of mutations because we make sure to only set evaluated values into it.
+     */
+    const contextTree = unEvalTree;
     errorModifier.updateAsyncFunctions(
-      tree,
+      contextTree,
       this.getConfigTree(),
       this.dependencyMap,
     );
@@ -949,248 +970,279 @@ export default class DataTreeEvaluator {
     const { isFirstTree, metaWidgets, unevalUpdates } = options;
     let staleMetaIds: string[] = [];
     try {
-      const evaluatedTree = evaluationOrder.reduce(
-        (currentTree: DataTree, fullPropertyPath: string) => {
-          const { entityName, propertyPath } =
-            getEntityNameAndPropertyPath(fullPropertyPath);
-          const entity = currentTree[entityName];
-          const entityConfig = oldConfigTree[entityName];
-          if (!isWidgetActionOrJsObject(entity, entityConfig))
-            return currentTree;
-          let unEvalPropertyValue = get(currentTree as any, fullPropertyPath);
+      for (const fullPropertyPath of evaluationOrder) {
+        const { entityName, propertyPath } =
+          getEntityNameAndPropertyPath(fullPropertyPath);
+        const entity = contextTree[entityName];
+        const entityConfig = oldConfigTree[entityName];
+        if (!isWidgetActionOrJsObject(entity, entityConfig)) continue;
 
-          const isADynamicBindingPath = isAPathDynamicBindingPath(
-            entity,
-            entityConfig,
+        let unEvalPropertyValue = get(contextTree as any, fullPropertyPath);
+
+        const isADynamicBindingPath = isAPathDynamicBindingPath(
+          entity,
+          entityConfig,
+          propertyPath,
+        );
+
+        const isATriggerPath =
+          isWidget(entity) &&
+          isPathDynamicTrigger(
+            entityConfig as WidgetEntityConfig,
             propertyPath,
           );
+        let evalPropertyValue;
+        const requiresEval =
+          isADynamicBindingPath &&
+          !isATriggerPath &&
+          (isDynamicValue(unEvalPropertyValue) || isJSAction(entity));
+        if (propertyPath) {
+          set(this.evalProps, getEvalErrorPath(fullPropertyPath), []);
+        }
 
-          const isATriggerPath =
-            isWidget(entity) &&
-            isPathDynamicTrigger(
-              entityConfig as WidgetEntityConfig,
-              propertyPath,
+        if (requiresEval) {
+          const evaluationSubstitutionType =
+            (!isEmpty(entityConfig.reactivePaths) &&
+              entityConfig.reactivePaths[propertyPath]) ||
+            EvaluationSubstitutionType.TEMPLATE;
+
+          const contextData: EvaluateContext = {};
+          if (isAction(entity)) {
+            // Add empty object for this.params to avoid undefined errors
+            contextData.globalContext = {
+              [THIS_DOT_PARAMS_KEY]: {},
+            };
+
+            unEvalPropertyValue = replaceThisDotParams(unEvalPropertyValue);
+          }
+          try {
+            evalPropertyValue = this.getDynamicValue(
+              unEvalPropertyValue,
+              contextTree,
+              oldConfigTree,
+              evaluationSubstitutionType,
+              contextData,
+              undefined,
+              fullPropertyPath,
             );
-          let evalPropertyValue;
-          const requiresEval =
-            isADynamicBindingPath &&
-            !isATriggerPath &&
-            (isDynamicValue(unEvalPropertyValue) || isJSAction(entity));
-          if (propertyPath) {
-            set(this.evalProps, getEvalErrorPath(fullPropertyPath), []);
+          } catch (error) {
+            this.errors.push({
+              type: EvalErrorTypes.EVAL_PROPERTY_ERROR,
+              message: (error as Error).message,
+              context: {
+                propertyPath: fullPropertyPath,
+              },
+            });
+            evalPropertyValue = undefined;
           }
+        } else {
+          evalPropertyValue = unEvalPropertyValue;
+        }
 
-          if (requiresEval) {
-            const evaluationSubstitutionType =
-              (!!entityConfig &&
-                entityConfig.hasOwnProperty("reactivePaths") &&
-                entityConfig.reactivePaths[propertyPath]) ||
-              EvaluationSubstitutionType.TEMPLATE;
+        this.updateUndefinedEvalValuesMap(
+          this.undefinedEvalValuesMap,
+          evalPropertyValue,
+          fullPropertyPath,
+        );
 
-            const contextData: EvaluateContext = {};
-            if (isAction(entity)) {
-              // Add empty object for this.params to avoid undefined errors
-              contextData.globalContext = {
-                [THIS_DOT_PARAMS_KEY]: {},
-              };
+        const entityType = entityConfig.ENTITY_TYPE;
 
-              unEvalPropertyValue = replaceThisDotParams(unEvalPropertyValue);
-            }
-            try {
-              evalPropertyValue = this.getDynamicValue(
-                unEvalPropertyValue,
-                currentTree,
-                oldConfigTree,
-                evaluationSubstitutionType,
-                contextData,
-                undefined,
-                fullPropertyPath,
-              );
-            } catch (error) {
-              this.errors.push({
-                type: EvalErrorTypes.EVAL_PROPERTY_ERROR,
-                message: (error as Error).message,
-                context: {
-                  propertyPath: fullPropertyPath,
-                },
-              });
-              evalPropertyValue = undefined;
-            }
-          } else {
-            evalPropertyValue = unEvalPropertyValue;
-          }
+        if (!propertyPath) continue;
 
-          this.updateUndefinedEvalValuesMap(
-            this.undefinedEvalValuesMap,
-            evalPropertyValue,
-            fullPropertyPath,
-          );
+        switch (entityType) {
+          case ENTITY_TYPE_VALUE.WIDGET: {
+            if (isATriggerPath) continue;
 
-          const entityType = entityConfig.ENTITY_TYPE;
+            const isNewWidget =
+              isFirstTree || isNewEntity(unevalUpdates, entityName);
 
-          if (!propertyPath)
-            return set(currentTree, fullPropertyPath, evalPropertyValue);
+            const widgetEntity = entity as WidgetEntity;
 
-          switch (entityType) {
-            case ENTITY_TYPE_VALUE.WIDGET: {
-              if (isATriggerPath) return currentTree;
+            let parsedValue = validateAndParseWidgetProperty({
+              fullPropertyPath,
+              widget: widgetEntity,
+              configTree: oldConfigTree,
+              evalPropertyValue,
+              unEvalPropertyValue,
+              evalProps: this.evalProps,
+              evalPathsIdenticalToState: this.evalPathsIdenticalToState,
+            });
 
-              const isNewWidget =
-                isFirstTree || isNewEntity(unevalUpdates, entityName);
+            parsedValue = this.getParsedValueForWidgetProperty({
+              currentTree: contextTree,
+              configTree: oldConfigTree,
+              entity: widgetEntity,
+              evalMetaUpdates,
+              fullPropertyPath,
+              parsedValue,
+              propertyPath,
+              isNewWidget,
+              safeTree,
+            });
 
-              const widgetEntity = entity as WidgetEntity;
+            // setting evalPropertyValue in unParsedEvalTree
+            set(
+              this.getUnParsedEvalTree(),
+              fullPropertyPath,
+              evalPropertyValue,
+            );
 
-              const parsedValue = validateAndParseWidgetProperty({
-                fullPropertyPath,
-                widget: widgetEntity,
-                configTree: oldConfigTree,
-                evalPropertyValue,
-                unEvalPropertyValue,
-                evalProps: this.evalProps,
-                evalPathsIdenticalToState: this.evalPathsIdenticalToState,
-              });
+            set(contextTree, fullPropertyPath, parsedValue);
+            set(safeTree, fullPropertyPath, klona(parsedValue));
 
-              this.setParsedValue({
-                currentTree,
-                configTree: oldConfigTree,
+            staleMetaIds = staleMetaIds.concat(
+              getStaleMetaStateIds({
                 entity: widgetEntity,
-                evalMetaUpdates,
-                fullPropertyPath,
-                parsedValue,
+                entityConfig: entityConfig as WidgetEntityConfig,
                 propertyPath,
                 isNewWidget,
-              });
+                metaWidgets,
+              }),
+            );
+            break;
+          }
+          case ENTITY_TYPE_VALUE.ACTION: {
+            const actionEntity = entity as ActionEntity;
 
-              // setting evalPropertyValue in unParsedEvalTree
-              set(
-                this.getUnParsedEvalTree(),
-                fullPropertyPath,
-                evalPropertyValue,
-              );
+            const configProperty = propertyPath.replace(
+              "config",
+              "actionConfiguration",
+            );
+            const validationConfig =
+              this.allActionValidationConfig?.[actionEntity.actionId]?.[
+                configProperty
+              ];
+            this.validateActionProperty(
+              fullPropertyPath,
+              actionEntity,
+              contextTree,
+              evalPropertyValue,
+              unEvalPropertyValue,
+              oldConfigTree,
+              validationConfig,
+            );
 
-              staleMetaIds = staleMetaIds.concat(
-                getStaleMetaStateIds({
-                  entity: widgetEntity,
-                  entityConfig: entityConfig as WidgetEntityConfig,
-                  propertyPath,
-                  isNewWidget,
-                  metaWidgets,
-                }),
-              );
+            if (!propertyPath) continue;
 
-              return currentTree;
-            }
-            case ENTITY_TYPE_VALUE.ACTION: {
-              if (this.allActionValidationConfig) {
-                const configProperty = propertyPath.replace(
-                  "config",
-                  "actionConfiguration",
-                );
-                const validationConfig =
-                  !!this.allActionValidationConfig[entity.actionId] &&
-                  this.allActionValidationConfig[entity.actionId][
-                    configProperty
-                  ];
-                if (!!validationConfig && !isEmpty(validationConfig)) {
-                  this.validateActionProperty(
-                    fullPropertyPath,
-                    entity as ActionEntity,
-                    currentTree,
-                    evalPropertyValue,
-                    unEvalPropertyValue,
-                    validationConfig,
-                    oldConfigTree,
-                  );
-                }
-              }
+            const evalPath = getEvalValuePath(fullPropertyPath);
+            setToEvalPathsIdenticalToState({
+              evalPath,
+              evalPathsIdenticalToState: this.evalPathsIdenticalToState,
+              evalProps: this.evalProps,
+              isParsedValueTheSame: true,
+              fullPropertyPath,
+              value: evalPropertyValue,
+            });
 
-              if (!propertyPath) return currentTree;
+            /**
+             * Perf optimization very specific to handling actions
+             * Fields like Api1.data doesn't get evaluated since it is not in dynamicBindingPathList
+             * Action validation only captures validation error and doesn't transform the evaluated values.
+             * This means that the values we are looking to set back in the 2 dataTrees are already there.
+             */
+            if (!requiresEval) continue;
 
-              const evalPath = getEvalValuePath(fullPropertyPath);
+            set(contextTree, fullPropertyPath, evalPropertyValue);
+            set(safeTree, fullPropertyPath, klona(evalPropertyValue));
+            break;
+          }
+          case ENTITY_TYPE_VALUE.JSACTION: {
+            const variableList =
+              (entityConfig as JSActionEntityConfig).variables || [];
+            if (variableList.indexOf(propertyPath) === -1) break;
+
+            const prevEvaluatedValue = get(
+              this.evalProps,
+              getEvalValuePath(fullPropertyPath, {
+                isPopulated: true,
+                fullPath: true,
+              }),
+            );
+
+            const prevUnEvalValue = JSObjectCollection.getPrevUnEvalState({
+              fullPath: fullPropertyPath,
+            });
+
+            const hasUnEvalValueModified = !isEqual(
+              prevUnEvalValue,
+              unEvalPropertyValue,
+            );
+
+            const skipVariableValueAssignment =
+              !hasUnEvalValueModified && prevEvaluatedValue;
+
+            const evalValue = skipVariableValueAssignment
+              ? prevEvaluatedValue
+              : evalPropertyValue;
+
+            const evalPath = getEvalValuePath(fullPropertyPath, {
+              isPopulated: true,
+              //what is the purpose of this argument
+              fullPath: true,
+            });
+
+            /** Variables defined in a JS object are not reactive.
+             * Their evaluated values need to be reset only when the variable is modified by the user.
+             * When uneval value of a js variable hasn't changed, it means that the previously evaluated values are in both trees already  */
+            if (skipVariableValueAssignment) {
               setToEvalPathsIdenticalToState({
                 evalPath,
                 evalPathsIdenticalToState: this.evalPathsIdenticalToState,
                 evalProps: this.evalProps,
                 isParsedValueTheSame: true,
                 fullPropertyPath,
-                value: evalPropertyValue,
+                value: evalValue,
+              });
+            } else {
+              const valueForSafeTree = klona(evalValue);
+              setToEvalPathsIdenticalToState({
+                evalPath,
+                evalPathsIdenticalToState: this.evalPathsIdenticalToState,
+                evalProps: this.evalProps,
+                isParsedValueTheSame: true,
+                fullPropertyPath,
+                value: valueForSafeTree,
               });
 
-              set(currentTree, fullPropertyPath, evalPropertyValue);
-              return currentTree;
+              set(contextTree, fullPropertyPath, evalValue);
+              set(safeTree, fullPropertyPath, valueForSafeTree);
+              JSObjectCollection.setVariableValue(evalValue, fullPropertyPath);
+              JSObjectCollection.setPrevUnEvalState({
+                fullPath: fullPropertyPath,
+                unEvalValue: unEvalPropertyValue,
+              });
             }
-            case ENTITY_TYPE_VALUE.JSACTION: {
-              const variableList =
-                (entityConfig as JSActionEntityConfig).variables || [];
-
-              if (variableList.indexOf(propertyPath) > -1) {
-                const prevEvaluatedValue = get(
-                  this.evalProps,
-                  getEvalValuePath(fullPropertyPath, {
-                    isPopulated: true,
-                    fullPath: true,
-                  }),
-                );
-
-                const prevUnEvalValue = JSObjectCollection.getPrevUnEvalState({
-                  fullPath: fullPropertyPath,
-                });
-
-                const hasUnEvalValueModified = !isEqual(
-                  prevUnEvalValue,
-                  unEvalPropertyValue,
-                );
-
-                const evalValue =
-                  !hasUnEvalValueModified && prevEvaluatedValue
-                    ? prevEvaluatedValue
-                    : evalPropertyValue;
-
-                const evalPath = getEvalValuePath(fullPropertyPath, {
-                  isPopulated: true,
-                  //what is the purpose of this argument
-                  fullPath: true,
-                });
-
-                setToEvalPathsIdenticalToState({
-                  evalPath,
-                  evalPathsIdenticalToState: this.evalPathsIdenticalToState,
-                  evalProps: this.evalProps,
-                  isParsedValueTheSame: true,
-                  fullPropertyPath,
-                  value: evalValue,
-                });
-
-                set(currentTree, fullPropertyPath, evalValue);
-                JSObjectCollection.setVariableValue(
-                  evalValue,
-                  fullPropertyPath,
-                );
-                JSObjectCollection.setPrevUnEvalState({
-                  fullPath: fullPropertyPath,
-                  unEvalValue: unEvalPropertyValue,
-                });
-              }
-              return currentTree;
-            }
-            default:
-              return set(currentTree, fullPropertyPath, evalPropertyValue);
+            break;
           }
-        },
-        tree,
-      );
-
-      return {
-        evaluatedTree,
-        evalMetaUpdates,
-        staleMetaIds: staleMetaIds,
-      };
+          default:
+            set(contextTree, fullPropertyPath, evalPropertyValue);
+            set(safeTree, fullPropertyPath, klona(evalPropertyValue));
+        }
+      }
     } catch (error) {
+      staleMetaIds = [];
       this.errors.push({
         type: EvalErrorTypes.EVAL_TREE_ERROR,
         message: (error as Error).message,
       });
-      return { evaluatedTree: tree, evalMetaUpdates, staleMetaIds: [] };
+    } finally {
+      // Restore the dataStore since it was a part of contextTree and prone to mutation.
+      DataStore.replaceDataStore(dataStoreClone);
+
+      // The below statement restores the execution context for async tasks are probably queued.
+      setEvalContext({
+        dataTree: contextTree,
+        configTree: oldConfigTree,
+        isDataField: false,
+        isTriggerBased: true,
+      });
+
+      return {
+        evaluatedTree: safeTree,
+        contextTree: contextTree,
+        evalMetaUpdates,
+        staleMetaIds,
+      };
     }
   }
 
@@ -1231,7 +1283,8 @@ export default class DataTreeEvaluator {
       if (entity && isWidget(entity)) {
         entityType = entity.type;
       } else if (entity && isAction(entity)) {
-        entityType = entityConfig.pluginType;
+        const actionEntityConfig = entityConfig as ActionEntityConfig;
+        entityType = actionEntityConfig.pluginType;
       } else if (entity && isJSAction(entity)) {
         entityType = entity.ENTITY_TYPE;
       }
@@ -1446,7 +1499,7 @@ export default class DataTreeEvaluator {
     return evalResponse;
   }
 
-  setParsedValue({
+  getParsedValueForWidgetProperty({
     configTree,
     currentTree,
     entity,
@@ -1455,6 +1508,7 @@ export default class DataTreeEvaluator {
     isNewWidget,
     parsedValue,
     propertyPath,
+    safeTree,
   }: {
     currentTree: DataTree;
     configTree: ConfigTree;
@@ -1464,6 +1518,7 @@ export default class DataTreeEvaluator {
     isNewWidget: boolean;
     parsedValue: unknown;
     propertyPath: string;
+    safeTree?: DataTree;
   }) {
     const overwriteObj = overrideWidgetProperties({
       entity,
@@ -1474,13 +1529,14 @@ export default class DataTreeEvaluator {
       evalMetaUpdates,
       fullPropertyPath,
       isNewWidget,
+      safeTree,
     });
 
     if (overwriteObj && overwriteObj.overwriteParsedValue) {
       parsedValue = overwriteObj.newValue;
     }
-    // setting parseValue in dataTree
-    set(currentTree, fullPropertyPath, parsedValue);
+
+    return parsedValue;
   }
 
   validateEntityDependentProperty({
@@ -1535,55 +1591,36 @@ export default class DataTreeEvaluator {
     currentTree: DataTree,
     evalPropertyValue: any,
     unEvalPropertyValue: string,
-    validationConfig: ValidationConfig,
     configTree: ConfigTree,
+    validationConfig?: ValidationConfig,
   ) {
-    if (evalPropertyValue && validationConfig) {
-      // runs VALIDATOR function and returns errors
-      const { isValid, messages } = validateActionProperty(
-        validationConfig,
-        evalPropertyValue,
-      );
-      if (!isValid) {
-        resetValidationErrorsForEntityProperty({
-          evalProps: this.evalProps,
-          fullPropertyPath,
-        });
-        const evalErrors: EvaluationError[] =
-          messages?.map((message) => {
-            return {
-              raw: unEvalPropertyValue,
-              errorMessage: message || { name: "", text: "" },
-              errorType: PropertyEvaluationErrorType.VALIDATION,
-              severity: Severity.ERROR,
-            };
-          }) ?? [];
-        // saves error in dataTree at fullPropertyPath
-        // Later errors can consumed by the forms and debugger
-        addErrorToEntityProperty({
-          errors: evalErrors,
-          evalProps: this.evalProps,
-          fullPropertyPath,
-          configTree,
-        });
-      }
-    }
-  }
-
-  /**
-   * Update the entity config set as prototype according to latest unEvalTree changes else code would consume stale configs.
-   *
-   * Example scenario: On addition of a JS binding to widget, it's dynamicBindingPathList changes and needs to be updated.
-   */
-  updateConfigForModifiedEntity(unEvalTree: DataTree, entityName: string) {
-    const unEvalEntity = unEvalTree[entityName];
-    // skip entity if entity is not present in the evalTree or is not a valid entity
-    if (!this.evalTree[entityName] || !isValidEntity(this.evalTree[entityName]))
-      return;
-    const entityConfig = Object.getPrototypeOf(unEvalEntity);
-    const newEntityObject = Object.create(entityConfig);
-    this.evalTree[entityName] = Object.assign(newEntityObject, {
-      ...this.evalTree[entityName],
+    if (!evalPropertyValue || isEmpty(validationConfig)) return;
+    // runs VALIDATOR function and returns errors
+    const { isValid, messages } = validateActionProperty(
+      validationConfig,
+      evalPropertyValue,
+    );
+    if (isValid) return;
+    resetValidationErrorsForEntityProperty({
+      evalProps: this.evalProps,
+      fullPropertyPath,
+    });
+    const evalErrors: EvaluationError[] =
+      messages?.map((message) => {
+        return {
+          raw: unEvalPropertyValue,
+          errorMessage: message || { name: "", text: "" },
+          errorType: PropertyEvaluationErrorType.VALIDATION,
+          severity: Severity.ERROR,
+        };
+      }) ?? [];
+    // saves error in dataTree at fullPropertyPath
+    // Later errors can consumed by the forms and debugger
+    addErrorToEntityProperty({
+      errors: evalErrors,
+      evalProps: this.evalProps,
+      fullPropertyPath,
+      configTree,
     });
   }
 
@@ -1640,20 +1677,22 @@ export default class DataTreeEvaluator {
           );
         }
         const parentPropertyPath = convertPathToString(path);
-        Object.keys(entityConfig.reactivePaths).forEach((relativePath) => {
-          const childPropertyPath = `${entityName}.${relativePath}`;
-          // Check if relative path has dynamic binding
-          if (
-            entityDynamicBindingPaths &&
-            entityDynamicBindingPaths.length &&
-            entityDynamicBindingPaths.includes(relativePath)
-          ) {
-            changePaths.add(childPropertyPath);
-          }
-          if (isChildPropertyPath(parentPropertyPath, childPropertyPath)) {
-            changePaths.add(childPropertyPath);
-          }
-        });
+        if (!isEmpty(entityConfig.reactivePaths)) {
+          Object.keys(entityConfig.reactivePaths).forEach((relativePath) => {
+            const childPropertyPath = `${entityName}.${relativePath}`;
+            // Check if relative path has dynamic binding
+            if (
+              entityDynamicBindingPaths &&
+              entityDynamicBindingPaths.length &&
+              entityDynamicBindingPaths.includes(relativePath)
+            ) {
+              changePaths.add(childPropertyPath);
+            }
+            if (isChildPropertyPath(parentPropertyPath, childPropertyPath)) {
+              changePaths.add(childPropertyPath);
+            }
+          });
+        }
       }
     }
 
@@ -1704,6 +1743,8 @@ export default class DataTreeEvaluator {
       );
     }
 
+    const dataTree = klona(this.evalTree);
+
     return bindings.map((binding) => {
       // Replace any reference of 'this.params' to 'executionParams' (backwards compatibility)
       // also helps with dealing with IIFE which are normal functions (not arrow)
@@ -1714,7 +1755,7 @@ export default class DataTreeEvaluator {
       );
       return this.getDynamicValue(
         `{{${replacedBinding}}}`,
-        this.evalTree,
+        dataTree,
         this.oldConfigTree,
         EvaluationSubstitutionType.TEMPLATE,
         // params can be accessed via "this.params" or "executionParams"
diff --git a/app/client/src/workers/common/DataTreeEvaluator/mockData/ArrayAccessorTree.ts b/app/client/src/workers/common/DataTreeEvaluator/mockData/ArrayAccessorTree.ts
index 7ee3e31557..acde8b2eff 100644
--- a/app/client/src/workers/common/DataTreeEvaluator/mockData/ArrayAccessorTree.ts
+++ b/app/client/src/workers/common/DataTreeEvaluator/mockData/ArrayAccessorTree.ts
@@ -1,11 +1,11 @@
 import { PluginType, PaginationType } from "entities/Action";
 import type {
-  DataTree,
   WidgetEntity,
   WidgetEntityConfig,
   ActionEntityConfig,
   ActionEntity,
 } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import {
   EvaluationSubstitutionType,
   ENTITY_TYPE_VALUE,
diff --git a/app/client/src/workers/common/DataTreeEvaluator/mockData/NestedArrayAccessorTree.ts b/app/client/src/workers/common/DataTreeEvaluator/mockData/NestedArrayAccessorTree.ts
index 577b3e44c1..1492beca9d 100644
--- a/app/client/src/workers/common/DataTreeEvaluator/mockData/NestedArrayAccessorTree.ts
+++ b/app/client/src/workers/common/DataTreeEvaluator/mockData/NestedArrayAccessorTree.ts
@@ -1,11 +1,11 @@
 import { PluginType, PaginationType } from "entities/Action";
 import type {
-  DataTree,
   WidgetEntity,
   WidgetEntityConfig,
   ActionEntityConfig,
   ActionEntity,
 } from "@appsmith/entities/DataTree/types";
+import type { DataTree } from "entities/DataTree/dataTreeTypes";
 import {
   EvaluationSubstitutionType,
   ENTITY_TYPE_VALUE,
diff --git a/app/client/src/workers/common/DataTreeEvaluator/test.ts b/app/client/src/workers/common/DataTreeEvaluator/test.ts
index eb72885f1b..dbd69786bd 100644
--- a/app/client/src/workers/common/DataTreeEvaluator/test.ts
+++ b/app/client/src/workers/common/DataTreeEvaluator/test.ts
@@ -1,7 +1,7 @@
 import DataTreeEvaluator from ".";
 import { unEvalTree } from "./mockData/mockUnEvalTree";
 import { configTree } from "./mockData/mockConfigTree";
-import type { DataTree, ConfigTree } from "@appsmith/entities/DataTree/types";
+import type { DataTree, ConfigTree } from "entities/DataTree/dataTreeTypes";
 import type { DataTreeDiff } from "@appsmith/workers/Evaluation/evaluationUtils";
 import {
   arrayAccessorCyclicDependency,
diff --git a/app/client/src/workers/common/DataTreeEvaluator/utils.ts b/app/client/src/workers/common/DataTreeEvaluator/utils.ts
index 3375928d34..aca443c0c7 100644
--- a/app/client/src/workers/common/DataTreeEvaluator/utils.ts
+++ b/app/client/src/workers/common/DataTreeEvaluator/utils.ts
@@ -1,14 +1,17 @@
 import {
   getEntityNameAndPropertyPath,
   isJSAction,
+  isValidEntity,
 } from "@appsmith/workers/Evaluation/evaluationUtils";
 import {
   EXECUTION_PARAM_REFERENCE_REGEX,
   THIS_DOT_PARAMS_KEY,
 } from "constants/AppsmithActionConstants/ActionConstants";
-import type { ConfigTree, DataTree } from "@appsmith/entities/DataTree/types";
+import type { ConfigTree, DataTree } from "entities/DataTree/dataTreeTypes";
 import type DependencyMap from "entities/DependencyMap";
 import type { TJSPropertiesState } from "workers/Evaluation/JSObject/jsPropertiesState";
+import type { DataTreeEntity } from "entities/DataTree/dataTreeTypes";
+import type { DataTreeEntityConfig } from "@appsmith/entities/DataTree/types";
 
 export function getFixedTimeDifference(endTime: number, startTime: number) {
   return (endTime - startTime).toFixed(2) + " ms";
@@ -54,3 +57,15 @@ export function getAllAsyncJSFunctions(
   }
   return allAsyncJSFunctions;
 }
+
+export function getValidEntityType(
+  entity: DataTreeEntity,
+  entityConfig: DataTreeEntityConfig,
+) {
+  let entityType;
+  if (isValidEntity(entity)) {
+    entityType =
+      (!!entityConfig && entityConfig.ENTITY_TYPE) || entity.ENTITY_TYPE;
+  }
+  return !!entityType ? entityType : "noop";
+}
diff --git a/app/client/src/workers/common/DataTreeEvaluator/validationUtils.ts b/app/client/src/workers/common/DataTreeEvaluator/validationUtils.ts
index ef0df3a3ac..dac11271d6 100644
--- a/app/client/src/workers/common/DataTreeEvaluator/validationUtils.ts
+++ b/app/client/src/workers/common/DataTreeEvaluator/validationUtils.ts
@@ -1,11 +1,10 @@
 import type { ValidationConfig } from "constants/PropertyControlConstants";
 import { Severity } from "entities/AppsmithConsole";
 import type {
-  ConfigTree,
-  DataTree,
   WidgetEntity,
   WidgetEntityConfig,
 } from "@appsmith/entities/DataTree/types";
+import type { ConfigTree, DataTree } from "entities/DataTree/dataTreeTypes";
 import { get, isObject, isUndefined, set } from "lodash";
 import type { EvaluationError } from "utils/DynamicBindingUtils";
 import {
diff --git a/app/client/src/workers/common/DependencyMap/index.ts b/app/client/src/workers/common/DependencyMap/index.ts
index 6b3d1e0e80..f65c34afa2 100644
--- a/app/client/src/workers/common/DependencyMap/index.ts
+++ b/app/client/src/workers/common/DependencyMap/index.ts
@@ -3,18 +3,17 @@ import {
   getAllPaths,
   DataTreeDiffEvent,
   isWidget,
-  isValidEntity,
   getEntityNameAndPropertyPath,
   isDynamicLeaf,
 } from "@appsmith/workers/Evaluation/evaluationUtils";
 import type {
-  DataTree,
   WidgetEntity,
-  ConfigTree,
   WidgetEntityConfig,
   ActionEntity,
   JSActionEntity,
+  DataTreeEntityObject,
 } from "@appsmith/entities/DataTree/types";
+import type { ConfigTree, DataTree } from "entities/DataTree/dataTreeTypes";
 import { getEntityId, getEvalErrorPath } from "utils/DynamicBindingUtils";
 import { convertArrayToObject, extractInfoFromBindings } from "./utils";
 import type DataTreeEvaluator from "workers/common/DataTreeEvaluator";
@@ -32,6 +31,7 @@ import {
   getEntitySetterFunctions,
 } from "@appsmith/workers/Evaluation/Actions";
 import { isWidgetActionOrJsObject } from "@appsmith/entities/DataTree/utils";
+import { getValidEntityType } from "workers/common/DataTreeEvaluator/utils";
 
 interface CreateDependencyMap {
   dependencies: Record<string, string[]>;
@@ -60,7 +60,7 @@ export function createDependencyMap(
     const entity = unEvalTree[entityName];
     const entityConfig = configTree[entityName];
     const entityDependencies = getEntityDependencies(
-      entity,
+      entity as DataTreeEntityObject,
       entityConfig,
       allKeys,
     );
@@ -142,7 +142,7 @@ export const updateDependencyMap = ({
       event === DataTreeDiffEvent.DELETE
         ? oldUnEvalTree[entityName]
         : unEvalDataTree[entityName];
-    const entityType = isValidEntity(entity) ? entity.ENTITY_TYPE : "noop";
+    const entityType = getValidEntityType(entity, entityConfig);
 
     if (entityType !== "noop") {
       switch (event) {
diff --git a/app/client/src/workers/common/DependencyMap/test.ts b/app/client/src/workers/common/DependencyMap/test.ts
index 531c9eabb9..3bb6b933a8 100644
--- a/app/client/src/workers/common/DependencyMap/test.ts
+++ b/app/client/src/workers/common/DependencyMap/test.ts
@@ -6,11 +6,10 @@ import {
 import ButtonWidget from "widgets/ButtonWidget";
 import SelectWidget from "widgets/SelectWidget";
 import type {
-  DataTree,
-  ConfigTree,
   WidgetEntity,
   DataTreeEntityConfig,
 } from "@appsmith/entities/DataTree/types";
+import type { DataTree, ConfigTree } from "entities/DataTree/dataTreeTypes";
 import {
   unEvalTreeWidgetSelectWidgetConfig,
   configTree,
diff --git a/app/client/src/workers/common/DependencyMap/utils.ts b/app/client/src/workers/common/DependencyMap/utils.ts
index 76fe2bbcbc..259fc596b2 100644
--- a/app/client/src/workers/common/DependencyMap/utils.ts
+++ b/app/client/src/workers/common/DependencyMap/utils.ts
@@ -9,11 +9,11 @@ import {
   isWidget,
 } from "@appsmith/workers/Evaluation/evaluationUtils";
 
+import type { WidgetEntityConfig } from "@appsmith/entities/DataTree/types";
 import type {
   ConfigTree,
   DataTreeEntity,
-  WidgetEntityConfig,
-} from "@appsmith/entities/DataTree/types";
+} from "entities/DataTree/dataTreeTypes";
 import {
   DEDICATED_WORKER_GLOBAL_SCOPE_IDENTIFIERS,
   JAVASCRIPT_KEYWORDS,
@@ -158,7 +158,10 @@ export function isJSFunction(configTree: ConfigTree, fullPath: string) {
   );
 }
 export function convertArrayToObject(arr: string[]) {
-  return arr.reduce((acc, item) => {
-    return { ...acc, [item]: true } as const;
-  }, {} as Record<string, true>);
+  return arr.reduce(
+    (acc, item) => {
+      return { ...acc, [item]: true } as const;
+    },
+    {} as Record<string, true>,
+  );
 }
diff --git a/app/client/src/workers/common/DependencyMap/utils/getEntityDependencies.ts b/app/client/src/workers/common/DependencyMap/utils/getEntityDependencies.ts
index 21493fafe7..4105f75c78 100644
--- a/app/client/src/workers/common/DependencyMap/utils/getEntityDependencies.ts
+++ b/app/client/src/workers/common/DependencyMap/utils/getEntityDependencies.ts
@@ -9,20 +9,21 @@ import type {
   ActionEntityConfig,
   JSActionEntity,
   JSActionEntityConfig,
-  DataTreeEntity,
   DataTreeEntityConfig,
   WidgetEntity,
   WidgetEntityConfig,
 } from "@appsmith/entities/DataTree/types";
+import type { DataTreeEntity } from "entities/DataTree/dataTreeTypes";
 import { find, get, union } from "lodash";
 import {
   getDynamicBindings,
   getEntityDynamicBindingPathList,
 } from "utils/DynamicBindingUtils";
 import { isWidgetActionOrJsObject } from "@appsmith/entities/DataTree/utils";
+import type { DataTreeEntityObject } from "@appsmith/entities/DataTree/types";
 
 export function getEntityDependencies(
-  entity: DataTreeEntity,
+  entity: DataTreeEntityObject,
   entityConfig: DataTreeEntityConfig,
   allKeys: Record<string, true>,
 ): Record<string, string[]> {
@@ -30,13 +31,13 @@ export function getEntityDependencies(
   switch (entity.ENTITY_TYPE) {
     case ENTITY_TYPE_VALUE.ACTION:
       return getActionDependencies(
-        entity,
+        entity as ActionEntity,
         entityConfig as ActionEntityConfig,
         allKeys,
       );
     case ENTITY_TYPE_VALUE.JSACTION:
       return getJSDependencies(
-        entity,
+        entity as JSActionEntity,
         entityConfig as JSActionEntityConfig,
         allKeys,
       );
@@ -159,21 +160,21 @@ export function getEntityPathDependencies(
   switch (entity.ENTITY_TYPE) {
     case ENTITY_TYPE_VALUE.ACTION:
       return getActionPropertyPathDependencies(
-        entity,
+        entity as ActionEntity,
         entityConfig as ActionEntityConfig,
         fullPropertyPath,
         allKeys,
       );
     case ENTITY_TYPE_VALUE.JSACTION:
       return getJSPropertyPathDependencies(
-        entity,
+        entity as JSActionEntity,
         entityConfig as JSActionEntityConfig,
         fullPropertyPath,
         allKeys,
       );
     case ENTITY_TYPE_VALUE.WIDGET:
       return getWidgetPropertyPathDependencies(
-        entity,
+        entity as WidgetEntity,
         entityConfig as WidgetEntityConfig,
         fullPropertyPath,
       );
diff --git a/app/client/src/workers/common/DependencyMap/utils/getValidationDependencies.ts b/app/client/src/workers/common/DependencyMap/utils/getValidationDependencies.ts
index b6929f53c9..6ac10d10f3 100644
--- a/app/client/src/workers/common/DependencyMap/utils/getValidationDependencies.ts
+++ b/app/client/src/workers/common/DependencyMap/utils/getValidationDependencies.ts
@@ -1,9 +1,9 @@
 import { isWidget } from "@appsmith/workers/Evaluation/evaluationUtils";
 import type {
-  DataTreeEntity,
   DataTreeEntityConfig,
   WidgetEntityConfig,
 } from "@appsmith/entities/DataTree/types";
+import type { DataTreeEntity } from "entities/DataTree/dataTreeTypes";
 import type { DependencyMap } from "utils/DynamicBindingUtils";
 
 const DATA_DERIVED_PROPERTY_PLACEHOLDER = "*";
diff --git a/app/client/src/workers/common/JSLibrary/index.ts b/app/client/src/workers/common/JSLibrary/index.ts
index 37569a442c..05d772d52e 100644
--- a/app/client/src/workers/common/JSLibrary/index.ts
+++ b/app/client/src/workers/common/JSLibrary/index.ts
@@ -1,13 +1,13 @@
 import lodashPackageJson from "lodash/package.json";
 import momentPackageJson from "moment-timezone/package.json";
 
-export type TJSLibrary = {
+export interface TJSLibrary {
   version?: string;
   docsURL: string;
   name: string;
   accessor: string[];
   url?: string;
-};
+}
 
 export const defaultLibraries: TJSLibrary[] = [
   {
diff --git a/app/client/test/testCommon.ts b/app/client/test/testCommon.ts
index e1a7928bf2..6e374d0ccb 100644
--- a/app/client/test/testCommon.ts
+++ b/app/client/test/testCommon.ts
@@ -12,7 +12,7 @@ import { editorInitializer } from "utils/editor/EditorUtils";
 import { extractCurrentDSL } from "utils/WidgetPropsUtils";
 import type { AppState } from "@appsmith/reducers";
 import type { WidgetEntity } from "@appsmith/entities/DataTree/types";
-import urlBuilder from "entities/URLRedirect/URLAssembly";
+import urlBuilder from "@appsmith/entities/URLRedirect/URLAssembly";
 import type { FlattenedWidgetProps } from "reducers/entityReducers/canvasWidgetsStructureReducer";
 import type { DSLWidget } from "WidgetProvider/constants";
 import { nestDSL } from "@shared/dsl";
diff --git a/app/client/yarn.lock b/app/client/yarn.lock
index d937cd91bf..6706b5b8ae 100644
--- a/app/client/yarn.lock
+++ b/app/client/yarn.lock
@@ -5,6 +5,13 @@ __metadata:
   version: 6
   cacheKey: 8
 
+"@aashutoshrathi/word-wrap@npm:^1.2.3":
+  version: 1.2.6
+  resolution: "@aashutoshrathi/word-wrap@npm:1.2.6"
+  checksum: ada901b9e7c680d190f1d012c84217ce0063d8f5c5a7725bb91ec3c5ed99bb7572680eb2d2938a531ccbaec39a95422fcd8a6b4a13110c7d98dd75402f66a0cd
+  languageName: node
+  linkType: hard
+
 "@algolia/cache-browser-local-storage@npm:4.5.1":
   version: 4.5.1
   resolution: "@algolia/cache-browser-local-storage@npm:4.5.1"
@@ -2319,9 +2326,7 @@ __metadata:
     colorjs.io: ^0.4.3
     postcss: "*"
     postcss-at-rules-variables: "*"
-    postcss-conditionals: "*"
     postcss-each: "*"
-    postcss-for: "*"
     postcss-import: "*"
     postcss-loader: "*"
     postcss-modules-values: "*"
@@ -2936,45 +2941,45 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint-community/eslint-utils@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "@eslint-community/eslint-utils@npm:4.2.0"
+"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0":
+  version: 4.4.0
+  resolution: "@eslint-community/eslint-utils@npm:4.4.0"
   dependencies:
     eslint-visitor-keys: ^3.3.0
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
-  checksum: 82fdd1cc2a5d169def0e665ec790580ef708e7df9c91f20006595dc90e3bd42ec31c8976a2eeccd336286301a72e937c0ddf3ab4b7377d7014997c36333a7d22
+  checksum: cdfe3ae42b4f572cbfb46d20edafe6f36fc5fb52bf2d90875c58aefe226892b9677fef60820e2832caf864a326fe4fc225714c46e8389ccca04d5f9288aabd22
   languageName: node
   linkType: hard
 
-"@eslint-community/regexpp@npm:^4.4.0":
-  version: 4.4.0
-  resolution: "@eslint-community/regexpp@npm:4.4.0"
-  checksum: 2d127af0c752b80e8a782eacfe996a86925d21de92da3ffc6f9e615e701145e44a62e26bdd88bfac2cd76779c39ba8d9875a91046ec5e7e5f23cb647c247ea6a
+"@eslint-community/regexpp@npm:^4.4.0, @eslint-community/regexpp@npm:^4.5.1, @eslint-community/regexpp@npm:^4.6.1":
+  version: 4.9.1
+  resolution: "@eslint-community/regexpp@npm:4.9.1"
+  checksum: 06fb839e9c756f6375cc545c2f2e05a0a64576bd6370e8e3c07983fd29a3d6e164ef4aa48a361f7d27e6713ab79c83053ff6a2ccb78748bc955e344279c4a3b6
   languageName: node
   linkType: hard
 
-"@eslint/eslintrc@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "@eslint/eslintrc@npm:2.0.3"
+"@eslint/eslintrc@npm:^2.1.2":
+  version: 2.1.2
+  resolution: "@eslint/eslintrc@npm:2.1.2"
   dependencies:
     ajv: ^6.12.4
     debug: ^4.3.2
-    espree: ^9.5.2
+    espree: ^9.6.0
     globals: ^13.19.0
     ignore: ^5.2.0
     import-fresh: ^3.2.1
     js-yaml: ^4.1.0
     minimatch: ^3.1.2
     strip-json-comments: ^3.1.1
-  checksum: ddc51f25f8524d8231db9c9bf03177e503d941a332e8d5ce3b10b09241be4d5584a378a529a27a527586bfbccf3031ae539eb891352033c340b012b4d0c81d92
+  checksum: bc742a1e3b361f06fedb4afb6bf32cbd27171292ef7924f61c62f2aed73048367bcc7ac68f98c06d4245cd3fabc43270f844e3c1699936d4734b3ac5398814a7
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:8.42.0":
-  version: 8.42.0
-  resolution: "@eslint/js@npm:8.42.0"
-  checksum: 750558843ac458f7da666122083ee05306fc087ecc1e5b21e7e14e23885775af6c55bcc92283dff1862b7b0d8863ec676c0f18c7faf1219c722fe91a8ece56b6
+"@eslint/js@npm:8.51.0":
+  version: 8.51.0
+  resolution: "@eslint/js@npm:8.51.0"
+  checksum: 0228bf1e1e0414843e56d9ff362a2a72d579c078f93174666f29315690e9e30a8633ad72c923297f7fd7182381b5a476805ff04dac8debe638953eb1ded3ac73
   languageName: node
   linkType: hard
 
@@ -3297,14 +3302,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@humanwhocodes/config-array@npm:^0.11.10":
-  version: 0.11.10
-  resolution: "@humanwhocodes/config-array@npm:0.11.10"
+"@humanwhocodes/config-array@npm:^0.11.11":
+  version: 0.11.11
+  resolution: "@humanwhocodes/config-array@npm:0.11.11"
   dependencies:
     "@humanwhocodes/object-schema": ^1.2.1
     debug: ^4.1.1
     minimatch: ^3.0.5
-  checksum: 1b1302e2403d0e35bc43e66d67a2b36b0ad1119efc704b5faff68c41f791a052355b010fb2d27ef022670f550de24cd6d08d5ecf0821c16326b7dcd0ee5d5d8a
+  checksum: db84507375ab77b8ffdd24f498a5b49ad6b64391d30dd2ac56885501d03964d29637e05b1ed5aefa09d57ac667e28028bc22d2da872bfcd619652fbdb5f4ca19
   languageName: node
   linkType: hard
 
@@ -4303,6 +4308,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@pkgr/utils@npm:^2.3.1":
+  version: 2.4.2
+  resolution: "@pkgr/utils@npm:2.4.2"
+  dependencies:
+    cross-spawn: ^7.0.3
+    fast-glob: ^3.3.0
+    is-glob: ^4.0.3
+    open: ^9.1.0
+    picocolors: ^1.0.0
+    tslib: ^2.6.0
+  checksum: 24e04c121269317d259614cd32beea3af38277151c4002df5883c4be920b8e3490bb897748e844f9d46bf68230f86dabd4e8f093773130e7e60529a769a132fc
+  languageName: node
+  linkType: hard
+
 "@pmmmwh/react-refresh-webpack-plugin@npm:^0.5.1, @pmmmwh/react-refresh-webpack-plugin@npm:^0.5.3":
   version: 0.5.10
   resolution: "@pmmmwh/react-refresh-webpack-plugin@npm:0.5.10"
@@ -8270,10 +8289,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.4, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
-  version: 7.0.11
-  resolution: "@types/json-schema@npm:7.0.11"
-  checksum: 527bddfe62db9012fccd7627794bd4c71beb77601861055d87e3ee464f2217c85fca7a4b56ae677478367bbd248dbde13553312b7d4dbc702a2f2bbf60c4018d
+"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.4, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
+  version: 7.0.13
+  resolution: "@types/json-schema@npm:7.0.13"
+  checksum: 345df21a678fa72fb389f35f33de77833d09d4a142bb2bcb27c18690efa4cf70fc2876e43843cefb3fbdb9fcb12cd3e970a90936df30f53bbee899865ff605ab
   languageName: node
   linkType: hard
 
@@ -8779,10 +8798,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/semver@npm:^7.3.12, @types/semver@npm:^7.3.4":
-  version: 7.5.0
-  resolution: "@types/semver@npm:7.5.0"
-  checksum: 0a64b9b9c7424d9a467658b18dd70d1d781c2d6f033096a6e05762d20ebbad23c1b69b0083b0484722aabf35640b78ccc3de26368bcae1129c87e9df028a22e2
+"@types/semver@npm:^7.3.12, @types/semver@npm:^7.3.4, @types/semver@npm:^7.5.0":
+  version: 7.5.3
+  resolution: "@types/semver@npm:7.5.3"
+  checksum: 349fdd1ab6c213bac5c991bac766bd07b8b12e63762462bb058740dcd2eb09c8193d068bb226f134661275f2022976214c0e727a4e5eb83ec1b131127c980d3e
   languageName: node
   linkType: hard
 
@@ -8942,6 +8961,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/uuid@npm:^9.0.5":
+  version: 9.0.5
+  resolution: "@types/uuid@npm:9.0.5"
+  checksum: 7577940949619768303c0bf0a7cc235fac3cfae1c0bb4a2e85bfb87b2eb1024955ab446f775394d259442cd769b663b6ce43c39bdfc955d946bf833804ddb421
+  languageName: node
+  linkType: hard
+
 "@types/wait-on@npm:^5.2.0":
   version: 5.3.1
   resolution: "@types/wait-on@npm:5.3.1"
@@ -9015,7 +9041,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:^5.25.0, @typescript-eslint/eslint-plugin@npm:^5.5.0, @typescript-eslint/eslint-plugin@npm:^5.54.1":
+"@typescript-eslint/eslint-plugin@npm:^5.25.0, @typescript-eslint/eslint-plugin@npm:^5.5.0":
   version: 5.58.0
   resolution: "@typescript-eslint/eslint-plugin@npm:5.58.0"
   dependencies:
@@ -9039,6 +9065,31 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/eslint-plugin@npm:^6.7.4":
+  version: 6.7.4
+  resolution: "@typescript-eslint/eslint-plugin@npm:6.7.4"
+  dependencies:
+    "@eslint-community/regexpp": ^4.5.1
+    "@typescript-eslint/scope-manager": 6.7.4
+    "@typescript-eslint/type-utils": 6.7.4
+    "@typescript-eslint/utils": 6.7.4
+    "@typescript-eslint/visitor-keys": 6.7.4
+    debug: ^4.3.4
+    graphemer: ^1.4.0
+    ignore: ^5.2.4
+    natural-compare: ^1.4.0
+    semver: ^7.5.4
+    ts-api-utils: ^1.0.1
+  peerDependencies:
+    "@typescript-eslint/parser": ^6.0.0 || ^6.0.0-alpha
+    eslint: ^7.0.0 || ^8.0.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 91d5051ae935d8bb61091665ee1e5c456992a0c29b58c86c1bb2b72c935dd831c0d3c7726a8d609455ae4a8b4ba8786ebeeef4bc7eff388b5f77475e7a634dc0
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/experimental-utils@npm:^5.0.0":
   version: 5.25.0
   resolution: "@typescript-eslint/experimental-utils@npm:5.25.0"
@@ -9050,7 +9101,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:^5.25.0, @typescript-eslint/parser@npm:^5.5.0, @typescript-eslint/parser@npm:^5.54.1":
+"@typescript-eslint/parser@npm:^5.25.0, @typescript-eslint/parser@npm:^5.5.0":
   version: 5.58.0
   resolution: "@typescript-eslint/parser@npm:5.58.0"
   dependencies:
@@ -9067,6 +9118,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/parser@npm:^6.7.4":
+  version: 6.7.4
+  resolution: "@typescript-eslint/parser@npm:6.7.4"
+  dependencies:
+    "@typescript-eslint/scope-manager": 6.7.4
+    "@typescript-eslint/types": 6.7.4
+    "@typescript-eslint/typescript-estree": 6.7.4
+    "@typescript-eslint/visitor-keys": 6.7.4
+    debug: ^4.3.4
+  peerDependencies:
+    eslint: ^7.0.0 || ^8.0.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 60e7c01a69c1a67577f031cd6ef3c7980a9aedf2045b9950e339836acb2fe9d7bf0c8909fa95d713a8270f19dead43d82beb27dcf8705f81fe35b14b737e8fe0
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/scope-manager@npm:5.25.0":
   version: 5.25.0
   resolution: "@typescript-eslint/scope-manager@npm:5.25.0"
@@ -9087,13 +9156,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:5.59.9":
-  version: 5.59.9
-  resolution: "@typescript-eslint/scope-manager@npm:5.59.9"
+"@typescript-eslint/scope-manager@npm:5.62.0":
+  version: 5.62.0
+  resolution: "@typescript-eslint/scope-manager@npm:5.62.0"
   dependencies:
-    "@typescript-eslint/types": 5.59.9
-    "@typescript-eslint/visitor-keys": 5.59.9
-  checksum: 362c22662d844440a7e14223d8cc0722f77ff21ad8f78deb0ee3b3f21de01b8846bf25fbbf527544677e83d8ff48008b3f7d40b39ddec55994ea4a1863e9ec0a
+    "@typescript-eslint/types": 5.62.0
+    "@typescript-eslint/visitor-keys": 5.62.0
+  checksum: 6062d6b797fe1ce4d275bb0d17204c827494af59b5eaf09d8a78cdd39dadddb31074dded4297aaf5d0f839016d601032857698b0e4516c86a41207de606e9573
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/scope-manager@npm:6.7.4":
+  version: 6.7.4
+  resolution: "@typescript-eslint/scope-manager@npm:6.7.4"
+  dependencies:
+    "@typescript-eslint/types": 6.7.4
+    "@typescript-eslint/visitor-keys": 6.7.4
+  checksum: 8475d28f6408c204fb6bf25df45c1f16cad950190e31346c4b1ae15461a96f30b31b6fd1d3d635b41db6aa9a3fd3de25f04823632c74eeea478f34ebd134a1b0
   languageName: node
   linkType: hard
 
@@ -9114,6 +9193,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/type-utils@npm:6.7.4":
+  version: 6.7.4
+  resolution: "@typescript-eslint/type-utils@npm:6.7.4"
+  dependencies:
+    "@typescript-eslint/typescript-estree": 6.7.4
+    "@typescript-eslint/utils": 6.7.4
+    debug: ^4.3.4
+    ts-api-utils: ^1.0.1
+  peerDependencies:
+    eslint: ^7.0.0 || ^8.0.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 231240a1aa1008a1b1facdd40b931433606947254f6e04705d154791a8b2c15d5ce3355b7d8a29cf7bb53c2e2eca1340c7860dd395389858d442af06c586d1fd
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/types@npm:5.25.0":
   version: 5.25.0
   resolution: "@typescript-eslint/types@npm:5.25.0"
@@ -9128,10 +9224,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:5.59.9":
-  version: 5.59.9
-  resolution: "@typescript-eslint/types@npm:5.59.9"
-  checksum: 283f8fee1ee590eeccc2e0fcd3526c856c4b1e2841af2cdcd09eeac842a42cfb32f6bc8b40385380f3dbc3ee29da30f1819115eedf9e16f69ff5a160aeddd8fa
+"@typescript-eslint/types@npm:5.62.0":
+  version: 5.62.0
+  resolution: "@typescript-eslint/types@npm:5.62.0"
+  checksum: 48c87117383d1864766486f24de34086155532b070f6264e09d0e6139449270f8a9559cfef3c56d16e3bcfb52d83d42105d61b36743626399c7c2b5e0ac3b670
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/types@npm:6.7.4":
+  version: 6.7.4
+  resolution: "@typescript-eslint/types@npm:6.7.4"
+  checksum: 287ae48a2bb722b866460bcb2ba4ff908348145b3fc0af4ea75679d474e9ba3632bf64689044f181fe8ca3cb5f41238bb31ea428d5e78f1c3982f6dac6b7b149
   languageName: node
   linkType: hard
 
@@ -9171,12 +9274,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:5.59.9":
-  version: 5.59.9
-  resolution: "@typescript-eslint/typescript-estree@npm:5.59.9"
+"@typescript-eslint/typescript-estree@npm:5.62.0":
+  version: 5.62.0
+  resolution: "@typescript-eslint/typescript-estree@npm:5.62.0"
   dependencies:
-    "@typescript-eslint/types": 5.59.9
-    "@typescript-eslint/visitor-keys": 5.59.9
+    "@typescript-eslint/types": 5.62.0
+    "@typescript-eslint/visitor-keys": 5.62.0
     debug: ^4.3.4
     globby: ^11.1.0
     is-glob: ^4.0.3
@@ -9185,7 +9288,25 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: c0c9b81f20a2a4337f07bc3ccdc9c1dabd765f59096255ed9a149e91e5c9517b25c2b6655f8f073807cfc13500c7451fbd9bb62e5e572c07cc07945ab042db89
+  checksum: 3624520abb5807ed8f57b1197e61c7b1ed770c56dfcaca66372d584ff50175225798bccb701f7ef129d62c5989070e1ee3a0aa2d84e56d9524dcf011a2bb1a52
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/typescript-estree@npm:6.7.4":
+  version: 6.7.4
+  resolution: "@typescript-eslint/typescript-estree@npm:6.7.4"
+  dependencies:
+    "@typescript-eslint/types": 6.7.4
+    "@typescript-eslint/visitor-keys": 6.7.4
+    debug: ^4.3.4
+    globby: ^11.1.0
+    is-glob: ^4.0.3
+    semver: ^7.5.4
+    ts-api-utils: ^1.0.1
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 2e8f5e972403233522eff09cfe7a0a23549cfd462e82b434aa32ddbdba5b329be5a549514a157f6b79e2d0159c9348d23b202e5d915d4f2c7cbfe72e1a48a429
   languageName: node
   linkType: hard
 
@@ -9223,21 +9344,38 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/utils@npm:6.7.4":
+  version: 6.7.4
+  resolution: "@typescript-eslint/utils@npm:6.7.4"
+  dependencies:
+    "@eslint-community/eslint-utils": ^4.4.0
+    "@types/json-schema": ^7.0.12
+    "@types/semver": ^7.5.0
+    "@typescript-eslint/scope-manager": 6.7.4
+    "@typescript-eslint/types": 6.7.4
+    "@typescript-eslint/typescript-estree": 6.7.4
+    semver: ^7.5.4
+  peerDependencies:
+    eslint: ^7.0.0 || ^8.0.0
+  checksum: 75e197dd58b230436ceb51f2050bb3af8796b05a197eaf741251f8e9c4d9ba1a99d654d090da0c49d31b20da79d9cc3746cbb663ffd5ea614d7a960d64676d65
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/utils@npm:^5.10.0, @typescript-eslint/utils@npm:^5.13.0, @typescript-eslint/utils@npm:^5.45.0":
-  version: 5.59.9
-  resolution: "@typescript-eslint/utils@npm:5.59.9"
+  version: 5.62.0
+  resolution: "@typescript-eslint/utils@npm:5.62.0"
   dependencies:
     "@eslint-community/eslint-utils": ^4.2.0
     "@types/json-schema": ^7.0.9
     "@types/semver": ^7.3.12
-    "@typescript-eslint/scope-manager": 5.59.9
-    "@typescript-eslint/types": 5.59.9
-    "@typescript-eslint/typescript-estree": 5.59.9
+    "@typescript-eslint/scope-manager": 5.62.0
+    "@typescript-eslint/types": 5.62.0
+    "@typescript-eslint/typescript-estree": 5.62.0
     eslint-scope: ^5.1.1
     semver: ^7.3.7
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: 22ec5962886de7dcf65f99c37aad9fb189a3bef6b2b07c81887fb82a0e8bf137246da58e64fb02141352285708440be13acd7f6db1ca19e96f86724813ac4646
+  checksum: ee9398c8c5db6d1da09463ca7bf36ed134361e20131ea354b2da16a5fdb6df9ba70c62a388d19f6eebb421af1786dbbd79ba95ddd6ab287324fc171c3e28d931
   languageName: node
   linkType: hard
 
@@ -9261,13 +9399,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:5.59.9":
-  version: 5.59.9
-  resolution: "@typescript-eslint/visitor-keys@npm:5.59.9"
+"@typescript-eslint/visitor-keys@npm:5.62.0":
+  version: 5.62.0
+  resolution: "@typescript-eslint/visitor-keys@npm:5.62.0"
   dependencies:
-    "@typescript-eslint/types": 5.59.9
+    "@typescript-eslint/types": 5.62.0
     eslint-visitor-keys: ^3.3.0
-  checksum: 2909ce761f7fe546592cd3c43e33263d8a5fa619375fd2fdffbc72ffc33e40d6feacafb28c79f36c638fcc2225048e7cc08c61cbac6ca63723dc68610d80e3e6
+  checksum: 976b05d103fe8335bef5c93ad3f76d781e3ce50329c0243ee0f00c0fcfb186c81df50e64bfdd34970148113f8ade90887f53e3c4938183afba830b4ba8e30a35
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/visitor-keys@npm:6.7.4":
+  version: 6.7.4
+  resolution: "@typescript-eslint/visitor-keys@npm:6.7.4"
+  dependencies:
+    "@typescript-eslint/types": 6.7.4
+    eslint-visitor-keys: ^3.4.1
+  checksum: 34d09798b6c48dc059e88c6cb3df5f96e859bd65d1dd05d907b8a3c7a5708a737d50607081fb14a4b974b90cfe4169a93db974bf53af8b282420187f73b0afac
   languageName: node
   linkType: hard
 
@@ -9971,7 +10119,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ajv@npm:^6.10.0, ajv@npm:^6.12.2, ajv@npm:^6.12.4, ajv@npm:^6.12.5":
+"ajv@npm:^6.12.2, ajv@npm:^6.12.4, ajv@npm:^6.12.5":
   version: 6.12.6
   resolution: "ajv@npm:6.12.6"
   dependencies:
@@ -10063,6 +10211,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ansi-escapes@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "ansi-escapes@npm:5.0.0"
+  dependencies:
+    type-fest: ^1.0.2
+  checksum: d4b5eb8207df38367945f5dd2ef41e08c28edc192dc766ef18af6b53736682f49d8bfcfa4e4d6ecbc2e2f97c258fda084fb29a9e43b69170b71090f771afccac
+  languageName: node
+  linkType: hard
+
 "ansi-html-community@npm:^0.0.8":
   version: 0.0.8
   resolution: "ansi-html-community@npm:0.0.8"
@@ -10281,11 +10438,12 @@ __metadata:
     "@types/tinycolor2": ^1.4.2
     "@types/to-json-schema": ^0.2.1
     "@types/toposort": ^2.0.3
+    "@types/uuid": ^9.0.5
     "@types/web": ^0.0.99
     "@types/webfontloader": 1.6.33
     "@types/zipcelx": ^1.5.0
-    "@typescript-eslint/eslint-plugin": ^5.54.1
-    "@typescript-eslint/parser": ^5.54.1
+    "@typescript-eslint/eslint-plugin": ^6.7.4
+    "@typescript-eslint/parser": ^6.7.4
     "@uppy/core": ^1.16.0
     "@uppy/dashboard": ^1.16.0
     "@uppy/file-input": ^1.4.22
@@ -10316,7 +10474,7 @@ __metadata:
     craco-babel-loader: ^1.0.4
     cssnano: ^6.0.1
     cy-verify-downloads: ^0.0.5
-    cypress: 13.2.0
+    cypress: 13.3.1
     cypress-file-upload: ^4.1.1
     cypress-image-snapshot: ^4.0.1
     cypress-log-to-output: ^1.1.2
@@ -10331,24 +10489,24 @@ __metadata:
     cypress-xpath: ^1.6.0
     dayjs: ^1.10.6
     deep-diff: ^1.0.2
-    design-system: "npm:@appsmithorg/design-system@2.1.21"
+    design-system: "npm:@appsmithorg/design-system@2.1.23"
     design-system-old: "npm:@appsmithorg/design-system-old@1.1.12"
     diff: ^5.0.0
     dotenv: ^8.1.0
     downloadjs: ^1.4.7
     echarts: ^5.4.2
     echarts-gl: ^2.0.9
-    eslint: ^8.42.0
-    eslint-config-prettier: ^8.6.0
-    eslint-import-resolver-babel-module: ^5.3.1
-    eslint-plugin-cypress: ^2.11.2
-    eslint-plugin-import: ^2.25.2
-    eslint-plugin-jest: ^27.2.1
-    eslint-plugin-prettier: ^4.2.1
-    eslint-plugin-react: ^7.30.0
-    eslint-plugin-react-hooks: ^2.3.0
-    eslint-plugin-sort-destructure-keys: ^1.3.5
-    eslint-plugin-storybook: ^0.6.11
+    eslint: ^8.51.0
+    eslint-config-prettier: ^9.0.0
+    eslint-import-resolver-babel-module: ^5.3.2
+    eslint-plugin-cypress: ^2.15.1
+    eslint-plugin-import: ^2.28.1
+    eslint-plugin-jest: ^27.4.2
+    eslint-plugin-prettier: ^5.0.0
+    eslint-plugin-react: ^7.33.2
+    eslint-plugin-react-hooks: ^4.6.0
+    eslint-plugin-sort-destructure-keys: ^1.5.0
+    eslint-plugin-storybook: ^0.6.15
     esm: ^3.2.25
     factory.ts: ^0.5.1
     fast-deep-equal: ^3.1.3
@@ -10381,7 +10539,7 @@ __metadata:
     konva: 8.0.1
     libphonenumber-js: ^1.9.44
     linkedom: ^0.14.20
-    lint-staged: ^13.2.0
+    lint-staged: ^14.0.1
     localforage: ^1.7.3
     lodash: ^4.17.21
     lodash-es: 4.17.21
@@ -10402,17 +10560,15 @@ __metadata:
     pg: ^8.11.3
     plop: ^3.1.1
     popper.js: ^1.15.0
-    postcss: ^8.4.31
+    postcss: 8.4.31
     postcss-at-rules-variables: ^0.3.0
-    postcss-conditionals: ^2.1.0
     postcss-each: ^1.1.0
-    postcss-for: ^2.1.1
     postcss-import: ^15.1.0
     postcss-modules-values: ^4.0.0
     postcss-nesting: ^12.0.1
     postcss-url: ^10.1.3
     postinstall-postinstall: ^2.1.0
-    prettier: ^2.8.6
+    prettier: ^3.0.3
     prismjs: ^1.27.0
     prop-types: ^15.8.1
     proxy-memoize: ^1.2.0
@@ -10638,16 +10794,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-includes@npm:^3.1.4, array-includes@npm:^3.1.5":
-  version: 3.1.6
-  resolution: "array-includes@npm:3.1.6"
+"array-includes@npm:^3.1.4, array-includes@npm:^3.1.6":
+  version: 3.1.7
+  resolution: "array-includes@npm:3.1.7"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    es-abstract: ^1.20.4
-    get-intrinsic: ^1.1.3
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    get-intrinsic: ^1.2.1
     is-string: ^1.0.7
-  checksum: f22f8cd8ba8a6448d91eebdc69f04e4e55085d09232b5216ee2d476dab3ef59984e8d1889e662c6a0ed939dcb1b57fd05b2c0209c3370942fc41b752c82a2ca5
+  checksum: 06f9e4598fac12a919f7c59a3f04f010ea07f0b7f0585465ed12ef528a60e45f374e79d1bddbb34cdd4338357d00023ddbd0ac18b0be36964f5e726e8965d7fc
   languageName: node
   linkType: hard
 
@@ -10665,27 +10821,40 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array.prototype.flat@npm:^1.2.5":
-  version: 1.3.1
-  resolution: "array.prototype.flat@npm:1.3.1"
+"array.prototype.findlastindex@npm:^1.2.2":
+  version: 1.2.3
+  resolution: "array.prototype.findlastindex@npm:1.2.3"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    es-abstract: ^1.20.4
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
     es-shim-unscopables: ^1.0.0
-  checksum: 5a8415949df79bf6e01afd7e8839bbde5a3581300e8ad5d8449dea52639e9e59b26a467665622783697917b43bf39940a6e621877c7dd9b3d1c1f97484b9b88b
+    get-intrinsic: ^1.2.1
+  checksum: 31f35d7b370c84db56484618132041a9af401b338f51899c2e78ef7690fbba5909ee7ca3c59a7192085b328cc0c68c6fd1f6d1553db01a689a589ae510f3966e
   languageName: node
   linkType: hard
 
-"array.prototype.flatmap@npm:^1.3.0":
-  version: 1.3.1
-  resolution: "array.prototype.flatmap@npm:1.3.1"
+"array.prototype.flat@npm:^1.3.1":
+  version: 1.3.2
+  resolution: "array.prototype.flat@npm:1.3.2"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    es-abstract: ^1.20.4
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
     es-shim-unscopables: ^1.0.0
-  checksum: 8c1c43a4995f12cf12523436da28515184c753807b3f0bc2ca6c075f71c470b099e2090cc67dba8e5280958fea401c1d0c59e1db0143272aef6cd1103921a987
+  checksum: 5d6b4bf102065fb3f43764bfff6feb3295d372ce89591e6005df3d0ce388527a9f03c909af6f2a973969a4d178ab232ffc9236654149173e0e187ec3a1a6b87b
+  languageName: node
+  linkType: hard
+
+"array.prototype.flatmap@npm:^1.3.1":
+  version: 1.3.2
+  resolution: "array.prototype.flatmap@npm:1.3.2"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    es-shim-unscopables: ^1.0.0
+  checksum: ce09fe21dc0bcd4f30271f8144083aa8c13d4639074d6c8dc82054b847c7fc9a0c97f857491f4da19d4003e507172a78f4bcd12903098adac8b9cd374f734be3
   languageName: node
   linkType: hard
 
@@ -10702,6 +10871,34 @@ __metadata:
   languageName: node
   linkType: hard
 
+"array.prototype.tosorted@npm:^1.1.1":
+  version: 1.1.2
+  resolution: "array.prototype.tosorted@npm:1.1.2"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    es-shim-unscopables: ^1.0.0
+    get-intrinsic: ^1.2.1
+  checksum: 3607a7d6b117f0ffa6f4012457b7af0d47d38cf05e01d50e09682fd2fb782a66093a5e5fbbdbad77c8c824794a9d892a51844041641f719ad41e3a974f0764de
+  languageName: node
+  linkType: hard
+
+"arraybuffer.prototype.slice@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "arraybuffer.prototype.slice@npm:1.0.2"
+  dependencies:
+    array-buffer-byte-length: ^1.0.0
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    get-intrinsic: ^1.2.1
+    is-array-buffer: ^3.0.2
+    is-shared-array-buffer: ^1.0.2
+  checksum: c200faf437786f5b2c80d4564ff5481c886a16dee642ef02abdc7306c7edd523d1f01d1dd12b769c7eb42ac9bc53874510db19a92a2c035c0f6696172aafa5d3
+  languageName: node
+  linkType: hard
+
 "asap@npm:^2.0.0, asap@npm:^2.0.6, asap@npm:~2.0.3, asap@npm:~2.0.6":
   version: 2.0.6
   resolution: "asap@npm:2.0.6"
@@ -10848,6 +11045,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"asynciterator.prototype@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "asynciterator.prototype@npm:1.0.0"
+  dependencies:
+    has-symbols: ^1.0.3
+  checksum: e8ebfd9493ac651cf9b4165e9d64030b3da1d17181bb1963627b59e240cdaf021d9b59d44b827dc1dde4e22387ec04c2d0f8720cf58a1c282e34e40cc12721b3
+  languageName: node
+  linkType: hard
+
 "asynckit@npm:^0.4.0":
   version: 0.4.0
   resolution: "asynckit@npm:0.4.0"
@@ -11965,6 +12171,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bundle-name@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "bundle-name@npm:3.0.0"
+  dependencies:
+    run-applescript: ^5.0.0
+  checksum: edf2b1fbe6096ed32e7566947ace2ea937ee427391744d7510a2880c4b9a5b3543d3f6c551236a29e5c87d3195f8e2912516290e638c15bcbede7b37cc375615
+  languageName: node
+  linkType: hard
+
 "bytes@npm:3.0.0":
   version: 3.0.0
   resolution: "bytes@npm:3.0.0"
@@ -12169,10 +12384,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:5.2.0, chalk@npm:^5.0.0, chalk@npm:^5.0.1":
-  version: 5.2.0
-  resolution: "chalk@npm:5.2.0"
-  checksum: 03d8060277de6cf2fd567dc25fcf770593eb5bb85f460ce443e49255a30ff1242edd0c90a06a03803b0466ff0687a939b41db1757bec987113e83de89a003caa
+"chalk@npm:5.3.0, chalk@npm:^5.0.0, chalk@npm:^5.0.1":
+  version: 5.3.0
+  resolution: "chalk@npm:5.3.0"
+  checksum: 623922e077b7d1e9dedaea6f8b9e9352921f8ae3afe739132e0e00c275971bdd331268183b2628cf4ab1727c45ea1f28d7e24ac23ce1db1eb653c414ca8a5a80
   languageName: node
   linkType: hard
 
@@ -12670,13 +12885,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"color-convert@npm:^0.5.2":
-  version: 0.5.3
-  resolution: "color-convert@npm:0.5.3"
-  checksum: 1074989a2c216d0171a397b870a0d698ef802ab3f9ece72b35bd92c4d20aeab31f222ea525dd5d3fad175a3f256a750eadd14ab882caed0089efc1cb7ba74086
-  languageName: node
-  linkType: hard
-
 "color-convert@npm:^1.9.0":
   version: 1.9.3
   resolution: "color-convert@npm:1.9.3"
@@ -12702,7 +12910,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"color-name@npm:^1.0.0, color-name@npm:^1.1.4, color-name@npm:~1.1.4":
+"color-name@npm:^1.1.4, color-name@npm:~1.1.4":
   version: 1.1.4
   resolution: "color-name@npm:1.1.4"
   checksum: b0445859521eb4021cd0fb0cc1a75cecf67fceecae89b63f62b201cca8d345baf8b952c966862a9d9a2632987d4f6581f0ec8d957dfacece86f0a7919316f610
@@ -12732,10 +12940,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"colorette@npm:^2.0.10, colorette@npm:^2.0.19":
-  version: 2.0.19
-  resolution: "colorette@npm:2.0.19"
-  checksum: 888cf5493f781e5fcf54ce4d49e9d7d698f96ea2b2ef67906834bb319a392c667f9ec69f4a10e268d2946d13a9503d2d19b3abaaaf174e3451bfe91fb9d82427
+"colorette@npm:^2.0.10, colorette@npm:^2.0.19, colorette@npm:^2.0.20":
+  version: 2.0.20
+  resolution: "colorette@npm:2.0.20"
+  checksum: 0c016fea2b91b733eb9f4bcdb580018f52c0bc0979443dad930e5037a968237ac53d9beb98e218d2e9235834f8eebce7f8e080422d6194e957454255bde71d3d
   languageName: node
   linkType: hard
 
@@ -12774,6 +12982,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"commander@npm:11.0.0":
+  version: 11.0.0
+  resolution: "commander@npm:11.0.0"
+  checksum: 6621954e1e1d078b4991c1f5bbd9439ad37aa7768d6ab4842de1dbd4d222c8a27e1b8e62108b3a92988614af45031d5bb2a2aaa92951f4d0c934d1a1ac564bb4
+  languageName: node
+  linkType: hard
+
 "commander@npm:2.11.x":
   version: 2.11.0
   resolution: "commander@npm:2.11.0"
@@ -12781,13 +12996,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:^10.0.0":
-  version: 10.0.0
-  resolution: "commander@npm:10.0.0"
-  checksum: 9f6495651f878213005ac744dd87a85fa3d9f2b8b90d1c19d0866d666bda7f735adfd7c2f10dfff345782e2f80ea258f98bb4efcef58e4e502f25f883940acfd
-  languageName: node
-  linkType: hard
-
 "commander@npm:^2.18.0, commander@npm:^2.19.0, commander@npm:^2.20.0":
   version: 2.20.3
   resolution: "commander@npm:2.20.3"
@@ -13369,16 +13577,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-color-converter@npm:^1.0.2":
-  version: 1.1.1
-  resolution: "css-color-converter@npm:1.1.1"
-  dependencies:
-    color-convert: ^0.5.2
-    color-name: ^1.0.0
-  checksum: c859befcee0c93a2361e0ef45478b7cb87849c333e2821bc98a7c9e1ccefcc30bd03d8c9dd962bd91f8fcc81545c1f07a11ffec7bc533917d5a10de06871ced5
-  languageName: node
-  linkType: hard
-
 "css-color-keywords@npm:^1.0.0":
   version: 1.0.0
   resolution: "css-color-keywords@npm:1.0.0"
@@ -13540,13 +13738,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-unit-converter@npm:^1.0.0":
-  version: 1.1.2
-  resolution: "css-unit-converter@npm:1.1.2"
-  checksum: 07888033346a5128f34dbe2f72884c966d24e9f29db24416dcde92860242490617ef9a178ac193a92f730834bbeea026cdc7027701d92ba9bbbe59db7a37eb2a
-  languageName: node
-  linkType: hard
-
 "css-what@npm:^5.0.0":
   version: 5.1.0
   resolution: "css-what@npm:5.1.0"
@@ -13929,9 +14120,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cypress@npm:13.2.0":
-  version: 13.2.0
-  resolution: "cypress@npm:13.2.0"
+"cypress@npm:13.3.1":
+  version: 13.3.1
+  resolution: "cypress@npm:13.3.1"
   dependencies:
     "@cypress/request": ^3.0.0
     "@cypress/xvfb": ^1.2.4
@@ -13978,7 +14169,7 @@ __metadata:
     yauzl: ^2.10.0
   bin:
     cypress: bin/cypress
-  checksum: 7647814f07626bd63e7b8dc4d066179fa40bf492c588bbc2626d983a2baab6cb77c29958dc92442f277e0a8e94866decc51c4de306021739c47e32baf5970219
+  checksum: 51798ecc6c5a33860012ecf39c428540911c3cf4df6ee63ea950cafea4a6c415d18da87951721f45b8601637e9731af4cf1464d37d62a36ce7243f8bfc8a59d2
   languageName: node
   linkType: hard
 
@@ -14055,7 +14246,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.0, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4, debug@npm:~4.3.1, debug@npm:~4.3.2":
+"debug@npm:4, debug@npm:4.3.4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.0, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4, debug@npm:~4.3.1, debug@npm:~4.3.2":
   version: 4.3.4
   resolution: "debug@npm:4.3.4"
   dependencies:
@@ -14181,7 +14372,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"default-browser-id@npm:3.0.0":
+"default-browser-id@npm:3.0.0, default-browser-id@npm:^3.0.0":
   version: 3.0.0
   resolution: "default-browser-id@npm:3.0.0"
   dependencies:
@@ -14191,6 +14382,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"default-browser@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "default-browser@npm:4.0.0"
+  dependencies:
+    bundle-name: ^3.0.0
+    default-browser-id: ^3.0.0
+    execa: ^7.1.1
+    titleize: ^3.0.0
+  checksum: 40c5af984799042b140300be5639c9742599bda76dc9eba5ac9ad5943c83dd36cebc4471eafcfddf8e0ec817166d5ba89d56f08e66a126c7c7908a179cead1a7
+  languageName: node
+  linkType: hard
+
 "default-gateway@npm:^6.0.3":
   version: 6.0.3
   resolution: "default-gateway@npm:6.0.3"
@@ -14216,6 +14419,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"define-data-property@npm:^1.0.1":
+  version: 1.1.0
+  resolution: "define-data-property@npm:1.1.0"
+  dependencies:
+    get-intrinsic: ^1.2.1
+    gopd: ^1.0.1
+    has-property-descriptors: ^1.0.0
+  checksum: 7ad4ee84cca8ad427a4831f5693526804b62ce9dfd4efac77214e95a4382aed930072251d4075dc8dc9fc949a353ed51f19f5285a84a788ba9216cc51472a093
+  languageName: node
+  linkType: hard
+
 "define-lazy-prop@npm:^2.0.0":
   version: 2.0.0
   resolution: "define-lazy-prop@npm:2.0.0"
@@ -14223,13 +14437,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"define-properties@npm:^1.1.3, define-properties@npm:^1.1.4, define-properties@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "define-properties@npm:1.2.0"
+"define-lazy-prop@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "define-lazy-prop@npm:3.0.0"
+  checksum: 54884f94caac0791bf6395a3ec530ce901cf71c47b0196b8754f3fd17edb6c0e80149c1214429d851873bb0d689dbe08dcedbb2306dc45c8534a5934723851b6
+  languageName: node
+  linkType: hard
+
+"define-properties@npm:^1.1.3, define-properties@npm:^1.1.4, define-properties@npm:^1.2.0, define-properties@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "define-properties@npm:1.2.1"
   dependencies:
+    define-data-property: ^1.0.1
     has-property-descriptors: ^1.0.0
     object-keys: ^1.1.1
-  checksum: e60aee6a19b102df4e2b1f301816804e81ab48bb91f00d0d935f269bf4b3f79c88b39e4f89eaa132890d23267335fd1140dfcd8d5ccd61031a0a2c41a54e33a6
+  checksum: b4ccd00597dd46cb2d4a379398f5b19fca84a16f3374e2249201992f36b30f6835949a9429669ee6b41b6e837205a163eadd745e472069e70dfc10f03e5fcc12
   languageName: node
   linkType: hard
 
@@ -14355,9 +14577,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"design-system@npm:@appsmithorg/design-system@2.1.21":
-  version: 2.1.21
-  resolution: "@appsmithorg/design-system@npm:2.1.21"
+"design-system@npm:@appsmithorg/design-system@2.1.23":
+  version: 2.1.23
+  resolution: "@appsmithorg/design-system@npm:2.1.23"
   dependencies:
     "@radix-ui/react-dialog": ^1.0.2
     "@radix-ui/react-dropdown-menu": ^2.0.4
@@ -14383,7 +14605,7 @@ __metadata:
     react-dom: ^17.0.2
     react-router-dom: ^5.0.0
     styled-components: ^5.3.6
-  checksum: 7d23312f769b62c1cb84608a9083e6d39c67201096604e6c3d86bfab8b351c4b4055bd3ed1b199aa2e8464eef2ae2e77743c65537c80273ae174a3975ee0d5b9
+  checksum: c64a75d8e64cf09d6db915f37584a849e412f979966145461f538c9ee1b5bda6a26170526f5ad1e55366732d72b1e9e33c14a049e298876f0dfeb3a2adfacbb7
   languageName: node
   linkType: hard
 
@@ -15228,17 +15450,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-abstract@npm:^1.17.2, es-abstract@npm:^1.19.0, es-abstract@npm:^1.19.1, es-abstract@npm:^1.19.5, es-abstract@npm:^1.20.4":
-  version: 1.21.1
-  resolution: "es-abstract@npm:1.21.1"
+"es-abstract@npm:^1.17.2, es-abstract@npm:^1.20.4, es-abstract@npm:^1.22.1":
+  version: 1.22.2
+  resolution: "es-abstract@npm:1.22.2"
   dependencies:
+    array-buffer-byte-length: ^1.0.0
+    arraybuffer.prototype.slice: ^1.0.2
     available-typed-arrays: ^1.0.5
     call-bind: ^1.0.2
     es-set-tostringtag: ^2.0.1
     es-to-primitive: ^1.2.1
-    function-bind: ^1.1.1
-    function.prototype.name: ^1.1.5
-    get-intrinsic: ^1.1.3
+    function.prototype.name: ^1.1.6
+    get-intrinsic: ^1.2.1
     get-symbol-description: ^1.0.0
     globalthis: ^1.0.3
     gopd: ^1.0.1
@@ -15246,26 +15469,31 @@ __metadata:
     has-property-descriptors: ^1.0.0
     has-proto: ^1.0.1
     has-symbols: ^1.0.3
-    internal-slot: ^1.0.4
-    is-array-buffer: ^3.0.1
+    internal-slot: ^1.0.5
+    is-array-buffer: ^3.0.2
     is-callable: ^1.2.7
     is-negative-zero: ^2.0.2
     is-regex: ^1.1.4
     is-shared-array-buffer: ^1.0.2
     is-string: ^1.0.7
-    is-typed-array: ^1.1.10
+    is-typed-array: ^1.1.12
     is-weakref: ^1.0.2
-    object-inspect: ^1.12.2
+    object-inspect: ^1.12.3
     object-keys: ^1.1.1
     object.assign: ^4.1.4
-    regexp.prototype.flags: ^1.4.3
+    regexp.prototype.flags: ^1.5.1
+    safe-array-concat: ^1.0.1
     safe-regex-test: ^1.0.0
-    string.prototype.trimend: ^1.0.6
-    string.prototype.trimstart: ^1.0.6
+    string.prototype.trim: ^1.2.8
+    string.prototype.trimend: ^1.0.7
+    string.prototype.trimstart: ^1.0.7
+    typed-array-buffer: ^1.0.0
+    typed-array-byte-length: ^1.0.0
+    typed-array-byte-offset: ^1.0.0
     typed-array-length: ^1.0.4
     unbox-primitive: ^1.0.2
-    which-typed-array: ^1.1.9
-  checksum: 23ff60d42d17a55d150e7bcedbdb065d4077a8b98c436e0e2e1ef4dd532a6d78a56028673de0bd8ed464a43c46ba781c50d9af429b6a17e44dbd14c7d7fb7926
+    which-typed-array: ^1.1.11
+  checksum: cc70e592d360d7d729859013dee7a610c6b27ed8630df0547c16b0d16d9fe6505a70ee14d1af08d970fdd132b3f88c9ca7815ce72c9011608abf8ab0e55fc515
   languageName: node
   linkType: hard
 
@@ -15293,6 +15521,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"es-iterator-helpers@npm:^1.0.12":
+  version: 1.0.15
+  resolution: "es-iterator-helpers@npm:1.0.15"
+  dependencies:
+    asynciterator.prototype: ^1.0.0
+    call-bind: ^1.0.2
+    define-properties: ^1.2.1
+    es-abstract: ^1.22.1
+    es-set-tostringtag: ^2.0.1
+    function-bind: ^1.1.1
+    get-intrinsic: ^1.2.1
+    globalthis: ^1.0.3
+    has-property-descriptors: ^1.0.0
+    has-proto: ^1.0.1
+    has-symbols: ^1.0.3
+    internal-slot: ^1.0.5
+    iterator.prototype: ^1.1.2
+    safe-array-concat: ^1.0.1
+  checksum: 50081ae5c549efe62e5c1d244df0194b40b075f7897fc2116b7e1aa437eb3c41f946d2afda18c33f9b31266ec544765932542765af839f76fa6d7b7855d1e0e1
+  languageName: node
+  linkType: hard
+
 "es-module-lexer@npm:^0.9.0, es-module-lexer@npm:^0.9.3":
   version: 0.9.3
   resolution: "es-module-lexer@npm:0.9.3"
@@ -15578,14 +15828,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-config-prettier@npm:^8.6.0":
-  version: 8.7.0
-  resolution: "eslint-config-prettier@npm:8.7.0"
+"eslint-config-prettier@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "eslint-config-prettier@npm:9.0.0"
   peerDependencies:
     eslint: ">=7.0.0"
   bin:
     eslint-config-prettier: bin/cli.js
-  checksum: b05bc7f2296ce3e0925c14147849706544870e0382d38af2352d709a6cf8521bdaff2bd8e5021f1780e570775a8ffa1d2bac28b8065d90d43a3f1f98fd26ce52
+  checksum: 362e991b6cb343f79362bada2d97c202e5303e6865888918a7445c555fb75e4c078b01278e90be98aa98ae22f8597d8e93d48314bec6824f540f7efcab3ce451
   languageName: node
   linkType: hard
 
@@ -15620,47 +15870,50 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-import-resolver-babel-module@npm:^5.3.1":
-  version: 5.3.1
-  resolution: "eslint-import-resolver-babel-module@npm:5.3.1"
+"eslint-import-resolver-babel-module@npm:^5.3.2":
+  version: 5.3.2
+  resolution: "eslint-import-resolver-babel-module@npm:5.3.2"
   dependencies:
     pkg-up: ^3.1.0
     resolve: ^1.20.0
   peerDependencies:
     "@babel/core": ^7.0.0-0
-    babel-plugin-module-resolver: ^3.0.0 || ^4.0.0
-  checksum: cd26740e9b9b7bb12667aabcc5c3e0e39a401b32b2890dfc4fd2444a00910f7e23fdb65cbb6084b026ade43899f824a2c762ce6078f5eb977762b8dda31aca1a
+    babel-plugin-module-resolver: ^3.0.0 || ^4.0.0 || ^5.0.0
+  checksum: 6c9b941860cae665d514f0b42743e869394f19031247ca1a5433f1723952196002ac3dc949e83cacc64a0d49f56bcef01fa36fa12f8adce28b242f7022744d04
   languageName: node
   linkType: hard
 
-"eslint-import-resolver-node@npm:^0.3.6":
-  version: 0.3.6
-  resolution: "eslint-import-resolver-node@npm:0.3.6"
+"eslint-import-resolver-node@npm:^0.3.7":
+  version: 0.3.9
+  resolution: "eslint-import-resolver-node@npm:0.3.9"
   dependencies:
     debug: ^3.2.7
-    resolve: ^1.20.0
-  checksum: 6266733af1e112970e855a5bcc2d2058fb5ae16ad2a6d400705a86b29552b36131ffc5581b744c23d550de844206fb55e9193691619ee4dbf225c4bde526b1c8
+    is-core-module: ^2.13.0
+    resolve: ^1.22.4
+  checksum: 439b91271236b452d478d0522a44482e8c8540bf9df9bd744062ebb89ab45727a3acd03366a6ba2bdbcde8f9f718bab7fe8db64688aca75acf37e04eafd25e22
   languageName: node
   linkType: hard
 
-"eslint-module-utils@npm:^2.7.3":
-  version: 2.7.3
-  resolution: "eslint-module-utils@npm:2.7.3"
+"eslint-module-utils@npm:^2.8.0":
+  version: 2.8.0
+  resolution: "eslint-module-utils@npm:2.8.0"
   dependencies:
     debug: ^3.2.7
-    find-up: ^2.1.0
-  checksum: 77048263f309167a1e6a1e1b896bfb5ddd1d3859b2e2abbd9c32c432aee13d610d46e6820b1ca81b37fba437cf423a404bc6649be64ace9148a3062d1886a678
+  peerDependenciesMeta:
+    eslint:
+      optional: true
+  checksum: 74c6dfea7641ebcfe174be61168541a11a14aa8d72e515f5f09af55cd0d0862686104b0524aa4b8e0ce66418a44aa38a94d2588743db5fd07a6b49ffd16921d2
   languageName: node
   linkType: hard
 
-"eslint-plugin-cypress@npm:^2.11.2":
-  version: 2.11.2
-  resolution: "eslint-plugin-cypress@npm:2.11.2"
+"eslint-plugin-cypress@npm:^2.15.1":
+  version: 2.15.1
+  resolution: "eslint-plugin-cypress@npm:2.15.1"
   dependencies:
-    globals: ^11.12.0
+    globals: ^13.20.0
   peerDependencies:
     eslint: ">= 3.2.1"
-  checksum: b1e68f13d78595f21ef003c9e36be2c56c25434d32196c18cdaac8ebe4899c4235b2558f84572493e2458341962fb753d0d17b0b4dfc01d93ff912026954c332
+  checksum: 3e66fa9a943fff52eaf3758250a63c2a0f8ffd60c50572beaf3688b33a55fbf0060d18ef32bc26abb57aef070517db827c22fd3d607582861d464970f95e550e
   languageName: node
   linkType: hard
 
@@ -15678,26 +15931,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-import@npm:^2.25.2, eslint-plugin-import@npm:^2.25.3":
-  version: 2.26.0
-  resolution: "eslint-plugin-import@npm:2.26.0"
+"eslint-plugin-import@npm:^2.25.3, eslint-plugin-import@npm:^2.28.1":
+  version: 2.28.1
+  resolution: "eslint-plugin-import@npm:2.28.1"
   dependencies:
-    array-includes: ^3.1.4
-    array.prototype.flat: ^1.2.5
-    debug: ^2.6.9
+    array-includes: ^3.1.6
+    array.prototype.findlastindex: ^1.2.2
+    array.prototype.flat: ^1.3.1
+    array.prototype.flatmap: ^1.3.1
+    debug: ^3.2.7
     doctrine: ^2.1.0
-    eslint-import-resolver-node: ^0.3.6
-    eslint-module-utils: ^2.7.3
+    eslint-import-resolver-node: ^0.3.7
+    eslint-module-utils: ^2.8.0
     has: ^1.0.3
-    is-core-module: ^2.8.1
+    is-core-module: ^2.13.0
     is-glob: ^4.0.3
     minimatch: ^3.1.2
-    object.values: ^1.1.5
-    resolve: ^1.22.0
-    tsconfig-paths: ^3.14.1
+    object.fromentries: ^2.0.6
+    object.groupby: ^1.0.0
+    object.values: ^1.1.6
+    semver: ^6.3.1
+    tsconfig-paths: ^3.14.2
   peerDependencies:
     eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
-  checksum: 0bf77ad80339554481eafa2b1967449e1f816b94c7a6f9614ce33fb4083c4e6c050f10d241dd50b4975d47922880a34de1e42ea9d8e6fd663ebb768baa67e655
+  checksum: e8ae6dd8f06d8adf685f9c1cfd46ac9e053e344a05c4090767e83b63a85c8421ada389807a39e73c643b9bff156715c122e89778169110ed68d6428e12607edf
   languageName: node
   linkType: hard
 
@@ -15718,20 +15975,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-jest@npm:^27.2.1":
-  version: 27.2.1
-  resolution: "eslint-plugin-jest@npm:27.2.1"
+"eslint-plugin-jest@npm:^27.4.2":
+  version: 27.4.2
+  resolution: "eslint-plugin-jest@npm:27.4.2"
   dependencies:
     "@typescript-eslint/utils": ^5.10.0
   peerDependencies:
-    "@typescript-eslint/eslint-plugin": ^5.0.0
+    "@typescript-eslint/eslint-plugin": ^5.0.0 || ^6.0.0
     eslint: ^7.0.0 || ^8.0.0
+    jest: "*"
   peerDependenciesMeta:
     "@typescript-eslint/eslint-plugin":
       optional: true
     jest:
       optional: true
-  checksum: 579a4d26304cc6748b2e6dff6c965ea7a21b618d8b051eb02727d25cf5c7767f6db8ef5237531635ff77e242b983b973e7cb8c820a4d20d5bda73358c452a8ab
+  checksum: 99a8301ae00c37da97866b8b13c89a077716d2c653b26bc417d242e7300a43237c0017fd488c43966fa38585f19050facdbbc71d03ca36a1ce6f2ba930a9143e
   languageName: node
   linkType: hard
 
@@ -15757,77 +16015,74 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-prettier@npm:^4.2.1":
-  version: 4.2.1
-  resolution: "eslint-plugin-prettier@npm:4.2.1"
+"eslint-plugin-prettier@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "eslint-plugin-prettier@npm:5.0.0"
   dependencies:
     prettier-linter-helpers: ^1.0.0
+    synckit: ^0.8.5
   peerDependencies:
-    eslint: ">=7.28.0"
-    prettier: ">=2.0.0"
+    "@types/eslint": ">=8.0.0"
+    eslint: ">=8.0.0"
+    prettier: ">=3.0.0"
   peerDependenciesMeta:
+    "@types/eslint":
+      optional: true
     eslint-config-prettier:
       optional: true
-  checksum: b9e839d2334ad8ec7a5589c5cb0f219bded260839a857d7a486997f9870e95106aa59b8756ff3f37202085ebab658de382b0267cae44c3a7f0eb0bcc03a4f6d6
+  checksum: 84e88744b9050f2d5ef31b94e85294dda16f3a53c2449f9d33eac8ae6264889b459bf35a68e438fb6b329c2a1d6491aac4bfa00d86317e7009de3dad0311bec6
   languageName: node
   linkType: hard
 
-"eslint-plugin-react-hooks@npm:^2.3.0":
-  version: 2.5.1
-  resolution: "eslint-plugin-react-hooks@npm:2.5.1"
-  peerDependencies:
-    eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0
-  checksum: a787ea0c665304f3f7249f5528ff1054bd8cfd6b188b95d048ff527b7e54ab7fb10d72254dba1738966e1a8fc4bd2d9fdf8ceb78d205fecbc7f660a334cd512e
-  languageName: node
-  linkType: hard
-
-"eslint-plugin-react-hooks@npm:^4.3.0":
-  version: 4.5.0
-  resolution: "eslint-plugin-react-hooks@npm:4.5.0"
+"eslint-plugin-react-hooks@npm:^4.3.0, eslint-plugin-react-hooks@npm:^4.6.0":
+  version: 4.6.0
+  resolution: "eslint-plugin-react-hooks@npm:4.6.0"
   peerDependencies:
     eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
-  checksum: 0389377de635dd9b769f6f52e2c9e6ab857a0cdfecc3734c95ce81676a752e781bb5c44fd180e01953a03a77278323d90729776438815557b069ceb988ab1f9f
+  checksum: 23001801f14c1d16bf0a837ca7970d9dd94e7b560384b41db378b49b6e32dc43d6e2790de1bd737a652a86f81a08d6a91f402525061b47719328f586a57e86c3
   languageName: node
   linkType: hard
 
-"eslint-plugin-react@npm:^7.27.1, eslint-plugin-react@npm:^7.30.0":
-  version: 7.30.0
-  resolution: "eslint-plugin-react@npm:7.30.0"
+"eslint-plugin-react@npm:^7.27.1, eslint-plugin-react@npm:^7.33.2":
+  version: 7.33.2
+  resolution: "eslint-plugin-react@npm:7.33.2"
   dependencies:
-    array-includes: ^3.1.5
-    array.prototype.flatmap: ^1.3.0
+    array-includes: ^3.1.6
+    array.prototype.flatmap: ^1.3.1
+    array.prototype.tosorted: ^1.1.1
     doctrine: ^2.1.0
+    es-iterator-helpers: ^1.0.12
     estraverse: ^5.3.0
     jsx-ast-utils: ^2.4.1 || ^3.0.0
     minimatch: ^3.1.2
-    object.entries: ^1.1.5
-    object.fromentries: ^2.0.5
-    object.hasown: ^1.1.1
-    object.values: ^1.1.5
+    object.entries: ^1.1.6
+    object.fromentries: ^2.0.6
+    object.hasown: ^1.1.2
+    object.values: ^1.1.6
     prop-types: ^15.8.1
-    resolve: ^2.0.0-next.3
-    semver: ^6.3.0
-    string.prototype.matchall: ^4.0.7
+    resolve: ^2.0.0-next.4
+    semver: ^6.3.1
+    string.prototype.matchall: ^4.0.8
   peerDependencies:
     eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: 729b7682a0fe6eab068171c159503ac57120ecc7b20067e76300b08879745c16a687e2033378ab45d9a3182da8844d06197a89081be83e1eb21fcceb76e79214
+  checksum: b4c3d76390b0ae6b6f9fed78170604cc2c04b48e6778a637db339e8e3911ec9ef22510b0ae77c429698151d0f1b245f282177f384105b6830e7b29b9c9b26610
   languageName: node
   linkType: hard
 
-"eslint-plugin-sort-destructure-keys@npm:^1.3.5":
-  version: 1.3.5
-  resolution: "eslint-plugin-sort-destructure-keys@npm:1.3.5"
+"eslint-plugin-sort-destructure-keys@npm:^1.5.0":
+  version: 1.5.0
+  resolution: "eslint-plugin-sort-destructure-keys@npm:1.5.0"
   dependencies:
     natural-compare-lite: ^1.4.0
   peerDependencies:
-    eslint: 3 - 7
-  checksum: 7bd65b44f777d34f9848a81f382ae655d7e8d1433ef936aa379648a7810ab039183a9173372711231b3cacac4fe67f6dd94f0f7b2110cdf6ca1e208dc68c5a3c
+    eslint: 3 - 8
+  checksum: dafa189d79f6de7c32ae4e100b4d7e40dddf0eee33bd270c78eb8c9b8b81aa48245832d2a891de48c5f0dad8b2bd06b63b1a7994d4b6d8b69f1559351b10e1c0
   languageName: node
   linkType: hard
 
-"eslint-plugin-storybook@npm:^0.6.10, eslint-plugin-storybook@npm:^0.6.11, eslint-plugin-storybook@npm:^0.6.8":
-  version: 0.6.12
-  resolution: "eslint-plugin-storybook@npm:0.6.12"
+"eslint-plugin-storybook@npm:^0.6.10, eslint-plugin-storybook@npm:^0.6.15, eslint-plugin-storybook@npm:^0.6.8":
+  version: 0.6.15
+  resolution: "eslint-plugin-storybook@npm:0.6.15"
   dependencies:
     "@storybook/csf": ^0.0.1
     "@typescript-eslint/utils": ^5.45.0
@@ -15835,7 +16090,7 @@ __metadata:
     ts-dedent: ^2.2.0
   peerDependencies:
     eslint: ">=6"
-  checksum: 8e0e160c71216019c291a5a03b797b5359076067d16ea03b3dec63594093d45398f028d15c47eb89f2ddb6e8db18cc7e376b02d921dacc4fb31bbc8da46363c8
+  checksum: e2c4d7be3e695c88d7194c363fba8ac644b36583bf9d608aa59dcd53cc5e422f7828611ee49c7934639ce827c0206d33fa94b3ea452ffbd2c8e7254ed90bc412
   languageName: node
   linkType: hard
 
@@ -15860,13 +16115,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-scope@npm:^7.2.0":
-  version: 7.2.0
-  resolution: "eslint-scope@npm:7.2.0"
+"eslint-scope@npm:^7.2.2":
+  version: 7.2.2
+  resolution: "eslint-scope@npm:7.2.2"
   dependencies:
     esrecurse: ^4.3.0
     estraverse: ^5.2.0
-  checksum: 64591a2d8b244ade9c690b59ef238a11d5c721a98bcee9e9f445454f442d03d3e04eda88e95a4daec558220a99fa384309d9faae3d459bd40e7a81b4063980ae
+  checksum: ec97dbf5fb04b94e8f4c5a91a7f0a6dd3c55e46bfc7bbcd0e3138c3a76977570e02ed89a1810c778dcd72072ff0e9621ba1379b4babe53921d71e2e4486fda3e
   languageName: node
   linkType: hard
 
@@ -15888,10 +16143,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1":
-  version: 3.4.1
-  resolution: "eslint-visitor-keys@npm:3.4.1"
-  checksum: f05121d868202736b97de7d750847a328fcfa8593b031c95ea89425333db59676ac087fa905eba438d0a3c5769632f828187e0c1a0d271832a2153c1d3661c2c
+"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.3":
+  version: 3.4.3
+  resolution: "eslint-visitor-keys@npm:3.4.3"
+  checksum: 36e9ef87fca698b6fd7ca5ca35d7b2b6eeaaf106572e2f7fd31c12d3bfdaccdb587bba6d3621067e5aece31c8c3a348b93922ab8f7b2cbc6aaab5e1d89040c60
   languageName: node
   linkType: hard
 
@@ -15911,26 +16166,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:^8.3.0, eslint@npm:^8.42.0":
-  version: 8.42.0
-  resolution: "eslint@npm:8.42.0"
+"eslint@npm:^8.3.0, eslint@npm:^8.51.0":
+  version: 8.51.0
+  resolution: "eslint@npm:8.51.0"
   dependencies:
     "@eslint-community/eslint-utils": ^4.2.0
-    "@eslint-community/regexpp": ^4.4.0
-    "@eslint/eslintrc": ^2.0.3
-    "@eslint/js": 8.42.0
-    "@humanwhocodes/config-array": ^0.11.10
+    "@eslint-community/regexpp": ^4.6.1
+    "@eslint/eslintrc": ^2.1.2
+    "@eslint/js": 8.51.0
+    "@humanwhocodes/config-array": ^0.11.11
     "@humanwhocodes/module-importer": ^1.0.1
     "@nodelib/fs.walk": ^1.2.8
-    ajv: ^6.10.0
+    ajv: ^6.12.4
     chalk: ^4.0.0
     cross-spawn: ^7.0.2
     debug: ^4.3.2
     doctrine: ^3.0.0
     escape-string-regexp: ^4.0.0
-    eslint-scope: ^7.2.0
-    eslint-visitor-keys: ^3.4.1
-    espree: ^9.5.2
+    eslint-scope: ^7.2.2
+    eslint-visitor-keys: ^3.4.3
+    espree: ^9.6.1
     esquery: ^1.4.2
     esutils: ^2.0.2
     fast-deep-equal: ^3.1.3
@@ -15940,7 +16195,6 @@ __metadata:
     globals: ^13.19.0
     graphemer: ^1.4.0
     ignore: ^5.2.0
-    import-fresh: ^3.0.0
     imurmurhash: ^0.1.4
     is-glob: ^4.0.0
     is-path-inside: ^3.0.3
@@ -15950,13 +16204,12 @@ __metadata:
     lodash.merge: ^4.6.2
     minimatch: ^3.1.2
     natural-compare: ^1.4.0
-    optionator: ^0.9.1
+    optionator: ^0.9.3
     strip-ansi: ^6.0.1
-    strip-json-comments: ^3.1.0
     text-table: ^0.2.0
   bin:
     eslint: bin/eslint.js
-  checksum: 07105397b5f2ff4064b983b8971e8c379ec04b1dfcc9d918976b3e00377189000161dac991d82ba14f8759e466091b8c71146f602930ca810c290ee3fcb3faf0
+  checksum: 214fa5d1fcb67af1b8992ce9584ccd85e1aa7a482f8b8ea5b96edc28fa838a18a3b69456db45fc1ed3ef95f1e9efa9714f737292dc681e572d471d02fda9649c
   languageName: node
   linkType: hard
 
@@ -15967,14 +16220,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"espree@npm:^9.5.2":
-  version: 9.5.2
-  resolution: "espree@npm:9.5.2"
+"espree@npm:^9.6.0, espree@npm:^9.6.1":
+  version: 9.6.1
+  resolution: "espree@npm:9.6.1"
   dependencies:
-    acorn: ^8.8.0
+    acorn: ^8.9.0
     acorn-jsx: ^5.3.2
     eslint-visitor-keys: ^3.4.1
-  checksum: 6506289d6eb26471c0b383ee24fee5c8ae9d61ad540be956b3127be5ce3bf687d2ba6538ee5a86769812c7c552a9d8239e8c4d150f9ea056c6d5cbe8399c03c1
+  checksum: eb8c149c7a2a77b3f33a5af80c10875c3abd65450f60b8af6db1bfcfa8f101e21c1e56a561c6dc13b848e18148d43469e7cd208506238554fb5395a9ea5a1ab9
   languageName: node
   linkType: hard
 
@@ -16073,6 +16326,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eventemitter3@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "eventemitter3@npm:5.0.1"
+  checksum: 543d6c858ab699303c3c32e0f0f47fc64d360bf73c3daf0ac0b5079710e340d6fe9f15487f94e66c629f5f82cd1a8678d692f3dbb6f6fcd1190e1b97fcad36f8
+  languageName: node
+  linkType: hard
+
 "events@npm:1.1.1, events@npm:^1.1.1":
   version: 1.1.1
   resolution: "events@npm:1.1.1"
@@ -16122,6 +16382,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"execa@npm:7.2.0, execa@npm:^7.1.1":
+  version: 7.2.0
+  resolution: "execa@npm:7.2.0"
+  dependencies:
+    cross-spawn: ^7.0.3
+    get-stream: ^6.0.1
+    human-signals: ^4.3.0
+    is-stream: ^3.0.0
+    merge-stream: ^2.0.0
+    npm-run-path: ^5.1.0
+    onetime: ^6.0.0
+    signal-exit: ^3.0.7
+    strip-final-newline: ^3.0.0
+  checksum: 14fd17ba0ca8c87b277584d93b1d9fc24f2a65e5152b31d5eb159a3b814854283eaae5f51efa9525e304447e2f757c691877f7adff8fde5746aae67eb1edd1cc
+  languageName: node
+  linkType: hard
+
 "execa@npm:^1.0.0":
   version: 1.0.0
   resolution: "execa@npm:1.0.0"
@@ -16154,23 +16431,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"execa@npm:^7.0.0":
-  version: 7.1.1
-  resolution: "execa@npm:7.1.1"
-  dependencies:
-    cross-spawn: ^7.0.3
-    get-stream: ^6.0.1
-    human-signals: ^4.3.0
-    is-stream: ^3.0.0
-    merge-stream: ^2.0.0
-    npm-run-path: ^5.1.0
-    onetime: ^6.0.0
-    signal-exit: ^3.0.7
-    strip-final-newline: ^3.0.0
-  checksum: 21fa46fc69314ace4068cf820142bdde5b643a5d89831c2c9349479c1555bff137a291b8e749e7efca36535e4e0a8c772c11008ca2e84d2cbd6ca141a3c8f937
-  languageName: node
-  linkType: hard
-
 "executable@npm:^4.1.1":
   version: 4.1.1
   resolution: "executable@npm:4.1.1"
@@ -16365,13 +16625,13 @@ __metadata:
   linkType: hard
 
 "fast-diff@npm:^1.1.2":
-  version: 1.2.0
-  resolution: "fast-diff@npm:1.2.0"
-  checksum: 1b5306eaa9e826564d9e5ffcd6ebd881eb5f770b3f977fcbf38f05c824e42172b53c79920e8429c54eb742ce15a0caf268b0fdd5b38f6de52234c4a8368131ae
+  version: 1.3.0
+  resolution: "fast-diff@npm:1.3.0"
+  checksum: d22d371b994fdc8cce9ff510d7b8dc4da70ac327bcba20df607dd5b9cae9f908f4d1028f5fe467650f058d1e7270235ae0b8230809a262b4df587a3b3aa216c3
   languageName: node
   linkType: hard
 
-"fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.12, fast-glob@npm:^3.2.9":
+"fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.12, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0":
   version: 3.3.1
   resolution: "fast-glob@npm:3.3.1"
   dependencies:
@@ -16678,15 +16938,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"find-up@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "find-up@npm:2.1.0"
-  dependencies:
-    locate-path: ^2.0.0
-  checksum: 43284fe4da09f89011f08e3c32cd38401e786b19226ea440b75386c1b12a4cb738c94969808d53a84f564ede22f732c8409e3cfc3f7fb5b5c32378ad0bbf28bd
-  languageName: node
-  linkType: hard
-
 "find-up@npm:^3.0.0":
   version: 3.0.0
   resolution: "find-up@npm:3.0.0"
@@ -17099,19 +17350,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"function.prototype.name@npm:^1.1.5":
-  version: 1.1.5
-  resolution: "function.prototype.name@npm:1.1.5"
+"function.prototype.name@npm:^1.1.5, function.prototype.name@npm:^1.1.6":
+  version: 1.1.6
+  resolution: "function.prototype.name@npm:1.1.6"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.3
-    es-abstract: ^1.19.0
-    functions-have-names: ^1.2.2
-  checksum: acd21d733a9b649c2c442f067567743214af5fa248dbeee69d8278ce7df3329ea5abac572be9f7470b4ec1cd4d8f1040e3c5caccf98ebf2bf861a0deab735c27
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    functions-have-names: ^1.2.3
+  checksum: 7a3f9bd98adab09a07f6e1f03da03d3f7c26abbdeaeee15223f6c04a9fb5674792bdf5e689dac19b97ac71de6aad2027ba3048a9b883aa1b3173eed6ab07f479
   languageName: node
   linkType: hard
 
-"functions-have-names@npm:^1.2.2, functions-have-names@npm:^1.2.3":
+"functions-have-names@npm:^1.2.3":
   version: 1.2.3
   resolution: "functions-have-names@npm:1.2.3"
   checksum: c3f1f5ba20f4e962efb71344ce0a40722163e85bee2101ce25f88214e78182d2d2476aa85ef37950c579eb6cf6ee811c17b3101bb84004bb75655f3e33f3fdb5
@@ -17222,14 +17473,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "get-intrinsic@npm:1.2.0"
+"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "get-intrinsic@npm:1.2.1"
   dependencies:
     function-bind: ^1.1.1
     has: ^1.0.3
+    has-proto: ^1.0.1
     has-symbols: ^1.0.3
-  checksum: 78fc0487b783f5c58cf2dccafc3ae656ee8d2d8062a8831ce4a95e7057af4587a1d4882246c033aca0a7b4965276f4802b45cc300338d1b77a73d3e3e3f4877d
+  checksum: 5b61d88552c24b0cf6fa2d1b3bc5459d7306f699de060d76442cce49a4721f52b8c560a33ab392cf5575b7810277d54ded9d4d39a1ea61855619ebc005aa7e5f
   languageName: node
   linkType: hard
 
@@ -17488,19 +17740,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globals@npm:^11.1.0, globals@npm:^11.12.0":
+"globals@npm:^11.1.0":
   version: 11.12.0
   resolution: "globals@npm:11.12.0"
   checksum: 67051a45eca3db904aee189dfc7cd53c20c7d881679c93f6146ddd4c9f4ab2268e68a919df740d39c71f4445d2b38ee360fc234428baea1dbdfe68bbcb46979e
   languageName: node
   linkType: hard
 
-"globals@npm:^13.19.0":
-  version: 13.20.0
-  resolution: "globals@npm:13.20.0"
+"globals@npm:^13.19.0, globals@npm:^13.20.0":
+  version: 13.23.0
+  resolution: "globals@npm:13.23.0"
   dependencies:
     type-fest: ^0.20.2
-  checksum: ad1ecf914bd051325faad281d02ea2c0b1df5d01bd94d368dcc5513340eac41d14b3c61af325768e3c7f8d44576e72780ec0b6f2d366121f8eec6e03c3a3b97a
+  checksum: 194c97cf8d1ef6ba59417234c2386549c4103b6e5f24b1ff1952de61a4753e5d2069435ba629de711a6480b1b1d114a98e2ab27f85e966d5a10c319c3bbd3dc3
   languageName: node
   linkType: hard
 
@@ -17714,13 +17966,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"has-flag@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "has-flag@npm:1.0.0"
-  checksum: ce3f8ae978e70f16e4bbe17d3f0f6d6c0a3dd3b62a23f97c91d0fda9ed8e305e13baf95cc5bee4463b9f25ac9f5255de113165c5fb285e01b8065b2ac079b301
-  languageName: node
-  linkType: hard
-
 "has-flag@npm:^3.0.0":
   version: 3.0.0
   resolution: "has-flag@npm:3.0.0"
@@ -18308,10 +18553,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ignore@npm:^5.2.0":
-  version: 5.2.0
-  resolution: "ignore@npm:5.2.0"
-  checksum: 6b1f926792d614f64c6c83da3a1f9c83f6196c2839aa41e1e32dd7b8d174cef2e329d75caabb62cb61ce9dc432f75e67d07d122a037312db7caa73166a1bdb77
+"ignore@npm:^5.2.0, ignore@npm:^5.2.4":
+  version: 5.2.4
+  resolution: "ignore@npm:5.2.4"
+  checksum: 3d4c309c6006e2621659311783eaea7ebcd41fe4ca1d78c91c473157ad6666a57a2df790fe0d07a12300d9aac2888204d7be8d59f9aaf665b1c7fcdb432517ef
   languageName: node
   linkType: hard
 
@@ -18329,7 +18574,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"import-fresh@npm:^3.0.0, import-fresh@npm:^3.1.0, import-fresh@npm:^3.2.1":
+"import-fresh@npm:^3.1.0, import-fresh@npm:^3.2.1":
   version: 3.2.1
   resolution: "import-fresh@npm:3.2.1"
   dependencies:
@@ -18504,7 +18749,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"internal-slot@npm:^1.0.3, internal-slot@npm:^1.0.4":
+"internal-slot@npm:^1.0.4, internal-slot@npm:^1.0.5":
   version: 1.0.5
   resolution: "internal-slot@npm:1.0.5"
   dependencies:
@@ -18647,6 +18892,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-async-function@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "is-async-function@npm:2.0.0"
+  dependencies:
+    has-tostringtag: ^1.0.0
+  checksum: e3471d95e6c014bf37cad8a93f2f4b6aac962178e0a5041e8903147166964fdc1c5c1d2ef87e86d77322c370ca18f2ea004fa7420581fa747bcaf7c223069dbd
+  languageName: node
+  linkType: hard
+
 "is-bigint@npm:^1.0.1":
   version: 1.0.4
   resolution: "is-bigint@npm:1.0.4"
@@ -18711,7 +18965,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.13.0, is-core-module@npm:^2.2.0, is-core-module@npm:^2.8.1":
+"is-core-module@npm:^2.13.0, is-core-module@npm:^2.9.0":
   version: 2.13.0
   resolution: "is-core-module@npm:2.13.0"
   dependencies:
@@ -18752,6 +19006,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-docker@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "is-docker@npm:3.0.0"
+  bin:
+    is-docker: cli.js
+  checksum: b698118f04feb7eaf3338922bd79cba064ea54a1c3db6ec8c0c8d8ee7613e7e5854d802d3ef646812a8a3ace81182a085dfa0a71cc68b06f3fa794b9783b3c90
+  languageName: node
+  linkType: hard
+
 "is-extglob@npm:^2.1.1":
   version: 2.1.1
   resolution: "is-extglob@npm:2.1.1"
@@ -18759,6 +19022,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-finalizationregistry@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "is-finalizationregistry@npm:1.0.2"
+  dependencies:
+    call-bind: ^1.0.2
+  checksum: 4f243a8e06228cd45bdab8608d2cb7abfc20f6f0189c8ac21ea8d603f1f196eabd531ce0bb8e08cbab047e9845ef2c191a3761c9a17ad5cabf8b35499c4ad35d
+  languageName: node
+  linkType: hard
+
 "is-fullwidth-code-point@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-fullwidth-code-point@npm:1.0.0"
@@ -18796,7 +19068,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-generator-function@npm:^1.0.7":
+"is-generator-function@npm:^1.0.10, is-generator-function@npm:^1.0.7":
   version: 1.0.10
   resolution: "is-generator-function@npm:1.0.10"
   dependencies:
@@ -18828,6 +19100,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-inside-container@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "is-inside-container@npm:1.0.0"
+  dependencies:
+    is-docker: ^3.0.0
+  bin:
+    is-inside-container: cli.js
+  checksum: c50b75a2ab66ab3e8b92b3bc534e1ea72ca25766832c0623ac22d134116a98bcf012197d1caabe1d1c4bd5f84363d4aa5c36bb4b585fbcaf57be172cd10a1a03
+  languageName: node
+  linkType: hard
+
 "is-installed-globally@npm:^0.4.0, is-installed-globally@npm:~0.4.0":
   version: 0.4.0
   resolution: "is-installed-globally@npm:0.4.0"
@@ -19089,16 +19372,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.3, is-typed-array@npm:^1.1.9":
-  version: 1.1.10
-  resolution: "is-typed-array@npm:1.1.10"
+"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.12, is-typed-array@npm:^1.1.3, is-typed-array@npm:^1.1.9":
+  version: 1.1.12
+  resolution: "is-typed-array@npm:1.1.12"
   dependencies:
-    available-typed-arrays: ^1.0.5
-    call-bind: ^1.0.2
-    for-each: ^0.3.3
-    gopd: ^1.0.1
-    has-tostringtag: ^1.0.0
-  checksum: aac6ecb59d4c56a1cdeb69b1f129154ef462bbffe434cb8a8235ca89b42f258b7ae94073c41b3cb7bce37f6a1733ad4499f07882d5d5093a7ba84dfc4ebb8017
+    which-typed-array: ^1.1.11
+  checksum: 4c89c4a3be07186caddadf92197b17fda663a9d259ea0d44a85f171558270d36059d1c386d34a12cba22dfade5aba497ce22778e866adc9406098c8fc4771796
   languageName: node
   linkType: hard
 
@@ -19289,6 +19568,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"iterator.prototype@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "iterator.prototype@npm:1.1.2"
+  dependencies:
+    define-properties: ^1.2.1
+    get-intrinsic: ^1.2.1
+    has-symbols: ^1.0.3
+    reflect.getprototypeof: ^1.0.4
+    set-function-name: ^2.0.1
+  checksum: d8a507e2ccdc2ce762e8a1d3f4438c5669160ac72b88b648e59a688eec6bc4e64b22338e74000518418d9e693faf2a092d2af21b9ec7dbf7763b037a54701168
+  languageName: node
+  linkType: hard
+
 "iterm2-version@npm:^4.1.0":
   version: 4.2.0
   resolution: "iterm2-version@npm:4.2.0"
@@ -20440,13 +20732,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"js-base64@npm:^2.1.9":
-  version: 2.6.4
-  resolution: "js-base64@npm:2.6.4"
-  checksum: 5f4084078d6c46f8529741d110df84b14fac3276b903760c21fa8cc8521370d607325dfe1c1a9fbbeaae1ff8e602665aaeef1362427d8fef704f9e3659472ce8
-  languageName: node
-  linkType: hard
-
 "js-beautify@npm:^1.14.0":
   version: 1.14.0
   resolution: "js-beautify@npm:1.14.0"
@@ -20975,26 +21260,42 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lint-staged@npm:^13.2.0":
-  version: 13.2.0
-  resolution: "lint-staged@npm:13.2.0"
+"lint-staged@npm:^14.0.1":
+  version: 14.0.1
+  resolution: "lint-staged@npm:14.0.1"
   dependencies:
-    chalk: 5.2.0
-    cli-truncate: ^3.1.0
-    commander: ^10.0.0
-    debug: ^4.3.4
-    execa: ^7.0.0
+    chalk: 5.3.0
+    commander: 11.0.0
+    debug: 4.3.4
+    execa: 7.2.0
     lilconfig: 2.1.0
-    listr2: ^5.0.7
-    micromatch: ^4.0.5
-    normalize-path: ^3.0.0
-    object-inspect: ^1.12.3
-    pidtree: ^0.6.0
-    string-argv: ^0.3.1
-    yaml: ^2.2.1
+    listr2: 6.6.1
+    micromatch: 4.0.5
+    pidtree: 0.6.0
+    string-argv: 0.3.2
+    yaml: 2.3.1
   bin:
     lint-staged: bin/lint-staged.js
-  checksum: dcaa8fbbde567eb8ac27230a18b3a22f30c278c524c0e27cf7d4110d662d5d33ed68a585a2e1b05075ef1c262e853f557a5ae046188b723603246d63e6b9f07b
+  checksum: 8c5d740cb3c90fab2d970fa6bbffe5ddf35ec66ed374a52caf3a3cf83d8f4d5fd01a949994822bce5ea18c0b8dc8fa4ce087ef886a8c11db674139a063cdfe4f
+  languageName: node
+  linkType: hard
+
+"listr2@npm:6.6.1":
+  version: 6.6.1
+  resolution: "listr2@npm:6.6.1"
+  dependencies:
+    cli-truncate: ^3.1.0
+    colorette: ^2.0.20
+    eventemitter3: ^5.0.1
+    log-update: ^5.0.1
+    rfdc: ^1.3.0
+    wrap-ansi: ^8.1.0
+  peerDependencies:
+    enquirer: ">= 2.3.0 < 3"
+  peerDependenciesMeta:
+    enquirer:
+      optional: true
+  checksum: 99600e8a51f838f7208bce7e16d6b3d91d361f13881e6aa91d0b561a9a093ddcf63b7bc2a7b47aec7fdbff9d0e8c9f68cb66e6dfe2d857e5b1df8ab045c26ce8
   languageName: node
   linkType: hard
 
@@ -21015,27 +21316,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"listr2@npm:^5.0.7":
-  version: 5.0.8
-  resolution: "listr2@npm:5.0.8"
-  dependencies:
-    cli-truncate: ^2.1.0
-    colorette: ^2.0.19
-    log-update: ^4.0.0
-    p-map: ^4.0.0
-    rfdc: ^1.3.0
-    rxjs: ^7.8.0
-    through: ^2.3.8
-    wrap-ansi: ^7.0.0
-  peerDependencies:
-    enquirer: ">= 2.3.0 < 3"
-  peerDependenciesMeta:
-    enquirer:
-      optional: true
-  checksum: 8be9f5632627c4df0dc33f452c98d415a49e5f1614650d3cab1b103c33e95f2a7a0e9f3e1e5de00d51bf0b4179acd8ff11b25be77dbe097cf3773c05e728d46c
-  languageName: node
-  linkType: hard
-
 "load-script@npm:^1.0.0":
   version: 1.0.0
   resolution: "load-script@npm:1.0.0"
@@ -21070,16 +21350,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"locate-path@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "locate-path@npm:2.0.0"
-  dependencies:
-    p-locate: ^2.0.0
-    path-exists: ^3.0.0
-  checksum: 02d581edbbbb0fa292e28d96b7de36b5b62c2fa8b5a7e82638ebb33afa74284acf022d3b1e9ae10e3ffb7658fbc49163fcd5e76e7d1baaa7801c3e05a81da755
-  languageName: node
-  linkType: hard
-
 "locate-path@npm:^3.0.0":
   version: 3.0.0
   resolution: "locate-path@npm:3.0.0"
@@ -21315,6 +21585,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"log-update@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "log-update@npm:5.0.1"
+  dependencies:
+    ansi-escapes: ^5.0.0
+    cli-cursor: ^4.0.0
+    slice-ansi: ^5.0.0
+    strip-ansi: ^7.0.1
+    wrap-ansi: ^8.0.1
+  checksum: 2c6b47dcce6f9233df6d232a37d9834cb3657a0749ef6398f1706118de74c55f158587d4128c225297ea66803f35c5ac3db4f3f617046d817233c45eedc32ef1
+  languageName: node
+  linkType: hard
+
 "loglevel@npm:^1.7.1, loglevel@npm:^1.8.1":
   version: 1.8.1
   resolution: "loglevel@npm:1.8.1"
@@ -21736,7 +22019,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"micromatch@npm:^4.0.0, micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5":
+"micromatch@npm:4.0.5, micromatch@npm:^4.0.0, micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5":
   version: 4.0.5
   resolution: "micromatch@npm:4.0.5"
   dependencies:
@@ -22584,7 +22867,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object-inspect@npm:^1.12.2, object-inspect@npm:^1.12.3, object-inspect@npm:^1.9.0":
+"object-inspect@npm:^1.12.3, object-inspect@npm:^1.9.0":
   version: 1.12.3
   resolution: "object-inspect@npm:1.12.3"
   checksum: dabfd824d97a5f407e6d5d24810d888859f6be394d8b733a77442b277e0808860555176719c5905e765e3743a7cada6b8b0a3b85e5331c530fd418cc8ae991db
@@ -22632,25 +22915,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.entries@npm:^1.1.5":
-  version: 1.1.6
-  resolution: "object.entries@npm:1.1.6"
+"object.entries@npm:^1.1.6":
+  version: 1.1.7
+  resolution: "object.entries@npm:1.1.7"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    es-abstract: ^1.20.4
-  checksum: 0f8c47517e6a9a980241eafe3b73de11e59511883173c2b93d67424a008e47e11b77c80e431ad1d8a806f6108b225a1cab9223e53e555776c612a24297117d28
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+  checksum: da287d434e7e32989586cd734382364ba826a2527f2bc82e6acbf9f9bfafa35d51018b66ec02543ffdfa2a5ba4af2b6f1ca6e588c65030cb4fd9c67d6ced594c
   languageName: node
   linkType: hard
 
-"object.fromentries@npm:^2.0.5":
-  version: 2.0.6
-  resolution: "object.fromentries@npm:2.0.6"
+"object.fromentries@npm:^2.0.6":
+  version: 2.0.7
+  resolution: "object.fromentries@npm:2.0.7"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    es-abstract: ^1.20.4
-  checksum: 453c6d694180c0c30df451b60eaf27a5b9bca3fb43c37908fd2b78af895803dc631242bcf05582173afa40d8d0e9c96e16e8874b39471aa53f3ac1f98a085d85
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+  checksum: 7341ce246e248b39a431b87a9ddd331ff52a454deb79afebc95609f94b1f8238966cf21f52188f2a353f0fdf83294f32f1ebf1f7826aae915ebad21fd0678065
   languageName: node
   linkType: hard
 
@@ -22666,13 +22949,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.hasown@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "object.hasown@npm:1.1.1"
+"object.groupby@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "object.groupby@npm:1.0.1"
   dependencies:
-    define-properties: ^1.1.4
-    es-abstract: ^1.19.5
-  checksum: d8ed4907ce57f48b93e3b53c418fd6787bf226a51e8d698c91e39b78e80fe5b124cb6282f6a9d5be21cf9e2c7829ab10206dcc6112b7748860eefe641880c793
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    get-intrinsic: ^1.2.1
+  checksum: d7959d6eaaba358b1608066fc67ac97f23ce6f573dc8fc661f68c52be165266fcb02937076aedb0e42722fdda0bdc0bbf74778196ac04868178888e9fd3b78b5
+  languageName: node
+  linkType: hard
+
+"object.hasown@npm:^1.1.2":
+  version: 1.1.3
+  resolution: "object.hasown@npm:1.1.3"
+  dependencies:
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+  checksum: 76bc17356f6124542fb47e5d0e78d531eafa4bba3fc2d6fc4b1a8ce8b6878912366c0d99f37ce5c84ada8fd79df7aa6ea1214fddf721f43e093ad2df51f27da1
   languageName: node
   linkType: hard
 
@@ -22695,14 +22990,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.values@npm:^1.1.0, object.values@npm:^1.1.5":
-  version: 1.1.5
-  resolution: "object.values@npm:1.1.5"
+"object.values@npm:^1.1.0, object.values@npm:^1.1.6":
+  version: 1.1.7
+  resolution: "object.values@npm:1.1.7"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.3
-    es-abstract: ^1.19.1
-  checksum: 0f17e99741ebfbd0fa55ce942f6184743d3070c61bd39221afc929c8422c4907618c8da694c6915bc04a83ab3224260c779ba37fc07bb668bdc5f33b66a902a4
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+  checksum: f3e4ae4f21eb1cc7cebb6ce036d4c67b36e1c750428d7b7623c56a0db90edced63d08af8a316d81dfb7c41a3a5fa81b05b7cc9426e98d7da986b1682460f0777
   languageName: node
   linkType: hard
 
@@ -22783,6 +23078,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"open@npm:^9.1.0":
+  version: 9.1.0
+  resolution: "open@npm:9.1.0"
+  dependencies:
+    default-browser: ^4.0.0
+    define-lazy-prop: ^3.0.0
+    is-inside-container: ^1.0.0
+    is-wsl: ^2.2.0
+  checksum: 3993c0f61d51fed8ac290e99c9c3cf45d3b6cfb3e2aa2b74cafd312c3486c22fd81df16ac8f3ab91dd8a4e3e729a16fc2480cfc406c4833416cf908acf1ae7c9
+  languageName: node
+  linkType: hard
+
 "opener@npm:^1.5.1, opener@npm:^1.5.2":
   version: 1.5.2
   resolution: "opener@npm:1.5.2"
@@ -22813,17 +23120,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"optionator@npm:^0.9.1":
-  version: 0.9.1
-  resolution: "optionator@npm:0.9.1"
+"optionator@npm:^0.9.3":
+  version: 0.9.3
+  resolution: "optionator@npm:0.9.3"
   dependencies:
+    "@aashutoshrathi/word-wrap": ^1.2.3
     deep-is: ^0.1.3
     fast-levenshtein: ^2.0.6
     levn: ^0.4.1
     prelude-ls: ^1.2.1
     type-check: ^0.4.0
-    word-wrap: ^1.2.3
-  checksum: dbc6fa065604b24ea57d734261914e697bd73b69eff7f18e967e8912aa2a40a19a9f599a507fa805be6c13c24c4eae8c71306c239d517d42d4c041c942f508a0
+  checksum: 09281999441f2fe9c33a5eeab76700795365a061563d66b098923eb719251a42bdbe432790d35064d0816ead9296dbeb1ad51a733edf4167c96bd5d0882e428a
   languageName: node
   linkType: hard
 
@@ -22905,15 +23212,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-limit@npm:^1.1.0":
-  version: 1.3.0
-  resolution: "p-limit@npm:1.3.0"
-  dependencies:
-    p-try: ^1.0.0
-  checksum: 281c1c0b8c82e1ac9f81acd72a2e35d402bf572e09721ce5520164e9de07d8274451378a3470707179ad13240535558f4b277f02405ad752e08c7d5b0d54fbfd
-  languageName: node
-  linkType: hard
-
 "p-limit@npm:^2.0.0, p-limit@npm:^2.2.0":
   version: 2.3.0
   resolution: "p-limit@npm:2.3.0"
@@ -22932,15 +23230,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-locate@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "p-locate@npm:2.0.0"
-  dependencies:
-    p-limit: ^1.1.0
-  checksum: e2dceb9b49b96d5513d90f715780f6f4972f46987dc32a0e18bc6c3fc74a1a5d73ec5f81b1398af5e58b99ea1ad03fd41e9181c01fa81b4af2833958696e3081
-  languageName: node
-  linkType: hard
-
 "p-locate@npm:^3.0.0":
   version: 3.0.0
   resolution: "p-locate@npm:3.0.0"
@@ -22987,13 +23276,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-try@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "p-try@npm:1.0.0"
-  checksum: 3b5303f77eb7722144154288bfd96f799f8ff3e2b2b39330efe38db5dd359e4fb27012464cd85cb0a76e9b7edd1b443568cb3192c22e7cffc34989df0bafd605
-  languageName: node
-  linkType: hard
-
 "p-try@npm:^2.0.0":
   version: 2.2.0
   resolution: "p-try@npm:2.2.0"
@@ -23216,7 +23498,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-parse@npm:^1.0.6, path-parse@npm:^1.0.7":
+"path-parse@npm:^1.0.7":
   version: 1.0.7
   resolution: "path-parse@npm:1.0.7"
   checksum: 49abf3d81115642938a8700ec580da6e830dde670be21893c62f4e10bd7dd4c3742ddc603fe24f898cba7eb0c6bc1777f8d9ac14185d34540c6d4d80cd9cae8a
@@ -23436,13 +23718,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"picocolors@npm:^0.2.1":
-  version: 0.2.1
-  resolution: "picocolors@npm:0.2.1"
-  checksum: 3b0f441f0062def0c0f39e87b898ae7461c3a16ffc9f974f320b44c799418cabff17780ee647fda42b856a1dc45897e2c62047e1b546d94d6d5c6962f45427b2
-  languageName: node
-  linkType: hard
-
 "picocolors@npm:^1.0.0":
   version: 1.0.0
   resolution: "picocolors@npm:1.0.0"
@@ -23457,7 +23732,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pidtree@npm:^0.6.0":
+"pidtree@npm:0.6.0":
   version: 0.6.0
   resolution: "pidtree@npm:0.6.0"
   bin:
@@ -23763,17 +24038,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-conditionals@npm:*, postcss-conditionals@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "postcss-conditionals@npm:2.1.0"
-  dependencies:
-    css-color-converter: ^1.0.2
-    css-unit-converter: ^1.0.0
-    postcss: ^5.0.4
-  checksum: 7cb613e3868731a80b4a8cc6ef9fbac45be8e6a3c1e9ffa3fd6d65501b493a6f0f89789afdc9064fcb80472ed9dd956e73e5476c53b16cff12591c208be2c3b7
-  languageName: node
-  linkType: hard
-
 "postcss-convert-values@npm:^5.1.1":
   version: 5.1.1
   resolution: "postcss-convert-values@npm:5.1.1"
@@ -23986,16 +24250,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-for@npm:*, postcss-for@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "postcss-for@npm:2.1.1"
-  dependencies:
-    postcss: ^5.0.0
-    postcss-simple-vars: ^2.0.0
-  checksum: aee8da42f7fdd8f15a835fb1d817a5c833d58149c7a76efcee31de2f727bcd615bd03627b96822cd6d6e5171fde2e798ef23b2cafb36047eb097fefcda661e61
-  languageName: node
-  linkType: hard
-
 "postcss-gap-properties@npm:^3.0.3":
   version: 3.0.3
   resolution: "postcss-gap-properties@npm:3.0.3"
@@ -24779,15 +25033,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-simple-vars@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "postcss-simple-vars@npm:2.0.0"
-  dependencies:
-    postcss: ^5.0.21
-  checksum: 9d70600d7fc0b810453761ff6136ab1b66bbb03e807eb1b129dd1b1366f595766c358b66afb3c35bc1f574d9e5c5d21a10c18f5e569cc85489b4ce053c2b1dbe
-  languageName: node
-  linkType: hard
-
 "postcss-simple-vars@npm:^6.0.0":
   version: 6.0.3
   resolution: "postcss-simple-vars@npm:6.0.3"
@@ -24864,7 +25109,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:*, postcss@npm:^8.3.5, postcss@npm:^8.4.21, postcss@npm:^8.4.23, postcss@npm:^8.4.27, postcss@npm:^8.4.31, postcss@npm:^8.4.4":
+"postcss@npm:8.4.31":
   version: 8.4.31
   resolution: "postcss@npm:8.4.31"
   dependencies:
@@ -24875,28 +25120,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^5.0.0, postcss@npm:^5.0.21, postcss@npm:^5.0.4":
-  version: 5.2.18
-  resolution: "postcss@npm:5.2.18"
-  dependencies:
-    chalk: ^1.1.3
-    js-base64: ^2.1.9
-    source-map: ^0.5.6
-    supports-color: ^3.2.3
-  checksum: 0cb88e7c887b9b55d0362159846ec9fbf330892c5853b0e346929e723d215295ffae48d9a0f219f64f74767f9114802dc1b5cd21c327184f958b7efaa93dd629
-  languageName: node
-  linkType: hard
-
-"postcss@npm:^7.0.35":
-  version: 7.0.39
-  resolution: "postcss@npm:7.0.39"
-  dependencies:
-    picocolors: ^0.2.1
-    source-map: ^0.6.1
-  checksum: 4ac793f506c23259189064bdc921260d869a115a82b5e713973c5af8e94fbb5721a5cc3e1e26840500d7e1f1fa42a209747c5b1a151918a9bc11f0d7ed9048e3
-  languageName: node
-  linkType: hard
-
 "postgres-array@npm:~2.0.0":
   version: 2.0.0
   resolution: "postgres-array@npm:2.0.0"
@@ -25008,7 +25231,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:^2.6.2, prettier@npm:^2.8.0, prettier@npm:^2.8.6":
+"prettier@npm:^2.6.2, prettier@npm:^2.8.0":
   version: 2.8.8
   resolution: "prettier@npm:2.8.8"
   bin:
@@ -25017,6 +25240,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"prettier@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "prettier@npm:3.0.3"
+  bin:
+    prettier: bin/prettier.cjs
+  checksum: e10b9af02b281f6c617362ebd2571b1d7fc9fb8a3bd17e371754428cda992e5e8d8b7a046e8f7d3e2da1dcd21aa001e2e3c797402ebb6111b5cd19609dd228e0
+  languageName: node
+  linkType: hard
+
 "pretty-bytes@npm:^5.3.0, pretty-bytes@npm:^5.4.1, pretty-bytes@npm:^5.6.0":
   version: 5.6.0
   resolution: "pretty-bytes@npm:5.6.0"
@@ -27115,6 +27347,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"reflect.getprototypeof@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "reflect.getprototypeof@npm:1.0.4"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    get-intrinsic: ^1.2.1
+    globalthis: ^1.0.3
+    which-builtin-type: ^1.1.3
+  checksum: 16e2361988dbdd23274b53fb2b1b9cefeab876c3941a2543b4cadac6f989e3db3957b07a44aac46cfceb3e06e2871785ec2aac992d824f76292f3b5ee87f66f2
+  languageName: node
+  linkType: hard
+
 "refractor@npm:^3.6.0":
   version: 3.6.0
   resolution: "refractor@npm:3.6.0"
@@ -27165,14 +27411,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.4.3, regexp.prototype.flags@npm:^1.5.0":
-  version: 1.5.0
-  resolution: "regexp.prototype.flags@npm:1.5.0"
+"regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.5.0, regexp.prototype.flags@npm:^1.5.1":
+  version: 1.5.1
+  resolution: "regexp.prototype.flags@npm:1.5.1"
   dependencies:
     call-bind: ^1.0.2
     define-properties: ^1.2.0
-    functions-have-names: ^1.2.3
-  checksum: c541687cdbdfff1b9a07f6e44879f82c66bbf07665f9a7544c5fd16acdb3ec8d1436caab01662d2fbcad403f3499d49ab0b77fbc7ef29ef961d98cc4bc9755b4
+    set-function-name: ^2.0.0
+  checksum: 869edff00288442f8d7fa4c9327f91d85f3b3acf8cbbef9ea7a220345cf23e9241b6def9263d2c1ebcf3a316b0aa52ad26a43a84aa02baca3381717b3e307f47
   languageName: node
   linkType: hard
 
@@ -27426,49 +27672,55 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:^1.1.4, resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.12.0, resolve@npm:^1.13.1, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.0, resolve@npm:^1.22.2, resolve@npm:^1.4.0":
-  version: 1.22.4
-  resolution: "resolve@npm:1.22.4"
+"resolve@npm:^1.1.4, resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.12.0, resolve@npm:^1.13.1, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.2, resolve@npm:^1.22.4, resolve@npm:^1.4.0":
+  version: 1.22.6
+  resolution: "resolve@npm:1.22.6"
   dependencies:
     is-core-module: ^2.13.0
     path-parse: ^1.0.7
     supports-preserve-symlinks-flag: ^1.0.0
   bin:
     resolve: bin/resolve
-  checksum: 23f25174c2736ce24c6d918910e0d1f89b6b38fefa07a995dff864acd7863d59a7f049e691f93b4b2ee29696303390d921552b6d1b841ed4a8101f517e1d0124
+  checksum: d13bf66d4e2ee30d291491f16f2fa44edd4e0cefb85d53249dd6f93e70b2b8c20ec62f01b18662e3cd40e50a7528f18c4087a99490048992a3bb954cf3201a5b
   languageName: node
   linkType: hard
 
-"resolve@npm:^2.0.0-next.3":
-  version: 2.0.0-next.3
-  resolution: "resolve@npm:2.0.0-next.3"
+"resolve@npm:^2.0.0-next.4":
+  version: 2.0.0-next.4
+  resolution: "resolve@npm:2.0.0-next.4"
   dependencies:
-    is-core-module: ^2.2.0
-    path-parse: ^1.0.6
-  checksum: f34b3b93ada77d64a6d590c06a83e198f3a827624c4ec972260905fa6c4d612164fbf0200d16d2beefea4ad1755b001f4a9a1293d8fc2322a8f7d6bf692c4ff5
+    is-core-module: ^2.9.0
+    path-parse: ^1.0.7
+    supports-preserve-symlinks-flag: ^1.0.0
+  bin:
+    resolve: bin/resolve
+  checksum: c438ac9a650f2030fd074219d7f12ceb983b475da2d89ad3d6dd05fbf6b7a0a8cd37d4d10b43cb1f632bc19f22246ab7f36ebda54d84a29bfb2910a0680906d3
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@^1.1.4#~builtin<compat/resolve>, resolve@patch:resolve@^1.1.7#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.12.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.13.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.17.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.4.0#~builtin<compat/resolve>":
-  version: 1.22.4
-  resolution: "resolve@patch:resolve@npm%3A1.22.4#~builtin<compat/resolve>::version=1.22.4&hash=c3c19d"
+"resolve@patch:resolve@^1.1.4#~builtin<compat/resolve>, resolve@patch:resolve@^1.1.7#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.12.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.13.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.17.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.4#~builtin<compat/resolve>, resolve@patch:resolve@^1.4.0#~builtin<compat/resolve>":
+  version: 1.22.6
+  resolution: "resolve@patch:resolve@npm%3A1.22.6#~builtin<compat/resolve>::version=1.22.6&hash=c3c19d"
   dependencies:
     is-core-module: ^2.13.0
     path-parse: ^1.0.7
     supports-preserve-symlinks-flag: ^1.0.0
   bin:
     resolve: bin/resolve
-  checksum: c45f2545fdc4d21883861b032789e20aa67a2f2692f68da320cc84d5724cd02f2923766c5354b3210897e88f1a7b3d6d2c7c22faeead8eed7078e4c783a444bc
+  checksum: 9d3b3c67aefd12cecbe5f10ca4d1f51ea190891096497c43f301b086883b426466918c3a64f1bbf1788fabb52b579d58809614006c5d0b49186702b3b8fb746a
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@^2.0.0-next.3#~builtin<compat/resolve>":
-  version: 2.0.0-next.3
-  resolution: "resolve@patch:resolve@npm%3A2.0.0-next.3#~builtin<compat/resolve>::version=2.0.0-next.3&hash=c3c19d"
+"resolve@patch:resolve@^2.0.0-next.4#~builtin<compat/resolve>":
+  version: 2.0.0-next.4
+  resolution: "resolve@patch:resolve@npm%3A2.0.0-next.4#~builtin<compat/resolve>::version=2.0.0-next.4&hash=c3c19d"
   dependencies:
-    is-core-module: ^2.2.0
-    path-parse: ^1.0.6
-  checksum: 21684b4d99a4877337cdbd5484311c811b3e8910edb5d868eec85c6e6550b0f570d911f9a384f9e176172d6713f2715bd0b0887fa512cb8c6aeece018de6a9f8
+    is-core-module: ^2.9.0
+    path-parse: ^1.0.7
+    supports-preserve-symlinks-flag: ^1.0.0
+  bin:
+    resolve: bin/resolve
+  checksum: 4bf9f4f8a458607af90518ff73c67a4bc1a38b5a23fef2bb0ccbd45e8be89820a1639b637b0ba377eb2be9eedfb1739a84cde24fe4cd670c8207d8fea922b011
   languageName: node
   linkType: hard
 
@@ -27658,6 +27910,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"run-applescript@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "run-applescript@npm:5.0.0"
+  dependencies:
+    execa: ^5.0.0
+  checksum: d00c2dbfa5b2d774de7451194b8b125f40f65fc183de7d9dcae97f57f59433586d3c39b9001e111c38bfa24c3436c99df1bb4066a2a0c90d39a8c4cd6889af77
+  languageName: node
+  linkType: hard
+
 "run-async@npm:^2.4.0":
   version: 2.4.1
   resolution: "run-async@npm:2.4.1"
@@ -27683,7 +27944,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rxjs@npm:^7.0.0, rxjs@npm:^7.2.0, rxjs@npm:^7.5.5, rxjs@npm:^7.8.0":
+"rxjs@npm:^7.0.0, rxjs@npm:^7.2.0, rxjs@npm:^7.5.5":
   version: 7.8.1
   resolution: "rxjs@npm:7.8.1"
   dependencies:
@@ -27692,6 +27953,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"safe-array-concat@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "safe-array-concat@npm:1.0.1"
+  dependencies:
+    call-bind: ^1.0.2
+    get-intrinsic: ^1.2.1
+    has-symbols: ^1.0.3
+    isarray: ^2.0.5
+  checksum: 001ecf1d8af398251cbfabaf30ed66e3855127fbceee178179524b24160b49d15442f94ed6c0db0b2e796da76bb05b73bf3cc241490ec9c2b741b41d33058581
+  languageName: node
+  linkType: hard
+
 "safe-buffer@npm:5.1.1":
   version: 5.1.1
   resolution: "safe-buffer@npm:5.1.1"
@@ -27901,7 +28174,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:7.x, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.3":
+"semver@npm:7.x, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.3, semver@npm:^7.5.4":
   version: 7.5.4
   resolution: "semver@npm:7.5.4"
   dependencies:
@@ -28025,6 +28298,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"set-function-name@npm:^2.0.0, set-function-name@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "set-function-name@npm:2.0.1"
+  dependencies:
+    define-data-property: ^1.0.1
+    functions-have-names: ^1.2.3
+    has-property-descriptors: ^1.0.0
+  checksum: 4975d17d90c40168eee2c7c9c59d023429f0a1690a89d75656306481ece0c3c1fb1ebcc0150ea546d1913e35fbd037bace91372c69e543e51fc5d1f31a9fa126
+  languageName: node
+  linkType: hard
+
 "setimmediate@npm:^1.0.5":
   version: 1.0.5
   resolution: "setimmediate@npm:1.0.5"
@@ -28463,7 +28747,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map@npm:^0.5.6, source-map@npm:^0.5.7, source-map@npm:~0.5.3":
+"source-map@npm:^0.5.7, source-map@npm:~0.5.3":
   version: 0.5.7
   resolution: "source-map@npm:0.5.7"
   checksum: 5dc2043b93d2f194142c7f38f74a24670cd7a0063acdaf4bf01d2964b402257ae843c2a8fa822ad5b71013b5fcafa55af7421383da919752f22ff488bc553f4d
@@ -28778,10 +29062,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string-argv@npm:^0.3.1":
-  version: 0.3.1
-  resolution: "string-argv@npm:0.3.1"
-  checksum: efbd0289b599bee808ce80820dfe49c9635610715429c6b7cc50750f0437e3c2f697c81e5c390208c13b5d5d12d904a1546172a88579f6ee5cbaaaa4dc9ec5cf
+"string-argv@npm:0.3.2":
+  version: 0.3.2
+  resolution: "string-argv@npm:0.3.2"
+  checksum: 8703ad3f3db0b2641ed2adbb15cf24d3945070d9a751f9e74a924966db9f325ac755169007233e8985a39a6a292f14d4fee20482989b89b96e473c4221508a0f
   languageName: node
   linkType: hard
 
@@ -28870,41 +29154,53 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string.prototype.matchall@npm:^4.0.6, string.prototype.matchall@npm:^4.0.7":
-  version: 4.0.8
-  resolution: "string.prototype.matchall@npm:4.0.8"
+"string.prototype.matchall@npm:^4.0.6, string.prototype.matchall@npm:^4.0.8":
+  version: 4.0.10
+  resolution: "string.prototype.matchall@npm:4.0.10"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    es-abstract: ^1.20.4
-    get-intrinsic: ^1.1.3
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    get-intrinsic: ^1.2.1
     has-symbols: ^1.0.3
-    internal-slot: ^1.0.3
-    regexp.prototype.flags: ^1.4.3
+    internal-slot: ^1.0.5
+    regexp.prototype.flags: ^1.5.0
+    set-function-name: ^2.0.0
     side-channel: ^1.0.4
-  checksum: 952da3a818de42ad1c10b576140a5e05b4de7b34b8d9dbf00c3ac8c1293e9c0f533613a39c5cda53e0a8221f2e710bc2150e730b1c2278d60004a8a35726efb6
+  checksum: 3c78bdeff39360c8e435d7c4c6ea19f454aa7a63eda95fa6fadc3a5b984446a2f9f2c02d5c94171ce22268a573524263fbd0c8edbe3ce2e9890d7cc036cdc3ed
   languageName: node
   linkType: hard
 
-"string.prototype.trimend@npm:^1.0.6":
-  version: 1.0.6
-  resolution: "string.prototype.trimend@npm:1.0.6"
+"string.prototype.trim@npm:^1.2.8":
+  version: 1.2.8
+  resolution: "string.prototype.trim@npm:1.2.8"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    es-abstract: ^1.20.4
-  checksum: 0fdc34645a639bd35179b5a08227a353b88dc089adf438f46be8a7c197fc3f22f8514c1c9be4629b3cd29c281582730a8cbbad6466c60f76b5f99cf2addb132e
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+  checksum: 49eb1a862a53aba73c3fb6c2a53f5463173cb1f4512374b623bcd6b43ad49dd559a06fb5789bdec771a40fc4d2a564411c0a75d35fb27e76bbe738c211ecff07
   languageName: node
   linkType: hard
 
-"string.prototype.trimstart@npm:^1.0.6":
-  version: 1.0.6
-  resolution: "string.prototype.trimstart@npm:1.0.6"
+"string.prototype.trimend@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "string.prototype.trimend@npm:1.0.7"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    es-abstract: ^1.20.4
-  checksum: 89080feef416621e6ef1279588994305477a7a91648d9436490d56010a1f7adc39167cddac7ce0b9884b8cdbef086987c4dcb2960209f2af8bac0d23ceff4f41
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+  checksum: 2375516272fd1ba75992f4c4aa88a7b5f3c7a9ca308d963bcd5645adf689eba6f8a04ebab80c33e30ec0aefc6554181a3a8416015c38da0aa118e60ec896310c
+  languageName: node
+  linkType: hard
+
+"string.prototype.trimstart@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "string.prototype.trimstart@npm:1.0.7"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+  checksum: 13d0c2cb0d5ff9e926fa0bec559158b062eed2b68cd5be777ffba782c96b2b492944e47057274e064549b94dd27cf81f48b27a31fee8af5b574cff253e7eb613
   languageName: node
   linkType: hard
 
@@ -29040,7 +29336,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strip-json-comments@npm:^3.0.1, strip-json-comments@npm:^3.1.0, strip-json-comments@npm:^3.1.1":
+"strip-json-comments@npm:^3.0.1, strip-json-comments@npm:^3.1.1":
   version: 3.1.1
   resolution: "strip-json-comments@npm:3.1.1"
   checksum: 492f73e27268f9b1c122733f28ecb0e7e8d8a531a6662efbd08e22cccb3f9475e90a1b82cab06a392f6afae6d2de636f977e231296400d0ec5304ba70f166443
@@ -29187,15 +29483,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"supports-color@npm:^3.2.3":
-  version: 3.2.3
-  resolution: "supports-color@npm:3.2.3"
-  dependencies:
-    has-flag: ^1.0.0
-  checksum: 56afc05fa87d00100d90148c4d0a6e20a0af0d56dca5c54d4d40b2553ee737dab0ca4e8b53c4471afc035227b5b44dfa4824747a7f01ad733173536f7da6fbbb
-  languageName: node
-  linkType: hard
-
 "supports-color@npm:^5.3.0, supports-color@npm:^5.5.0":
   version: 5.5.0
   resolution: "supports-color@npm:5.5.0"
@@ -29324,6 +29611,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"synckit@npm:^0.8.5":
+  version: 0.8.5
+  resolution: "synckit@npm:0.8.5"
+  dependencies:
+    "@pkgr/utils": ^2.3.1
+    tslib: ^2.5.0
+  checksum: 8a9560e5d8f3d94dc3cf5f7b9c83490ffa30d320093560a37b88f59483040771fd1750e76b9939abfbb1b5a23fd6dfbae77f6b338abffe7cae7329cd9b9bb86b
+  languageName: node
+  linkType: hard
+
 "syntax-error@npm:^1.1.1":
   version: 1.4.0
   resolution: "syntax-error@npm:1.4.0"
@@ -29699,6 +29996,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"titleize@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "titleize@npm:3.0.0"
+  checksum: 71fbbeabbfb36ccd840559f67f21e356e1d03da2915b32d2ae1a60ddcc13a124be2739f696d2feb884983441d159a18649e8d956648d591bdad35c430a6b6d28
+  languageName: node
+  linkType: hard
+
 "tmp@npm:^0.0.33":
   version: 0.0.33
   resolution: "tmp@npm:0.0.33"
@@ -29867,6 +30171,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ts-api-utils@npm:^1.0.1":
+  version: 1.0.3
+  resolution: "ts-api-utils@npm:1.0.3"
+  peerDependencies:
+    typescript: ">=4.2.0"
+  checksum: 441cc4489d65fd515ae6b0f4eb8690057add6f3b6a63a36073753547fb6ce0c9ea0e0530220a0b282b0eec535f52c4dfc315d35f8a4c9a91c0def0707a714ca6
+  languageName: node
+  linkType: hard
+
 "ts-custom-error@npm:^3.0.0":
   version: 3.2.0
   resolution: "ts-custom-error@npm:3.2.0"
@@ -30076,7 +30389,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tsconfig-paths@npm:^3.14.1, tsconfig-paths@npm:^3.9.0":
+"tsconfig-paths@npm:^3.14.2, tsconfig-paths@npm:^3.9.0":
   version: 3.14.2
   resolution: "tsconfig-paths@npm:3.14.2"
   dependencies:
@@ -30102,7 +30415,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.5.0":
+"tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.5.0, tslib@npm:^2.6.0":
   version: 2.6.2
   resolution: "tslib@npm:2.6.2"
   checksum: 329ea56123005922f39642318e3d1f0f8265d1e7fcb92c633e0809521da75eeaca28d2cf96d7248229deb40e5c19adf408259f4b9640afd20d13aecc1430f3ad
@@ -30224,6 +30537,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"type-fest@npm:^1.0.2":
+  version: 1.4.0
+  resolution: "type-fest@npm:1.4.0"
+  checksum: b011c3388665b097ae6a109a437a04d6f61d81b7357f74cbcb02246f2f5bd72b888ae33631b99871388122ba0a87f4ff1c94078e7119ff22c70e52c0ff828201
+  languageName: node
+  linkType: hard
+
 "type-fest@npm:^2.19.0, type-fest@npm:~2.19":
   version: 2.19.0
   resolution: "type-fest@npm:2.19.0"
@@ -30241,6 +30561,42 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typed-array-buffer@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "typed-array-buffer@npm:1.0.0"
+  dependencies:
+    call-bind: ^1.0.2
+    get-intrinsic: ^1.2.1
+    is-typed-array: ^1.1.10
+  checksum: 3e0281c79b2a40cd97fe715db803884301993f4e8c18e8d79d75fd18f796e8cd203310fec8c7fdb5e6c09bedf0af4f6ab8b75eb3d3a85da69328f28a80456bd3
+  languageName: node
+  linkType: hard
+
+"typed-array-byte-length@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "typed-array-byte-length@npm:1.0.0"
+  dependencies:
+    call-bind: ^1.0.2
+    for-each: ^0.3.3
+    has-proto: ^1.0.1
+    is-typed-array: ^1.1.10
+  checksum: b03db16458322b263d87a702ff25388293f1356326c8a678d7515767ef563ef80e1e67ce648b821ec13178dd628eb2afdc19f97001ceae7a31acf674c849af94
+  languageName: node
+  linkType: hard
+
+"typed-array-byte-offset@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "typed-array-byte-offset@npm:1.0.0"
+  dependencies:
+    available-typed-arrays: ^1.0.5
+    call-bind: ^1.0.2
+    for-each: ^0.3.3
+    has-proto: ^1.0.1
+    is-typed-array: ^1.1.10
+  checksum: 04f6f02d0e9a948a95fbfe0d5a70b002191fae0b8fe0fe3130a9b2336f043daf7a3dda56a31333c35a067a97e13f539949ab261ca0f3692c41603a46a94e960b
+  languageName: node
+  linkType: hard
+
 "typed-array-length@npm:^1.0.4":
   version: 1.0.4
   resolution: "typed-array-length@npm:1.0.4"
@@ -31417,6 +31773,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"which-builtin-type@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "which-builtin-type@npm:1.1.3"
+  dependencies:
+    function.prototype.name: ^1.1.5
+    has-tostringtag: ^1.0.0
+    is-async-function: ^2.0.0
+    is-date-object: ^1.0.5
+    is-finalizationregistry: ^1.0.2
+    is-generator-function: ^1.0.10
+    is-regex: ^1.1.4
+    is-weakref: ^1.0.2
+    isarray: ^2.0.5
+    which-boxed-primitive: ^1.0.2
+    which-collection: ^1.0.1
+    which-typed-array: ^1.1.9
+  checksum: 43730f7d8660ff9e33d1d3f9f9451c4784265ee7bf222babc35e61674a11a08e1c2925019d6c03154fcaaca4541df43abe35d2720843b9b4cbcebdcc31408f36
+  languageName: node
+  linkType: hard
+
 "which-collection@npm:^1.0.1":
   version: 1.0.1
   resolution: "which-collection@npm:1.0.1"
@@ -31436,17 +31812,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"which-typed-array@npm:^1.1.2, which-typed-array@npm:^1.1.9":
-  version: 1.1.9
-  resolution: "which-typed-array@npm:1.1.9"
+"which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.2, which-typed-array@npm:^1.1.9":
+  version: 1.1.11
+  resolution: "which-typed-array@npm:1.1.11"
   dependencies:
     available-typed-arrays: ^1.0.5
     call-bind: ^1.0.2
     for-each: ^0.3.3
     gopd: ^1.0.1
     has-tostringtag: ^1.0.0
-    is-typed-array: ^1.1.10
-  checksum: fe0178ca44c57699ca2c0e657b64eaa8d2db2372a4e2851184f568f98c478ae3dc3fdb5f7e46c384487046b0cf9e23241423242b277e03e8ba3dabc7c84c98ef
+  checksum: 711ffc8ef891ca6597b19539075ec3e08bb9b4c2ca1f78887e3c07a977ab91ac1421940505a197758fb5939aa9524976d0a5bbcac34d07ed6faa75cedbb17206
   languageName: node
   linkType: hard
 
@@ -31504,7 +31879,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"word-wrap@npm:^1.2.3, word-wrap@npm:~1.2.3":
+"word-wrap@npm:~1.2.3":
   version: 1.2.5
   resolution: "word-wrap@npm:1.2.5"
   checksum: f93ba3586fc181f94afdaff3a6fef27920b4b6d9eaefed0f428f8e07adea2a7f54a5f2830ce59406c8416f033f86902b91eb824072354645eea687dff3691ccb
@@ -31756,7 +32131,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"wrap-ansi@npm:^8.1.0":
+"wrap-ansi@npm:^8.0.1, wrap-ansi@npm:^8.1.0":
   version: 8.1.0
   resolution: "wrap-ansi@npm:8.1.0"
   dependencies:
@@ -32020,6 +32395,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yaml@npm:2.3.1, yaml@npm:^2.1.1":
+  version: 2.3.1
+  resolution: "yaml@npm:2.3.1"
+  checksum: 2c7bc9a7cd4c9f40d3b0b0a98e370781b68b8b7c4515720869aced2b00d92f5da1762b4ffa947f9e795d6cd6b19f410bd4d15fdd38aca7bd96df59bd9486fb54
+  languageName: node
+  linkType: hard
+
 "yaml@npm:^1.10.0, yaml@npm:^1.10.2, yaml@npm:^1.7.2":
   version: 1.10.2
   resolution: "yaml@npm:1.10.2"
@@ -32027,13 +32409,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yaml@npm:^2.1.1, yaml@npm:^2.2.1":
-  version: 2.2.2
-  resolution: "yaml@npm:2.2.2"
-  checksum: d90c235e099e30094dcff61ba3350437aef53325db4a6bcd04ca96e1bfe7e348b191f6a7a52b5211e2dbc4eeedb22a00b291527da030de7c189728ef3f2b4eb3
-  languageName: node
-  linkType: hard
-
 "yargs-parser@npm:20.x, yargs-parser@npm:^20.2.2, yargs-parser@npm:^20.2.9":
   version: 20.2.9
   resolution: "yargs-parser@npm:20.2.9"
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/connectionpoolconfig/configurations/ConnectionPoolConfig.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/connectionpoolconfig/configurations/ConnectionPoolConfig.java
new file mode 100644
index 0000000000..66e84e22df
--- /dev/null
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/connectionpoolconfig/configurations/ConnectionPoolConfig.java
@@ -0,0 +1,3 @@
+package com.appsmith.external.connectionpoolconfig.configurations;
+
+public interface ConnectionPoolConfig extends ConnectionPoolConfigCECompatible {}
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/connectionpoolconfig/configurations/ConnectionPoolConfigCE.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/connectionpoolconfig/configurations/ConnectionPoolConfigCE.java
new file mode 100644
index 0000000000..f093a42d96
--- /dev/null
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/connectionpoolconfig/configurations/ConnectionPoolConfigCE.java
@@ -0,0 +1,7 @@
+package com.appsmith.external.connectionpoolconfig.configurations;
+
+import reactor.core.publisher.Mono;
+
+public interface ConnectionPoolConfigCE {
+    Mono<Integer> getMaxConnectionPoolSize();
+}
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/connectionpoolconfig/configurations/ConnectionPoolConfigCECompatible.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/connectionpoolconfig/configurations/ConnectionPoolConfigCECompatible.java
new file mode 100644
index 0000000000..12fb7a3b0f
--- /dev/null
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/connectionpoolconfig/configurations/ConnectionPoolConfigCECompatible.java
@@ -0,0 +1,3 @@
+package com.appsmith.external.connectionpoolconfig.configurations;
+
+public interface ConnectionPoolConfigCECompatible extends ConnectionPoolConfigCE {}
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/restApiUtils/helpers/RestAPIActivateUtils.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/restApiUtils/helpers/RestAPIActivateUtils.java
index a4c5557dff..bd4e655adb 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/restApiUtils/helpers/RestAPIActivateUtils.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/restApiUtils/helpers/RestAPIActivateUtils.java
@@ -24,6 +24,7 @@ import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.reactive.ClientHttpRequest;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.reactive.function.BodyInserter;
 import org.springframework.web.reactive.function.client.ClientResponse;
 import org.springframework.web.reactive.function.client.ExchangeStrategies;
@@ -36,7 +37,6 @@ import reactor.netty.resources.ConnectionProvider;
 import javax.crypto.SecretKey;
 import java.io.IOException;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.Instant;
@@ -96,7 +96,12 @@ public class RestAPIActivateUtils {
                             actionExecutionRequest, isBodySentWithApiRequest));
 
                     result.setStatusCode(statusCode.toString());
-                    result.setIsExecutionSuccess(statusCode.is2xxSuccessful());
+
+                    // if something has moved permanently should we mark it as an execution failure?
+                    // here marking a redirection as an execution success if the url has moved permanently without a
+                    // forwarding Location
+                    boolean isExecutionSuccess = statusCode.is2xxSuccessful() || statusCode.is3xxRedirection();
+                    result.setIsExecutionSuccess(isExecutionSuccess);
 
                     // Convert the headers into json tree to store in the results
                     String headerInJsonString;
@@ -191,19 +196,18 @@ public class RestAPIActivateUtils {
                 .exchange()
                 .flatMap(response -> {
                     if (response.statusCode().is3xxRedirection()) {
+                        // if there is no redirect location then we should just return the response
+                        if (CollectionUtils.isEmpty(response.headers().header(HttpHeaders.LOCATION))) {
+                            return Mono.just(response);
+                        }
+
                         String redirectUrl =
                                 response.headers().header("Location").get(0);
-                        /**
-                         * TODO
-                         * In case the redirected URL is not absolute (complete), create the new URL using the relative path
-                         * This particular scenario is seen in the URL : https://rickandmortyapi.com/api/character
-                         * It redirects to partial URI : /api/character/
-                         * In this scenario we should convert the partial URI to complete URI
-                         */
+
                         final URI redirectUri;
                         try {
-                            redirectUri = new URI(redirectUrl);
-                        } catch (URISyntaxException e) {
+                            redirectUri = createRedirectUrl(redirectUrl, uri);
+                        } catch (IllegalArgumentException e) {
                             return Mono.error(new AppsmithPluginException(AppsmithPluginError.PLUGIN_ERROR, e));
                         }
 
@@ -213,6 +217,10 @@ public class RestAPIActivateUtils {
                 });
     }
 
+    public URI createRedirectUrl(String redirectUrl, URI originalUrl) {
+        return originalUrl.resolve(redirectUrl);
+    }
+
     public WebClient getWebClient(
             WebClient.Builder webClientBuilder,
             APIConnection apiConnection,
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/util/WebClientUtils.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/util/WebClientUtils.java
index 5df68082fe..2db27eec9f 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/util/WebClientUtils.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/util/WebClientUtils.java
@@ -1,5 +1,7 @@
 package com.appsmith.util;
 
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
 import io.netty.resolver.AddressResolver;
 import io.netty.resolver.AddressResolverGroup;
 import io.netty.resolver.InetNameResolver;
@@ -9,6 +11,7 @@ import io.netty.util.concurrent.Promise;
 import io.netty.util.internal.SocketUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;
+import org.springframework.util.StringUtils;
 import org.springframework.web.reactive.function.client.ExchangeFilterFunction;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
@@ -29,10 +32,15 @@ public class WebClientUtils {
 
     public static final String HOST_NOT_ALLOWED = "Host not allowed.";
 
-    public static final ExchangeFilterFunction IP_CHECK_FILTER = ExchangeFilterFunction.ofRequestProcessor(
-            request -> DISALLOWED_HOSTS.contains(request.url().getHost())
-                    ? Mono.error(new UnknownHostException(HOST_NOT_ALLOWED))
-                    : Mono.just(request));
+    public static final ExchangeFilterFunction IP_CHECK_FILTER = ExchangeFilterFunction.ofRequestProcessor(request -> {
+        if (!StringUtils.hasText(request.url().getHost())) {
+            return Mono.error(new AppsmithPluginException(
+                    AppsmithPluginError.PLUGIN_DATASOURCE_ARGUMENT_ERROR, "Requested url host is null or empty"));
+        }
+        return DISALLOWED_HOSTS.contains(request.url().getHost())
+                ? Mono.error(new UnknownHostException(HOST_NOT_ALLOWED))
+                : Mono.just(request);
+    });
 
     private WebClientUtils() {}
 
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 7d9c178395..eec7c01a91 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
@@ -1,5 +1,6 @@
 package com.external.plugins;
 
+import com.appsmith.external.connectionpoolconfig.configurations.ConnectionPoolConfig;
 import com.appsmith.external.constants.DataType;
 import com.appsmith.external.datatypes.AppsmithType;
 import com.appsmith.external.dtos.ExecuteActionDTO;
@@ -182,9 +183,11 @@ public class PostgresPlugin extends BasePlugin {
         private static final int PREPARED_STATEMENT_INDEX = 0;
 
         private final SharedConfig sharedConfig;
+        private final ConnectionPoolConfig connectionPoolConfig;
 
-        public PostgresPluginExecutor(SharedConfig sharedConfig) {
+        public PostgresPluginExecutor(SharedConfig sharedConfig, ConnectionPoolConfig connectionPoolConfig) {
             this.sharedConfig = sharedConfig;
+            this.connectionPoolConfig = connectionPoolConfig;
             MAX_SIZE_SUPPORTED = sharedConfig.getMaxResponseSize();
         }
 
@@ -609,9 +612,13 @@ public class PostgresPlugin extends BasePlugin {
                         e.getMessage()));
             }
 
-            return Mono.fromCallable(() -> {
-                        log.debug("Connecting to Postgres db");
-                        return createConnectionPool(datasourceConfiguration);
+            return connectionPoolConfig
+                    .getMaxConnectionPoolSize()
+                    .flatMap(maxPoolSize -> {
+                        return Mono.fromCallable(() -> {
+                            log.debug("Connecting to Postgres db");
+                            return createConnectionPool(datasourceConfiguration, maxPoolSize);
+                        });
                     })
                     .subscribeOn(scheduler);
         }
@@ -1070,7 +1077,8 @@ public class PostgresPlugin extends BasePlugin {
      * @param datasourceConfiguration
      * @return connection pool
      */
-    private static HikariDataSource createConnectionPool(DatasourceConfiguration datasourceConfiguration)
+    private static HikariDataSource createConnectionPool(
+            DatasourceConfiguration datasourceConfiguration, Integer maximumConfigurablePoolSize)
             throws AppsmithPluginException {
         HikariConfig config = new HikariConfig();
 
@@ -1079,7 +1087,13 @@ public class PostgresPlugin extends BasePlugin {
         // Set SSL property
         com.appsmith.external.models.Connection configurationConnection = datasourceConfiguration.getConnection();
         config.setMinimumIdle(MINIMUM_POOL_SIZE);
-        config.setMaximumPoolSize(MAXIMUM_POOL_SIZE);
+
+        int maxPoolSize = MAXIMUM_POOL_SIZE;
+        if (maximumConfigurablePoolSize != null && maximumConfigurablePoolSize >= maxPoolSize) {
+            maxPoolSize = maximumConfigurablePoolSize;
+        }
+
+        config.setMaximumPoolSize(maxPoolSize);
 
         // Set authentication properties
         DBAuth authentication = (DBAuth) datasourceConfiguration.getAuthentication();
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 f3bb5e77ec..9dba145e86 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
@@ -1,5 +1,6 @@
 package com.external.plugins;
 
+import com.appsmith.external.connectionpoolconfig.configurations.ConnectionPoolConfig;
 import com.appsmith.external.datatypes.ClientDataType;
 import com.appsmith.external.dtos.ExecuteActionDTO;
 import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException;
@@ -77,8 +78,15 @@ public class PostgresPluginTest {
         }
     }
 
+    public class MockConnectionPoolConfig implements ConnectionPoolConfig {
+        @Override
+        public Mono<Integer> getMaxConnectionPoolSize() {
+            return Mono.just(5);
+        }
+    }
+
     PostgresPlugin.PostgresPluginExecutor pluginExecutor =
-            new PostgresPlugin.PostgresPluginExecutor(new MockSharedConfig());
+            new PostgresPlugin.PostgresPluginExecutor(new MockSharedConfig(), new MockConnectionPoolConfig());
 
     @SuppressWarnings("rawtypes") // The type parameter for the container type is just itself and is pseudo-optional.
     @Container
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 51645d7705..f485d26189 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
@@ -208,6 +208,11 @@ public class RestApiPlugin extends BasePlugin {
                         errorResult.setRequest(requestCaptureFilter.populateRequestFields(
                                 actionExecutionRequest, isBodySentWithApiRequest));
                         errorResult.setIsExecutionSuccess(false);
+                        log.debug(
+                                "An error has occurred while trying to run the API query for url: {}, path : {}",
+                                datasourceConfiguration.getUrl(),
+                                actionConfiguration.getPath());
+                        error.printStackTrace();
                         if (!(error instanceof AppsmithPluginException)) {
                             error = new AppsmithPluginException(
                                     RestApiPluginError.API_EXECUTION_FAILED,
diff --git a/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/plugins/RestApiPluginTest.java b/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/plugins/RestApiPluginTest.java
index 12d4d27e7d..1a189d851b 100644
--- a/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/plugins/RestApiPluginTest.java
+++ b/app/server/appsmith-plugins/restApiPlugin/src/test/java/com/external/plugins/RestApiPluginTest.java
@@ -3,6 +3,7 @@ package com.external.plugins;
 import com.appsmith.external.datatypes.ClientDataType;
 import com.appsmith.external.dtos.ExecuteActionDTO;
 import com.appsmith.external.dtos.ParamProperty;
+import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
 import com.appsmith.external.helpers.PluginUtils;
 import com.appsmith.external.helpers.restApiUtils.connections.APIConnection;
 import com.appsmith.external.helpers.restApiUtils.helpers.HintMessageUtils;
@@ -1919,4 +1920,178 @@ public class RestApiPluginTest {
                 })
                 .verifyComplete();
     }
+
+    @Test
+    public void testRedirectionSuccessWithLocationHeaderHavingPath() {
+        DatasourceConfiguration dsConfig = new DatasourceConfiguration();
+
+        String baseUrl = String.format("http://%s:%s", mockEndpoint.getHostName(), mockEndpoint.getPort());
+        dsConfig.setUrl(baseUrl);
+
+        String initialPath = "/start";
+        String redirectPath = "/redirection";
+        String responseBody = "this is a successful response";
+
+        MockResponse initialResponse =
+                new MockResponse().setResponseCode(302).addHeader(HttpHeaders.LOCATION, redirectPath);
+        MockResponse redirectedResponse =
+                new MockResponse().setResponseCode(200).setBody(responseBody);
+
+        mockEndpoint.enqueue(initialResponse);
+        mockEndpoint.enqueue(redirectedResponse);
+
+        ActionConfiguration actionConfig = new ActionConfiguration();
+        actionConfig.setHttpMethod(HttpMethod.GET);
+        actionConfig.setPath(initialPath);
+
+        Mono<ActionExecutionResult> resultMono =
+                pluginExecutor.executeParameterized(null, new ExecuteActionDTO(), dsConfig, actionConfig);
+        StepVerifier.create(resultMono)
+                .assertNext(result -> {
+                    assertTrue(result.getIsExecutionSuccess());
+                    assertNotNull(result.getBody());
+                    final RecordedRequest initialRequest;
+                    try {
+                        initialRequest = mockEndpoint.takeRequest(30, TimeUnit.SECONDS);
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
+                    assert initialRequest != null;
+                    assertEquals(initialRequest.getPath(), initialPath);
+
+                    // redirected Request
+                    final RecordedRequest redirectedRequest;
+                    try {
+                        redirectedRequest = mockEndpoint.takeRequest(30, TimeUnit.SECONDS);
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
+                    assert redirectedRequest != null;
+                    assertEquals(redirectedRequest.getPath(), redirectPath);
+
+                    final ActionExecutionRequest request = result.getRequest();
+                    assertEquals(baseUrl + redirectPath, request.getUrl());
+                    assertEquals(HttpMethod.GET, request.getHttpMethod());
+                    assertEquals(result.getBody(), responseBody);
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void testRedirectionSuccessWithAddingFullUrlExecution() {
+        DatasourceConfiguration dsConfig = new DatasourceConfiguration();
+
+        String baseUrl = String.format("http://%s:%s", mockEndpoint.getHostName(), mockEndpoint.getPort());
+        dsConfig.setUrl(baseUrl);
+
+        String initialPath = "/start";
+        String redirectPath = "/redirection";
+        String responseBody = "this is a successful response";
+
+        MockResponse initialResponse =
+                new MockResponse().setResponseCode(302).addHeader(HttpHeaders.LOCATION, baseUrl + redirectPath);
+        MockResponse redirectedResponse =
+                new MockResponse().setResponseCode(200).setBody(responseBody);
+
+        mockEndpoint.enqueue(initialResponse);
+        mockEndpoint.enqueue(redirectedResponse);
+
+        ActionConfiguration actionConfig = new ActionConfiguration();
+        actionConfig.setHttpMethod(HttpMethod.GET);
+        actionConfig.setPath(initialPath);
+
+        Mono<ActionExecutionResult> resultMono =
+                pluginExecutor.executeParameterized(null, new ExecuteActionDTO(), dsConfig, actionConfig);
+        StepVerifier.create(resultMono)
+                .assertNext(result -> {
+                    assertTrue(result.getIsExecutionSuccess());
+                    assertNotNull(result.getBody());
+                    final RecordedRequest initialRequest;
+                    try {
+                        initialRequest = mockEndpoint.takeRequest(30, TimeUnit.SECONDS);
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
+                    assert initialRequest != null;
+                    assertEquals(initialRequest.getPath(), initialPath);
+
+                    // redirected Request
+                    final RecordedRequest redirectedRequest;
+                    try {
+                        redirectedRequest = mockEndpoint.takeRequest(30, TimeUnit.SECONDS);
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
+                    assert redirectedRequest != null;
+                    assertEquals(redirectedRequest.getPath(), redirectPath);
+
+                    final ActionExecutionRequest request = result.getRequest();
+                    assertEquals(baseUrl + redirectPath, request.getUrl());
+                    assertEquals(HttpMethod.GET, request.getHttpMethod());
+                    assertEquals(result.getBody(), responseBody);
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void testExecutionSuccessWhenRedirectionEndsWithoutALocationHeader() {
+        DatasourceConfiguration dsConfig = new DatasourceConfiguration();
+
+        String baseUrl = String.format("http://%s:%s", mockEndpoint.getHostName(), mockEndpoint.getPort());
+        dsConfig.setUrl(baseUrl);
+
+        String path = "/start";
+        String responseBody = "this is a successful response, even when it ends with a redirection";
+
+        MockResponse initialResponse = new MockResponse().setResponseCode(302).setBody(responseBody);
+
+        mockEndpoint.enqueue(initialResponse);
+
+        ActionConfiguration actionConfig = new ActionConfiguration();
+        actionConfig.setHttpMethod(HttpMethod.GET);
+        actionConfig.setPath(path);
+
+        Mono<ActionExecutionResult> resultMono =
+                pluginExecutor.executeParameterized(null, new ExecuteActionDTO(), dsConfig, actionConfig);
+        StepVerifier.create(resultMono)
+                .assertNext(result -> {
+                    assertTrue(result.getIsExecutionSuccess());
+                    assertNotNull(result.getBody());
+                    final RecordedRequest finalRequest;
+                    try {
+                        finalRequest = mockEndpoint.takeRequest(30, TimeUnit.SECONDS);
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
+                    assert finalRequest != null;
+                    assertEquals(finalRequest.getPath(), path);
+                    final ActionExecutionRequest request = result.getRequest();
+                    assertEquals(baseUrl + path, request.getUrl());
+                    assertEquals(HttpMethod.GET, request.getHttpMethod());
+                    assertEquals(result.getBody(), responseBody);
+                    assertTrue(result.getIsExecutionSuccess());
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void testEmptyHostErrorMessage() {
+        DatasourceConfiguration dsConfig = new DatasourceConfiguration();
+        dsConfig.setUrl("  ");
+        String path = "/start";
+        ActionConfiguration actionConfig = new ActionConfiguration();
+        actionConfig.setHttpMethod(HttpMethod.GET);
+        actionConfig.setPath(path);
+
+        Mono<ActionExecutionResult> resultMono =
+                pluginExecutor.executeParameterized(null, new ExecuteActionDTO(), dsConfig, actionConfig);
+        StepVerifier.create(resultMono)
+                .assertNext(actionExecutionResult -> {
+                    assertFalse(actionExecutionResult.getIsExecutionSuccess());
+                    assertEquals(
+                            actionExecutionResult.getStatusCode(),
+                            AppsmithPluginError.PLUGIN_DATASOURCE_ARGUMENT_ERROR.getAppErrorCode());
+                })
+                .verifyComplete();
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionService.java
new file mode 100644
index 0000000000..451baf1272
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionService.java
@@ -0,0 +1,3 @@
+package com.appsmith.server.actioncollections.base;
+
+public interface ActionCollectionService extends ActionCollectionServiceCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ActionCollectionServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCE.java
similarity index 95%
rename from app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ActionCollectionServiceCE.java
rename to app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCE.java
index 6d0113d6aa..380666277d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ActionCollectionServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCE.java
@@ -1,4 +1,4 @@
-package com.appsmith.server.services.ce;
+package com.appsmith.server.actioncollections.base;
 
 import com.appsmith.external.models.ActionDTO;
 import com.appsmith.server.acl.AclPermission;
@@ -18,6 +18,7 @@ import reactor.core.publisher.Mono;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 public interface ActionCollectionServiceCE extends CrudService<ActionCollection, String> {
 
@@ -63,6 +64,8 @@ public interface ActionCollectionServiceCE extends CrudService<ActionCollection,
 
     Flux<ActionCollection> findByPageId(String pageId);
 
+    Flux<ActionCollection> findByListOfPageIds(List<String> pageIds, Optional<AclPermission> permission);
+
     Mono<ActionCollection> findByBranchNameAndDefaultCollectionId(
             String branchName, String defaultCollectionId, AclPermission permission);
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ActionCollectionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCEImpl.java
similarity index 99%
rename from app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ActionCollectionServiceCEImpl.java
rename to app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCEImpl.java
index 436eb92171..386b3f7ab4 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ActionCollectionServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCEImpl.java
@@ -1,4 +1,4 @@
-package com.appsmith.server.services.ce;
+package com.appsmith.server.actioncollections.base;
 
 import com.appsmith.external.models.ActionDTO;
 import com.appsmith.external.models.DefaultResources;
@@ -489,6 +489,11 @@ public class ActionCollectionServiceCEImpl extends BaseService<ActionCollectionR
         return repository.findByPageId(pageId);
     }
 
+    @Override
+    public Flux<ActionCollection> findByListOfPageIds(List<String> pageIds, Optional<AclPermission> permission) {
+        return repository.findByListOfPageIds(pageIds, permission);
+    }
+
     @Override
     public Mono<ActionCollection> archiveById(String id) {
         Mono<ActionCollection> actionCollectionMono = repository
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ActionCollectionServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceImpl.java
similarity index 91%
rename from app/server/appsmith-server/src/main/java/com/appsmith/server/services/ActionCollectionServiceImpl.java
rename to app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceImpl.java
index 55b7dd0a69..4fd020e6ba 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ActionCollectionServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceImpl.java
@@ -1,10 +1,11 @@
-package com.appsmith.server.services;
+package com.appsmith.server.actioncollections.base;
 
 import com.appsmith.server.acl.PolicyGenerator;
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.newactions.base.NewActionService;
 import com.appsmith.server.repositories.ActionCollectionRepository;
-import com.appsmith.server.services.ce.ActionCollectionServiceCEImpl;
+import com.appsmith.server.services.AnalyticsService;
+import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.solutions.ActionPermission;
 import com.appsmith.server.solutions.ApplicationPermission;
 import jakarta.validation.Validator;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/export/ActionCollectionExportableServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/export/ActionCollectionExportableServiceCEImpl.java
new file mode 100644
index 0000000000..e07503be8b
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/export/ActionCollectionExportableServiceCEImpl.java
@@ -0,0 +1,138 @@
+package com.appsmith.server.actioncollections.export;
+
+import com.appsmith.server.acl.AclPermission;
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
+import com.appsmith.server.constants.FieldName;
+import com.appsmith.server.domains.ActionCollection;
+import com.appsmith.server.domains.Application;
+import com.appsmith.server.dtos.ActionCollectionDTO;
+import com.appsmith.server.dtos.ApplicationJson;
+import com.appsmith.server.dtos.ExportingMetaDTO;
+import com.appsmith.server.dtos.MappedExportableResourcesDTO;
+import com.appsmith.server.export.exportable.ExportableServiceCE;
+import com.appsmith.server.helpers.ImportExportUtils;
+import com.appsmith.server.solutions.ActionPermission;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.time.Instant;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+import static com.appsmith.external.constants.GitConstants.NAME_SEPARATOR;
+import static com.appsmith.server.constants.ResourceModes.EDIT;
+import static com.appsmith.server.constants.ResourceModes.VIEW;
+
+public class ActionCollectionExportableServiceCEImpl implements ExportableServiceCE<ActionCollection> {
+
+    private final ActionCollectionService actionCollectionService;
+    private final ActionPermission actionPermission;
+
+    public ActionCollectionExportableServiceCEImpl(
+            ActionCollectionService actionCollectionService, ActionPermission actionPermission) {
+        this.actionCollectionService = actionCollectionService;
+        this.actionPermission = actionPermission;
+    }
+
+    @Override
+    public Mono<List<ActionCollection>> getExportableEntities(
+            ExportingMetaDTO exportingMetaDTO,
+            MappedExportableResourcesDTO mappedExportableResourcesDTO,
+            Mono<Application> applicationMono,
+            ApplicationJson applicationJson) {
+
+        Optional<AclPermission> optionalPermission = Optional.ofNullable(actionPermission.getExportPermission(
+                exportingMetaDTO.getIsGitSync(), exportingMetaDTO.getExportWithConfiguration()));
+        Flux<ActionCollection> actionCollectionFlux =
+                actionCollectionService.findByListOfPageIds(exportingMetaDTO.getUnpublishedPages(), optionalPermission);
+        return actionCollectionFlux
+                .map(actionCollection -> {
+                    // Remove references to ids since the serialized version does not have this information
+                    actionCollection.setWorkspaceId(null);
+                    actionCollection.setPolicies(null);
+                    actionCollection.setApplicationId(null);
+                    // Set unique ids for actionCollection, also populate collectionIdToName map which will
+                    // be used to replace collectionIds in action
+                    if (actionCollection.getUnpublishedCollection() != null) {
+                        ActionCollectionDTO actionCollectionDTO = actionCollection.getUnpublishedCollection();
+                        actionCollectionDTO.setPageId(mappedExportableResourcesDTO
+                                .getPageIdToNameMap()
+                                .get(actionCollectionDTO.getPageId() + EDIT));
+                        actionCollectionDTO.setPluginId(
+                                mappedExportableResourcesDTO.getPluginMap().get(actionCollectionDTO.getPluginId()));
+
+                        final String updatedCollectionId =
+                                actionCollectionDTO.getPageId() + "_" + actionCollectionDTO.getName();
+                        mappedExportableResourcesDTO
+                                .getCollectionIdToNameMap()
+                                .put(actionCollection.getId(), updatedCollectionId);
+                        actionCollection.setId(updatedCollectionId);
+                    }
+                    if (actionCollection.getPublishedCollection() != null) {
+                        ActionCollectionDTO actionCollectionDTO = actionCollection.getPublishedCollection();
+                        actionCollectionDTO.setPageId(mappedExportableResourcesDTO
+                                .getPageIdToNameMap()
+                                .get(actionCollectionDTO.getPageId() + VIEW));
+                        actionCollectionDTO.setPluginId(
+                                mappedExportableResourcesDTO.getPluginMap().get(actionCollectionDTO.getPluginId()));
+
+                        if (!mappedExportableResourcesDTO
+                                .getCollectionIdToNameMap()
+                                .containsValue(actionCollection.getId())) {
+                            final String updatedCollectionId =
+                                    actionCollectionDTO.getPageId() + "_" + actionCollectionDTO.getName();
+                            mappedExportableResourcesDTO
+                                    .getCollectionIdToNameMap()
+                                    .put(actionCollection.getId(), updatedCollectionId);
+                            actionCollection.setId(updatedCollectionId);
+                        }
+                    }
+                    return actionCollection;
+                })
+                .collectList()
+                .map(actionCollections -> {
+                    // This object won't have the list of actions but we don't care about that today
+                    // Because the actions will have a reference to the collection
+
+                    Set<String> updatedActionCollectionSet = new HashSet<>();
+                    actionCollections.forEach(actionCollection -> {
+                        ActionCollectionDTO publishedActionCollectionDTO = actionCollection.getPublishedCollection();
+                        ActionCollectionDTO unpublishedActionCollectionDTO =
+                                actionCollection.getUnpublishedCollection();
+                        ActionCollectionDTO actionCollectionDTO = unpublishedActionCollectionDTO != null
+                                ? unpublishedActionCollectionDTO
+                                : publishedActionCollectionDTO;
+
+                        // TODO: check whether resource updated after last commit - move to a function
+                        // we've replaced page id with page name in previous step
+                        String pageName = actionCollectionDTO.getPageId();
+                        boolean isPageUpdated = ImportExportUtils.isPageNameInUpdatedList(applicationJson, pageName);
+                        String actionCollectionName = actionCollectionDTO != null
+                                ? actionCollectionDTO.getName() + NAME_SEPARATOR + actionCollectionDTO.getPageId()
+                                : null;
+                        Instant actionCollectionUpdatedAt = actionCollection.getUpdatedAt();
+                        boolean isActionCollectionUpdated = exportingMetaDTO.isClientSchemaMigrated()
+                                || exportingMetaDTO.isServerSchemaMigrated()
+                                || isPageUpdated
+                                || exportingMetaDTO.getApplicationLastCommittedAt() == null
+                                || actionCollectionUpdatedAt == null
+                                || exportingMetaDTO
+                                        .getApplicationLastCommittedAt()
+                                        .isBefore(actionCollectionUpdatedAt);
+                        if (isActionCollectionUpdated && actionCollectionName != null) {
+                            updatedActionCollectionSet.add(actionCollectionName);
+                        }
+                        actionCollection.sanitiseToExportDBObject();
+                    });
+
+                    applicationJson.setActionCollectionList(actionCollections);
+                    applicationJson
+                            .getUpdatedResources()
+                            .put(FieldName.ACTION_COLLECTION_LIST, updatedActionCollectionSet);
+
+                    return actionCollections;
+                });
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/export/ActionCollectionExportableServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/export/ActionCollectionExportableServiceImpl.java
new file mode 100644
index 0000000000..c82e8bc3b9
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/export/ActionCollectionExportableServiceImpl.java
@@ -0,0 +1,16 @@
+package com.appsmith.server.actioncollections.export;
+
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
+import com.appsmith.server.domains.ActionCollection;
+import com.appsmith.server.export.exportable.ExportableService;
+import com.appsmith.server.solutions.ActionPermission;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ActionCollectionExportableServiceImpl extends ActionCollectionExportableServiceCEImpl
+        implements ExportableService<ActionCollection> {
+    public ActionCollectionExportableServiceImpl(
+            ActionCollectionService actionCollectionService, ActionPermission actionPermission) {
+        super(actionCollectionService, actionPermission);
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/AuthenticationSuccessHandler.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/AuthenticationSuccessHandler.java
index 7e7e0fc419..66467580e4 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/AuthenticationSuccessHandler.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/AuthenticationSuccessHandler.java
@@ -2,6 +2,7 @@ package com.appsmith.server.authentication.handlers;
 
 import com.appsmith.server.authentication.handlers.ce.AuthenticationSuccessHandlerCE;
 import com.appsmith.server.helpers.RedirectHelper;
+import com.appsmith.server.helpers.WorkspaceServiceHelper;
 import com.appsmith.server.ratelimiting.RateLimitService;
 import com.appsmith.server.repositories.UserRepository;
 import com.appsmith.server.repositories.WorkspaceRepository;
@@ -32,7 +33,8 @@ public class AuthenticationSuccessHandler extends AuthenticationSuccessHandlerCE
             WorkspacePermission workspacePermission,
             RateLimitService rateLimitService,
             TenantService tenantService,
-            UserService userService) {
+            UserService userService,
+            WorkspaceServiceHelper workspaceServiceHelper) {
         super(
                 redirectHelper,
                 sessionUserService,
@@ -45,6 +47,7 @@ public class AuthenticationSuccessHandler extends AuthenticationSuccessHandlerCE
                 workspacePermission,
                 rateLimitService,
                 tenantService,
-                userService);
+                userService,
+                workspaceServiceHelper);
     }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/ce/AuthenticationSuccessHandlerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/ce/AuthenticationSuccessHandlerCE.java
index d201bafdae..e1e7e6136e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/ce/AuthenticationSuccessHandlerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/authentication/handlers/ce/AuthenticationSuccessHandlerCE.java
@@ -11,6 +11,7 @@ import com.appsmith.server.domains.User;
 import com.appsmith.server.domains.Workspace;
 import com.appsmith.server.dtos.ResendEmailVerificationDTO;
 import com.appsmith.server.helpers.RedirectHelper;
+import com.appsmith.server.helpers.WorkspaceServiceHelper;
 import com.appsmith.server.ratelimiting.RateLimitService;
 import com.appsmith.server.repositories.UserRepository;
 import com.appsmith.server.repositories.WorkspaceRepository;
@@ -66,6 +67,7 @@ public class AuthenticationSuccessHandlerCE implements ServerAuthenticationSucce
     private final RateLimitService rateLimitService;
     private final TenantService tenantService;
     private final UserService userService;
+    private final WorkspaceServiceHelper workspaceServiceHelper;
 
     private Mono<Boolean> isVerificationRequired(String userEmail, String method) {
         Mono<Boolean> emailVerificationEnabledMono = tenantService
@@ -252,7 +254,6 @@ public class AuthenticationSuccessHandlerCE implements ServerAuthenticationSucce
         log.debug("Login succeeded for user: {}", authentication.getPrincipal());
         Mono<Void> redirectionMono = null;
         User user = (User) authentication.getPrincipal();
-        rateLimitService.resetCounter(RateLimitConstants.BUCKET_KEY_FOR_LOGIN_API, user.getEmail());
         String originHeader =
                 webFilterExchange.getExchange().getRequest().getHeaders().getOrigin();
 
@@ -283,7 +284,7 @@ public class AuthenticationSuccessHandlerCE implements ServerAuthenticationSucce
             }
             if (isFromSignup) {
                 boolean finalIsFromSignup = isFromSignup;
-                redirectionMono = workspaceService
+                redirectionMono = workspaceServiceHelper
                         .isCreateWorkspaceAllowed(TRUE)
                         .flatMap(isCreateWorkspaceAllowed -> {
                             if (isCreateWorkspaceAllowed.equals(Boolean.TRUE)) {
@@ -314,6 +315,11 @@ public class AuthenticationSuccessHandlerCE implements ServerAuthenticationSucce
                 .getCurrentUser()
                 .flatMap(currentUser -> {
                     List<Mono<?>> monos = new ArrayList<>();
+
+                    // Since the user has successfully logged in, lets reset the rate limit counter for the user.
+                    monos.add(rateLimitService.resetCounter(
+                            RateLimitConstants.BUCKET_KEY_FOR_LOGIN_API, user.getEmail()));
+
                     monos.add(userDataService.ensureViewedCurrentVersionReleaseNotes(currentUser));
 
                     String modeOfLogin = FieldName.FORM_LOGIN;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/FeatureFlagConfig.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/FeatureFlagConfig.java
index c1208dce2e..9a8b4807d3 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/FeatureFlagConfig.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/FeatureFlagConfig.java
@@ -8,8 +8,10 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 public class FeatureFlagConfig {
 
+    // Since we rely on cloud services to retrieve the most up-to-date flags, we avoid automatically generating the same
+    // flag in the FF4J context.
     @Bean
     public FF4j ff4j() {
-        return new FF4j(new XmlParser(), "features/init-flags.xml").audit(true).autoCreate(true);
+        return new FF4j(new XmlParser(), "features/init-flags.xml").audit(true).autoCreate(false);
     }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/RedisListenerConfig.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/RedisListenerConfig.java
index abd3958e94..36ee880993 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/RedisListenerConfig.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/RedisListenerConfig.java
@@ -1,7 +1,7 @@
 package com.appsmith.server.configurations;
 
 import com.appsmith.server.dtos.InstallPluginRedisDTO;
-import com.appsmith.server.services.PluginService;
+import com.appsmith.server.plugins.base.PluginService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/connectionpoolconfig/configurations/ConnectionPoolConfigCECompatibleImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/connectionpoolconfig/configurations/ConnectionPoolConfigCECompatibleImpl.java
new file mode 100644
index 0000000000..74ee25d6c6
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/connectionpoolconfig/configurations/ConnectionPoolConfigCECompatibleImpl.java
@@ -0,0 +1,8 @@
+package com.appsmith.server.connectionpoolconfig.configurations;
+
+import com.appsmith.external.connectionpoolconfig.configurations.ConnectionPoolConfigCECompatible;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ConnectionPoolConfigCECompatibleImpl extends ConnectionPoolConfigCEImpl
+        implements ConnectionPoolConfigCECompatible {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/connectionpoolconfig/configurations/ConnectionPoolConfigCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/connectionpoolconfig/configurations/ConnectionPoolConfigCEImpl.java
new file mode 100644
index 0000000000..16db95e0a8
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/connectionpoolconfig/configurations/ConnectionPoolConfigCEImpl.java
@@ -0,0 +1,14 @@
+package com.appsmith.server.connectionpoolconfig.configurations;
+
+import com.appsmith.external.connectionpoolconfig.configurations.ConnectionPoolConfigCE;
+import reactor.core.publisher.Mono;
+
+public class ConnectionPoolConfigCEImpl implements ConnectionPoolConfigCE {
+
+    protected static final Integer DEFAULT_MINIMUM_MAX_POOL_SIZE = 5;
+
+    @Override
+    public Mono<Integer> getMaxConnectionPoolSize() {
+        return Mono.just(DEFAULT_MINIMUM_MAX_POOL_SIZE);
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/connectionpoolconfig/configurations/ConnectionPoolConfigImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/connectionpoolconfig/configurations/ConnectionPoolConfigImpl.java
new file mode 100644
index 0000000000..6d64667672
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/connectionpoolconfig/configurations/ConnectionPoolConfigImpl.java
@@ -0,0 +1,9 @@
+package com.appsmith.server.connectionpoolconfig.configurations;
+
+import com.appsmith.external.connectionpoolconfig.configurations.ConnectionPoolConfig;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ConnectionPoolConfigImpl extends ConnectionPoolConfigCECompatibleImpl implements ConnectionPoolConfig {
+    public ConnectionPoolConfigImpl() {}
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/SerialiseApplicationObjective.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/SerialiseApplicationObjective.java
index 1889f901ff..d546144bf5 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/SerialiseApplicationObjective.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/SerialiseApplicationObjective.java
@@ -3,5 +3,6 @@ package com.appsmith.server.constants;
 public enum SerialiseApplicationObjective {
     // For which purpose we are serialising the application from DB
     VERSION_CONTROL,
-    SHARE
+    SHARE,
+    KNOWLEDGE_BASE_GENERATION
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ActionCollectionController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ActionCollectionController.java
index 156a47e0a4..128d7175e7 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ActionCollectionController.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ActionCollectionController.java
@@ -1,8 +1,8 @@
 package com.appsmith.server.controllers;
 
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.constants.Url;
 import com.appsmith.server.controllers.ce.ActionCollectionControllerCE;
-import com.appsmith.server.services.ActionCollectionService;
 import com.appsmith.server.services.LayoutCollectionService;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ApplicationController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ApplicationController.java
index 8dd5743362..0c8268156e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ApplicationController.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ApplicationController.java
@@ -2,13 +2,13 @@ package com.appsmith.server.controllers;
 
 import com.appsmith.server.constants.Url;
 import com.appsmith.server.controllers.ce.ApplicationControllerCE;
+import com.appsmith.server.export.internal.ImportExportApplicationService;
 import com.appsmith.server.fork.internal.ApplicationForkingService;
 import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.ApplicationSnapshotService;
-import com.appsmith.server.services.ThemeService;
 import com.appsmith.server.solutions.ApplicationFetcher;
-import com.appsmith.server.solutions.ImportExportApplicationService;
+import com.appsmith.server.themes.base.ThemeService;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/CustomJSLibController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/CustomJSLibController.java
index ea667fea94..972e4b4f3d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/CustomJSLibController.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/CustomJSLibController.java
@@ -2,7 +2,7 @@ package com.appsmith.server.controllers;
 
 import com.appsmith.server.constants.Url;
 import com.appsmith.server.controllers.ce.CustomJSLibControllerCE;
-import com.appsmith.server.services.CustomJSLibServiceImpl;
+import com.appsmith.server.jslibs.base.CustomJSLibServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/PageController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/PageController.java
index b61b3adc67..56f1e70909 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/PageController.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/PageController.java
@@ -2,8 +2,8 @@ package com.appsmith.server.controllers;
 
 import com.appsmith.server.constants.Url;
 import com.appsmith.server.controllers.ce.PageControllerCE;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.services.ApplicationPageService;
-import com.appsmith.server.services.NewPageService;
 import com.appsmith.server.solutions.CreateDBTablePageSolution;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/PluginController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/PluginController.java
index a484b14768..845051ecb4 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/PluginController.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/PluginController.java
@@ -2,7 +2,7 @@ package com.appsmith.server.controllers;
 
 import com.appsmith.server.constants.Url;
 import com.appsmith.server.controllers.ce.PluginControllerCE;
-import com.appsmith.server.services.PluginService;
+import com.appsmith.server.plugins.base.PluginService;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ThemeController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ThemeController.java
index bb4b122715..0a676949ec 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ThemeController.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ThemeController.java
@@ -2,7 +2,7 @@ package com.appsmith.server.controllers;
 
 import com.appsmith.server.constants.Url;
 import com.appsmith.server.controllers.ce.ThemeControllerCE;
-import com.appsmith.server.services.ThemeService;
+import com.appsmith.server.themes.base.ThemeService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ActionCollectionControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ActionCollectionControllerCE.java
index b5bc5782a4..0492ee3e0f 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ActionCollectionControllerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ActionCollectionControllerCE.java
@@ -1,6 +1,7 @@
 package com.appsmith.server.controllers.ce;
 
 import com.appsmith.external.views.Views;
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.constants.Url;
 import com.appsmith.server.dtos.ActionCollectionDTO;
@@ -10,7 +11,6 @@ import com.appsmith.server.dtos.LayoutDTO;
 import com.appsmith.server.dtos.RefactorActionCollectionNameDTO;
 import com.appsmith.server.dtos.RefactorActionNameInCollectionDTO;
 import com.appsmith.server.dtos.ResponseDTO;
-import com.appsmith.server.services.ActionCollectionService;
 import com.appsmith.server.services.LayoutCollectionService;
 import com.fasterxml.jackson.annotation.JsonView;
 import jakarta.validation.Valid;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java
index c336c19a87..6e05584eeb 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java
@@ -17,13 +17,13 @@ import com.appsmith.server.dtos.ResponseDTO;
 import com.appsmith.server.dtos.UserHomepageDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.export.internal.ImportExportApplicationService;
 import com.appsmith.server.fork.internal.ApplicationForkingService;
 import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.ApplicationSnapshotService;
-import com.appsmith.server.services.ThemeService;
 import com.appsmith.server.solutions.ApplicationFetcher;
-import com.appsmith.server.solutions.ImportExportApplicationService;
+import com.appsmith.server.themes.base.ThemeService;
 import com.fasterxml.jackson.annotation.JsonView;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/CustomJSLibControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/CustomJSLibControllerCE.java
index 1d53dd8c05..9abd0ecf28 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/CustomJSLibControllerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/CustomJSLibControllerCE.java
@@ -5,7 +5,7 @@ import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.constants.Url;
 import com.appsmith.server.domains.CustomJSLib;
 import com.appsmith.server.dtos.ResponseDTO;
-import com.appsmith.server.services.CustomJSLibService;
+import com.appsmith.server.jslibs.base.CustomJSLibService;
 import com.fasterxml.jackson.annotation.JsonView;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/PageControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/PageControllerCE.java
index d9c61f2433..a8933073ba 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/PageControllerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/PageControllerCE.java
@@ -11,8 +11,8 @@ import com.appsmith.server.dtos.PageDTO;
 import com.appsmith.server.dtos.ResponseDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.services.ApplicationPageService;
-import com.appsmith.server.services.NewPageService;
 import com.appsmith.server.solutions.CreateDBTablePageSolution;
 import com.fasterxml.jackson.annotation.JsonView;
 import jakarta.validation.Valid;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/PluginControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/PluginControllerCE.java
index 842b1e950d..a6e79d6bdf 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/PluginControllerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/PluginControllerCE.java
@@ -6,7 +6,7 @@ import com.appsmith.server.domains.Plugin;
 import com.appsmith.server.domains.Workspace;
 import com.appsmith.server.dtos.PluginWorkspaceDTO;
 import com.appsmith.server.dtos.ResponseDTO;
-import com.appsmith.server.services.PluginService;
+import com.appsmith.server.plugins.base.PluginService;
 import com.fasterxml.jackson.annotation.JsonView;
 import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ThemeControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ThemeControllerCE.java
index 1c0a1b1d9c..21505570c5 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ThemeControllerCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ThemeControllerCE.java
@@ -8,7 +8,7 @@ import com.appsmith.server.domains.Theme;
 import com.appsmith.server.dtos.ResponseDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
-import com.appsmith.server.services.ThemeService;
+import com.appsmith.server.themes.base.ThemeService;
 import com.fasterxml.jackson.annotation.JsonView;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceCEImpl.java
index f9b9d21ac7..4d742e84a1 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceCEImpl.java
@@ -21,11 +21,11 @@ import com.appsmith.server.domains.Workspace;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.PluginExecutorHelper;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.repositories.DatasourceRepository;
 import com.appsmith.server.repositories.NewActionRepository;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.DatasourceContextService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.services.SequenceService;
 import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.services.WorkspaceService;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceImpl.java
index a59038b1df..8e9a97ddfa 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceImpl.java
@@ -3,11 +3,11 @@ package com.appsmith.server.datasources.base;
 import com.appsmith.server.acl.PolicyGenerator;
 import com.appsmith.server.datasourcestorages.base.DatasourceStorageService;
 import com.appsmith.server.helpers.PluginExecutorHelper;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.repositories.DatasourceRepository;
 import com.appsmith.server.repositories.NewActionRepository;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.DatasourceContextService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.services.SequenceService;
 import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.services.WorkspaceService;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/export/DatasourceExportableServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/export/DatasourceExportableServiceCEImpl.java
new file mode 100644
index 0000000000..2ffa91f2f7
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/export/DatasourceExportableServiceCEImpl.java
@@ -0,0 +1,165 @@
+package com.appsmith.server.datasources.export;
+
+import com.appsmith.external.models.AuthenticationDTO;
+import com.appsmith.external.models.BasicAuth;
+import com.appsmith.external.models.BearerTokenAuth;
+import com.appsmith.external.models.DBAuth;
+import com.appsmith.external.models.Datasource;
+import com.appsmith.external.models.DatasourceStorage;
+import com.appsmith.external.models.DecryptedSensitiveFields;
+import com.appsmith.external.models.OAuth2;
+import com.appsmith.server.acl.AclPermission;
+import com.appsmith.server.constants.SerialiseApplicationObjective;
+import com.appsmith.server.datasources.base.DatasourceService;
+import com.appsmith.server.datasourcestorages.base.DatasourceStorageService;
+import com.appsmith.server.domains.Application;
+import com.appsmith.server.dtos.ApplicationJson;
+import com.appsmith.server.dtos.ExportingMetaDTO;
+import com.appsmith.server.dtos.MappedExportableResourcesDTO;
+import com.appsmith.server.export.exportable.ExportableServiceCE;
+import com.appsmith.server.services.WorkspaceService;
+import com.appsmith.server.solutions.DatasourcePermission;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import static java.lang.Boolean.TRUE;
+
+public class DatasourceExportableServiceCEImpl implements ExportableServiceCE<Datasource> {
+
+    private final DatasourceService datasourceService;
+    private final DatasourcePermission datasourcePermission;
+    private final WorkspaceService workspaceService;
+    private final DatasourceStorageService datasourceStorageService;
+
+    public DatasourceExportableServiceCEImpl(
+            DatasourceService datasourceService,
+            DatasourcePermission datasourcePermission,
+            WorkspaceService workspaceService,
+            DatasourceStorageService datasourceStorageService) {
+        this.datasourceService = datasourceService;
+        this.datasourcePermission = datasourcePermission;
+        this.workspaceService = workspaceService;
+        this.datasourceStorageService = datasourceStorageService;
+    }
+
+    @Override
+    public Mono<List<Datasource>> getExportableEntities(
+            ExportingMetaDTO exportingMetaDTO,
+            MappedExportableResourcesDTO mappedExportableResourcesDTO,
+            Mono<Application> applicationMono,
+            ApplicationJson applicationJson) {
+
+        Mono<String> defaultEnvironmentIdMono = applicationMono
+                .map(Application::getWorkspaceId)
+                .flatMap(workspaceId -> workspaceService.getDefaultEnvironmentId(workspaceId, null));
+
+        Optional<AclPermission> optionalPermission = Optional.ofNullable(datasourcePermission.getExportPermission(
+                exportingMetaDTO.getIsGitSync(), exportingMetaDTO.getExportWithConfiguration()));
+
+        Flux<Datasource> datasourceFlux = applicationMono.flatMapMany(application -> {
+            return datasourceService.getAllByWorkspaceIdWithStorages(application.getWorkspaceId(), optionalPermission);
+        });
+
+        return datasourceFlux.collectList().zipWith(defaultEnvironmentIdMono).map(tuple2 -> {
+            List<Datasource> datasourceList = tuple2.getT1();
+            String environmentId = tuple2.getT2();
+            datasourceList.forEach(datasource -> {
+                mappedExportableResourcesDTO.getDatasourceIdToNameMap().put(datasource.getId(), datasource.getName());
+                mappedExportableResourcesDTO
+                        .getDatasourceNameToUpdatedAtMap()
+                        .put(datasource.getName(), datasource.getUpdatedAt());
+            });
+
+            List<DatasourceStorage> storageList = datasourceList.stream()
+                    .map(datasource -> {
+                        DatasourceStorage storage =
+                                datasourceStorageService.getDatasourceStorageFromDatasource(datasource, environmentId);
+
+                        if (storage == null) {
+                            // This means we were unable to find a storage for default environment
+                            // We still need the user to be able to configure this datasource in a
+                            // new workspace,
+                            // So we will create a fallback storage using transient fields from the
+                            // datasource
+                            storage = new DatasourceStorage();
+                            storage.prepareTransientFields(datasource);
+                        }
+                        return storage;
+                    })
+                    .collect(Collectors.toList());
+            applicationJson.setDatasourceList(storageList);
+
+            return datasourceList;
+        });
+    }
+
+    @Override
+    public void sanitizeEntities(
+            ExportingMetaDTO exportingMetaDTO,
+            MappedExportableResourcesDTO mappedExportableResourcesDTO,
+            ApplicationJson applicationJson,
+            SerialiseApplicationObjective serialiseFor) {
+        // Save decrypted fields for datasources for internally used sample apps and templates
+        // only when serialising for file sharing
+        if (TRUE.equals(exportingMetaDTO.getExportWithConfiguration())
+                && SerialiseApplicationObjective.SHARE.equals(serialiseFor)) {
+            // Save decrypted fields for datasources
+            Map<String, DecryptedSensitiveFields> decryptedFields = new HashMap<>();
+            applicationJson.getDatasourceList().forEach(datasourceStorage -> {
+                decryptedFields.put(datasourceStorage.getName(), getDecryptedFields(datasourceStorage));
+                datasourceStorage.sanitiseToExportResource(mappedExportableResourcesDTO.getPluginMap());
+            });
+            applicationJson.setDecryptedFields(decryptedFields);
+        } else {
+            applicationJson.getDatasourceList().forEach(datasourceStorage -> {
+                // Remove the datasourceConfiguration object as user will configure it once
+                // imported to other instance
+                datasourceStorage.setDatasourceConfiguration(null);
+                datasourceStorage.sanitiseToExportResource(mappedExportableResourcesDTO.getPluginMap());
+            });
+        }
+    }
+
+    /**
+     * This will be used to dehydrate sensitive fields from the datasourceStorage while exporting the application
+     *
+     * @param datasourceStorage entity from which sensitive fields need to be dehydrated
+     * @return sensitive fields which then will be deserialized and exported in JSON file
+     */
+    private DecryptedSensitiveFields getDecryptedFields(DatasourceStorage datasourceStorage) {
+        final AuthenticationDTO authentication = datasourceStorage.getDatasourceConfiguration() == null
+                ? null
+                : datasourceStorage.getDatasourceConfiguration().getAuthentication();
+
+        if (authentication != null) {
+            DecryptedSensitiveFields dsDecryptedFields = authentication.getAuthenticationResponse() == null
+                    ? new DecryptedSensitiveFields()
+                    : new DecryptedSensitiveFields(authentication.getAuthenticationResponse());
+
+            if (authentication instanceof DBAuth) {
+                DBAuth auth = (DBAuth) authentication;
+                dsDecryptedFields.setPassword(auth.getPassword());
+                dsDecryptedFields.setDbAuth(auth);
+            } else if (authentication instanceof OAuth2) {
+                OAuth2 auth = (OAuth2) authentication;
+                dsDecryptedFields.setPassword(auth.getClientSecret());
+                dsDecryptedFields.setOpenAuth2(auth);
+            } else if (authentication instanceof BasicAuth) {
+                BasicAuth auth = (BasicAuth) authentication;
+                dsDecryptedFields.setPassword(auth.getPassword());
+                dsDecryptedFields.setBasicAuth(auth);
+            } else if (authentication instanceof BearerTokenAuth auth) {
+                dsDecryptedFields.setBearerTokenAuth(auth);
+            }
+            dsDecryptedFields.setAuthType(authentication.getClass().getName());
+            return dsDecryptedFields;
+        }
+        return null;
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/export/DatasourceExportableServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/export/DatasourceExportableServiceImpl.java
new file mode 100644
index 0000000000..572389e69b
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/export/DatasourceExportableServiceImpl.java
@@ -0,0 +1,22 @@
+package com.appsmith.server.datasources.export;
+
+import com.appsmith.external.models.Datasource;
+import com.appsmith.server.datasources.base.DatasourceService;
+import com.appsmith.server.datasourcestorages.base.DatasourceStorageService;
+import com.appsmith.server.export.exportable.ExportableService;
+import com.appsmith.server.services.WorkspaceService;
+import com.appsmith.server.solutions.DatasourcePermission;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DatasourceExportableServiceImpl extends DatasourceExportableServiceCEImpl
+        implements ExportableService<Datasource> {
+
+    public DatasourceExportableServiceImpl(
+            DatasourceService datasourceService,
+            DatasourcePermission datasourcePermission,
+            WorkspaceService workspaceService,
+            DatasourceStorageService datasourceStorageService) {
+        super(datasourceService, datasourcePermission, workspaceService, datasourceStorageService);
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageService.java
index 20be3c7ed9..d66518891d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageService.java
@@ -1,3 +1,3 @@
 package com.appsmith.server.datasourcestorages.base;
 
-public interface DatasourceStorageService extends DatasourceStorageServiceCE {}
+public interface DatasourceStorageService extends DatasourceStorageServiceCECompatible {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageServiceCECompatible.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageServiceCECompatible.java
new file mode 100644
index 0000000000..2fe27096c6
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageServiceCECompatible.java
@@ -0,0 +1,3 @@
+package com.appsmith.server.datasourcestorages.base;
+
+public interface DatasourceStorageServiceCECompatible extends DatasourceStorageServiceCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageServiceCECompatibleImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageServiceCECompatibleImpl.java
new file mode 100644
index 0000000000..6bc68d185f
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageServiceCECompatibleImpl.java
@@ -0,0 +1,22 @@
+package com.appsmith.server.datasourcestorages.base;
+
+import com.appsmith.server.helpers.PluginExecutorHelper;
+import com.appsmith.server.plugins.base.PluginService;
+import com.appsmith.server.repositories.DatasourceStorageRepository;
+import com.appsmith.server.services.AnalyticsService;
+import com.appsmith.server.solutions.DatasourcePermission;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DatasourceStorageServiceCECompatibleImpl extends DatasourceStorageServiceCEImpl
+        implements DatasourceStorageServiceCECompatible {
+
+    public DatasourceStorageServiceCECompatibleImpl(
+            DatasourceStorageRepository repository,
+            DatasourcePermission datasourcePermission,
+            PluginService pluginService,
+            PluginExecutorHelper pluginExecutorHelper,
+            AnalyticsService analyticsService) {
+        super(repository, datasourcePermission, pluginService, pluginExecutorHelper, analyticsService);
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageServiceCEImpl.java
index 527f4b6a2a..1d91c7d451 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageServiceCEImpl.java
@@ -12,9 +12,9 @@ import com.appsmith.server.domains.Plugin;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.PluginExecutorHelper;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.repositories.DatasourceStorageRepository;
 import com.appsmith.server.services.AnalyticsService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.solutions.DatasourcePermission;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.CollectionUtils;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageServiceImpl.java
index 43ad84dd6d..6d1c40e6e9 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/datasourcestorages/base/DatasourceStorageServiceImpl.java
@@ -1,16 +1,17 @@
 package com.appsmith.server.datasourcestorages.base;
 
 import com.appsmith.server.helpers.PluginExecutorHelper;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.repositories.DatasourceStorageRepository;
 import com.appsmith.server.services.AnalyticsService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.solutions.DatasourcePermission;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 @Service
 @Slf4j
-public class DatasourceStorageServiceImpl extends DatasourceStorageServiceCEImpl implements DatasourceStorageService {
+public class DatasourceStorageServiceImpl extends DatasourceStorageServiceCECompatibleImpl
+        implements DatasourceStorageService {
     public DatasourceStorageServiceImpl(
             DatasourceStorageRepository repository,
             DatasourcePermission datasourcePermission,
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ExportingMetaDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ExportingMetaDTO.java
new file mode 100644
index 0000000000..50b390048d
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ExportingMetaDTO.java
@@ -0,0 +1,26 @@
+package com.appsmith.server.dtos;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.Instant;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder(toBuilder = true)
+public class ExportingMetaDTO {
+    String applicationId;
+    String branchName;
+    Boolean isGitSync;
+    Boolean exportWithConfiguration;
+
+    Instant applicationLastCommittedAt;
+    boolean isClientSchemaMigrated;
+    boolean isServerSchemaMigrated;
+
+    List<String> unpublishedPages;
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/MappedExportableResourcesDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/MappedExportableResourcesDTO.java
new file mode 100644
index 0000000000..707c736ad5
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/MappedExportableResourcesDTO.java
@@ -0,0 +1,5 @@
+package com.appsmith.server.dtos;
+
+import com.appsmith.server.dtos.ce.MappedExportableResourcesCE_DTO;
+
+public class MappedExportableResourcesDTO extends MappedExportableResourcesCE_DTO {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/MappedExportableResourcesCE_DTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/MappedExportableResourcesCE_DTO.java
new file mode 100644
index 0000000000..f34f03df03
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/MappedExportableResourcesCE_DTO.java
@@ -0,0 +1,20 @@
+package com.appsmith.server.dtos.ce;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.Map;
+
+@NoArgsConstructor
+@Data
+public class MappedExportableResourcesCE_DTO {
+
+    Map<String, String> pluginMap = new HashMap<>();
+    Map<String, String> datasourceIdToNameMap = new HashMap<>();
+    Map<String, Instant> datasourceNameToUpdatedAtMap = new HashMap<>();
+    Map<String, String> pageIdToNameMap = new HashMap<>();
+    Map<String, String> actionIdToNameMap = new HashMap<>();
+    Map<String, String> collectionIdToNameMap = new HashMap<>();
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java
index 9de15ba27e..8985b52e39 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java
@@ -969,6 +969,14 @@ public enum AppsmithError {
             "Invalid usage for custom annotation",
             ErrorType.CONFIGURATION_ERROR,
             null),
+    MIGRATION_FAILED(
+            500,
+            AppsmithErrorCode.MIGRATION_FAILED.getCode(),
+            "Migration {0} failed. Reason: {1}. Note: {2}",
+            AppsmithErrorAction.DEFAULT,
+            "Migration failed",
+            ErrorType.INTERNAL_ERROR,
+            null),
 
     FeatureFlagMigrationFailure(
             500,
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithErrorCode.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithErrorCode.java
index e47cb2ad6a..9cd8a99b38 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithErrorCode.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithErrorCode.java
@@ -66,6 +66,7 @@ public enum AppsmithErrorCode {
     PLUGIN_EXECUTION_TIMEOUT("AE-APP-5040", "Plugin execution timeout"),
     MARKETPLACE_TIMEOUT("AE-APP-5041", "Marketplace timeout"),
     GOOGLE_RECAPTCHA_TIMEOUT("AE-APP-5042", "Google recaptcha timeout"),
+    MIGRATION_FAILED("AE-APP-5043", "Migration failed"),
     INVALID_PROPERTIES_CONFIGURATION("AE-APP-5044", "Property configuration is wrong or malformed"),
     NAME_CLASH_NOT_ALLOWED_IN_REFACTOR("AE-AST-4009", "Name clash not allowed in refactor"),
     GENERIC_BAD_REQUEST("AE-BAD-4000", "Generic bad request"),
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/export/exportable/ExportableService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/export/exportable/ExportableService.java
new file mode 100644
index 0000000000..07180d4ad2
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/export/exportable/ExportableService.java
@@ -0,0 +1,5 @@
+package com.appsmith.server.export.exportable;
+
+import com.appsmith.external.models.BaseDomain;
+
+public interface ExportableService<T extends BaseDomain> extends ExportableServiceCE<T> {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/export/exportable/ExportableServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/export/exportable/ExportableServiceCE.java
new file mode 100644
index 0000000000..0127b154af
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/export/exportable/ExportableServiceCE.java
@@ -0,0 +1,26 @@
+package com.appsmith.server.export.exportable;
+
+import com.appsmith.external.models.BaseDomain;
+import com.appsmith.server.constants.SerialiseApplicationObjective;
+import com.appsmith.server.domains.Application;
+import com.appsmith.server.dtos.ApplicationJson;
+import com.appsmith.server.dtos.ExportingMetaDTO;
+import com.appsmith.server.dtos.MappedExportableResourcesDTO;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+
+public interface ExportableServiceCE<T extends BaseDomain> {
+
+    Mono<List<T>> getExportableEntities(
+            ExportingMetaDTO exportingMetaDTO,
+            MappedExportableResourcesDTO mappedExportableResourcesDTO,
+            Mono<Application> applicationMono,
+            ApplicationJson applicationJson);
+
+    default void sanitizeEntities(
+            ExportingMetaDTO exportingMetaDTO,
+            MappedExportableResourcesDTO mappedExportableResourcesDTO,
+            ApplicationJson applicationJson,
+            SerialiseApplicationObjective serialiseFor) {}
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/export/internal/ImportExportApplicationService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/export/internal/ImportExportApplicationService.java
new file mode 100644
index 0000000000..8072445fbd
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/export/internal/ImportExportApplicationService.java
@@ -0,0 +1,3 @@
+package com.appsmith.server.export.internal;
+
+public interface ImportExportApplicationService extends ImportExportApplicationServiceCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/export/internal/ImportExportApplicationServiceCE.java
similarity index 99%
rename from app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCE.java
rename to app/server/appsmith-server/src/main/java/com/appsmith/server/export/internal/ImportExportApplicationServiceCE.java
index 539e5ff806..7865ef9039 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/export/internal/ImportExportApplicationServiceCE.java
@@ -1,4 +1,4 @@
-package com.appsmith.server.solutions.ce;
+package com.appsmith.server.export.internal;
 
 import com.appsmith.external.models.Datasource;
 import com.appsmith.server.constants.SerialiseApplicationObjective;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/export/internal/ImportExportApplicationServiceCEImpl.java
similarity index 77%
rename from app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImpl.java
rename to app/server/appsmith-server/src/main/java/com/appsmith/server/export/internal/ImportExportApplicationServiceCEImpl.java
index 00d0e816b9..4bf860f25f 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/export/internal/ImportExportApplicationServiceCEImpl.java
@@ -1,9 +1,7 @@
-package com.appsmith.server.solutions.ce;
+package com.appsmith.server.export.internal;
 
 import com.appsmith.external.constants.AnalyticsEvents;
 import com.appsmith.external.helpers.Stopwatch;
-import com.appsmith.external.models.ActionDTO;
-import com.appsmith.external.models.AuthenticationDTO;
 import com.appsmith.external.models.AuthenticationResponse;
 import com.appsmith.external.models.BaseDomain;
 import com.appsmith.external.models.BasicAuth;
@@ -18,62 +16,59 @@ import com.appsmith.external.models.DefaultResources;
 import com.appsmith.external.models.OAuth2;
 import com.appsmith.external.models.Policy;
 import com.appsmith.server.acl.AclPermission;
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.constants.ResourceModes;
 import com.appsmith.server.constants.SerialiseApplicationObjective;
 import com.appsmith.server.datasources.base.DatasourceService;
-import com.appsmith.server.datasourcestorages.base.DatasourceStorageService;
 import com.appsmith.server.domains.ActionCollection;
 import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.ApplicationPage;
 import com.appsmith.server.domains.CustomJSLib;
 import com.appsmith.server.domains.GitApplicationMetadata;
-import com.appsmith.server.domains.Layout;
 import com.appsmith.server.domains.NewAction;
 import com.appsmith.server.domains.NewPage;
+import com.appsmith.server.domains.Plugin;
 import com.appsmith.server.domains.Theme;
 import com.appsmith.server.domains.User;
 import com.appsmith.server.domains.Workspace;
-import com.appsmith.server.dtos.ActionCollectionDTO;
 import com.appsmith.server.dtos.ApplicationImportDTO;
 import com.appsmith.server.dtos.ApplicationJson;
 import com.appsmith.server.dtos.CustomJSLibApplicationDTO;
 import com.appsmith.server.dtos.ExportFileDTO;
-import com.appsmith.server.dtos.PageDTO;
+import com.appsmith.server.dtos.ExportingMetaDTO;
+import com.appsmith.server.dtos.MappedExportableResourcesDTO;
 import com.appsmith.server.dtos.ce.ImportActionCollectionResultDTO;
 import com.appsmith.server.dtos.ce.ImportActionResultDTO;
 import com.appsmith.server.dtos.ce.ImportedActionAndCollectionMapsDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.export.exportable.ExportableService;
+import com.appsmith.server.export.exportable.ExportableServiceCE;
 import com.appsmith.server.helpers.DefaultResourcesUtils;
 import com.appsmith.server.helpers.ImportExportUtils;
 import com.appsmith.server.helpers.TextUtils;
 import com.appsmith.server.helpers.ce.ImportApplicationPermissionProvider;
+import com.appsmith.server.jslibs.base.CustomJSLibService;
 import com.appsmith.server.migrations.ApplicationVersion;
 import com.appsmith.server.migrations.JsonSchemaMigration;
 import com.appsmith.server.migrations.JsonSchemaVersions;
 import com.appsmith.server.newactions.base.NewActionService;
-import com.appsmith.server.repositories.ActionCollectionRepository;
-import com.appsmith.server.repositories.DatasourceRepository;
-import com.appsmith.server.repositories.NewActionRepository;
-import com.appsmith.server.repositories.NewPageRepository;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.repositories.PermissionGroupRepository;
 import com.appsmith.server.repositories.PluginRepository;
-import com.appsmith.server.services.ActionCollectionService;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.ApplicationService;
-import com.appsmith.server.services.CustomJSLibService;
-import com.appsmith.server.services.NewPageService;
 import com.appsmith.server.services.SequenceService;
 import com.appsmith.server.services.SessionUserService;
-import com.appsmith.server.services.ThemeService;
 import com.appsmith.server.services.WorkspaceService;
 import com.appsmith.server.solutions.ActionPermission;
 import com.appsmith.server.solutions.ApplicationPermission;
 import com.appsmith.server.solutions.DatasourcePermission;
 import com.appsmith.server.solutions.PagePermission;
 import com.appsmith.server.solutions.WorkspacePermission;
+import com.appsmith.server.themes.base.ThemeService;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import lombok.RequiredArgsConstructor;
@@ -97,8 +92,6 @@ import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -106,15 +99,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
-import static com.appsmith.external.constants.GitConstants.NAME_SEPARATOR;
 import static com.appsmith.external.helpers.AppsmithBeanUtils.copyNestedNonNullProperties;
-import static com.appsmith.server.acl.AclPermission.READ_THEMES;
 import static com.appsmith.server.constants.ResourceModes.EDIT;
 import static com.appsmith.server.constants.ResourceModes.VIEW;
-import static com.appsmith.server.helpers.ImportExportUtils.sanitizeDatasourceInActionDTO;
 import static com.appsmith.server.helpers.ImportExportUtils.setPropertiesToExistingApplication;
 import static com.appsmith.server.helpers.ImportExportUtils.setPublishedApplicationProperties;
 import static java.lang.Boolean.TRUE;
@@ -124,21 +113,24 @@ import static java.lang.Boolean.TRUE;
 public class ImportExportApplicationServiceCEImpl implements ImportExportApplicationServiceCE {
 
     private final DatasourceService datasourceService;
+    private final ExportableService<Datasource> datasourceExportableService;
     private final SessionUserService sessionUserService;
-    private final NewActionRepository newActionRepository;
-    private final DatasourceRepository datasourceRepository;
     private final PluginRepository pluginRepository;
+    private final ExportableService<Plugin> pluginExportableService;
     private final WorkspaceService workspaceService;
     private final ApplicationService applicationService;
     private final NewPageService newPageService;
     private final ApplicationPageService applicationPageService;
-    private final NewPageRepository newPageRepository;
+    private final ExportableService<NewPage> newPageExportableService;
     private final NewActionService newActionService;
     private final SequenceService sequenceService;
-    private final ActionCollectionRepository actionCollectionRepository;
+    private final ExportableService<NewAction> newActionExportableService;
+    private final ExportableService<ActionCollection> actionCollectionExportableService;
     private final ActionCollectionService actionCollectionService;
+    private final ExportableServiceCE<Theme> themeExportableService;
     private final ThemeService themeService;
     private final AnalyticsService analyticsService;
+    private final ExportableService<CustomJSLib> customJSLibExportableService;
     private final CustomJSLibService customJSLibService;
     private final DatasourcePermission datasourcePermission;
     private final WorkspacePermission workspacePermission;
@@ -147,7 +139,6 @@ public class ImportExportApplicationServiceCEImpl implements ImportExportApplica
     private final ActionPermission actionPermission;
     private final Gson gson;
     private final TransactionalOperator transactionalOperator;
-    private final DatasourceStorageService datasourceStorageService;
     private final PermissionGroupRepository permissionGroupRepository;
 
     private static final Set<MediaType> ALLOWED_CONTENT_TYPES = Set.of(MediaType.APPLICATION_JSON);
@@ -173,38 +164,31 @@ public class ImportExportApplicationServiceCEImpl implements ImportExportApplica
            6. Fetch action collections from the application
         */
         ApplicationJson applicationJson = new ApplicationJson();
-        Map<String, String> pluginMap = new HashMap<>();
-        Map<String, String> datasourceIdToNameMap = new HashMap<>();
-        Map<String, Instant> datasourceNameToUpdatedAtMap = new HashMap<>();
-        Map<String, String> pageIdToNameMap = new HashMap<>();
-        Map<String, String> actionIdToNameMap = new HashMap<>();
-        Map<String, String> collectionIdToNameMap = new HashMap<>();
+        final MappedExportableResourcesDTO mappedResourcesDTO = new MappedExportableResourcesDTO();
+        final ExportingMetaDTO exportingMetaDTO = new ExportingMetaDTO();
+        exportingMetaDTO.setApplicationId(applicationId);
+        exportingMetaDTO.setBranchName(null);
 
         if (applicationId == null || applicationId.isEmpty()) {
             return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.APPLICATION_ID));
         }
 
-        // Check permissions depending upon the serialization objective:
-        // Git-sync => Manage permission
-        // Share application
-        //      : Normal apps => Export permission
-        //      : Sample apps where datasource config needs to be shared => Read permission
+        boolean isGitSync = SerialiseApplicationObjective.VERSION_CONTROL.equals(serialiseFor)
+                || SerialiseApplicationObjective.KNOWLEDGE_BASE_GENERATION.equals(serialiseFor);
 
-        boolean isGitSync = SerialiseApplicationObjective.VERSION_CONTROL.equals(serialiseFor);
-        AtomicReference<Boolean> exportWithConfiguration = new AtomicReference<>(false);
+        exportingMetaDTO.setIsGitSync(isGitSync);
+        exportingMetaDTO.setExportWithConfiguration(false);
 
-        // If Git-sync, then use MANAGE_APPLICATIONS, else use EXPORT_APPLICATION permission to fetch application
         AclPermission permission =
-                isGitSync ? applicationPermission.getEditPermission() : applicationPermission.getExportPermission();
-
-        Mono<User> currentUserMono = sessionUserService.getCurrentUser().cache();
+                applicationPermission.getExportPermission(isGitSync, exportingMetaDTO.getExportWithConfiguration());
 
         Mono<Application> applicationMono =
                 // Find the application with appropriate permission
                 applicationService
                         .findById(applicationId, permission)
                         // Find the application without permissions if it is a template application
-                        .switchIfEmpty(applicationService.findByIdAndExportWithConfiguration(applicationId, TRUE))
+                        .switchIfEmpty(Mono.defer(
+                                () -> applicationService.findByIdAndExportWithConfiguration(applicationId, TRUE)))
                         .switchIfEmpty(Mono.error(new AppsmithException(
                                 AppsmithError.NO_RESOURCE_FOUND, FieldName.APPLICATION_ID, applicationId)))
                         .map(application -> {
@@ -212,97 +196,18 @@ public class ImportExportApplicationServiceCEImpl implements ImportExportApplica
                                 // Explicitly setting the boolean to avoid NPE for future checks
                                 application.setExportWithConfiguration(false);
                             }
-                            exportWithConfiguration.set(application.getExportWithConfiguration());
+                            exportingMetaDTO.setExportWithConfiguration(application.getExportWithConfiguration());
                             return application;
                         })
                         .cache();
 
-        Mono<String> defaultEnvironmentIdMono = applicationService
-                .findById(applicationId)
-                .flatMap(application -> workspaceService.getDefaultEnvironmentId(application.getWorkspaceId(), null));
-
-        /**
-         * Since we are exporting for git, we only consider unpublished JS libraries
-         * Ref: https://theappsmith.slack.com/archives/CGBPVEJ5C/p1672225134025919
-         */
-        Mono<List<CustomJSLib>> allCustomJSLibListMono = customJSLibService
-                .getAllJSLibsInApplicationForExport(applicationId, null, false)
-                .zipWith(applicationMono)
-                .map(tuple2 -> {
-                    Application application = tuple2.getT2();
-                    GitApplicationMetadata gitApplicationMetadata = application.getGitApplicationMetadata();
-                    Instant applicationLastCommittedAt =
-                            gitApplicationMetadata != null ? gitApplicationMetadata.getLastCommittedAt() : null;
-
-                    List<CustomJSLib> unpublishedCustomJSLibList = tuple2.getT1();
-                    List<String> updatedCustomJSLibList;
-                    if (applicationLastCommittedAt != null) {
-                        updatedCustomJSLibList = unpublishedCustomJSLibList.stream()
-                                .filter(lib -> lib.getUpdatedAt() == null
-                                        || applicationLastCommittedAt.isBefore(lib.getUpdatedAt()))
-                                .map(lib -> lib.getUidString())
-                                .collect(Collectors.toList());
-                    } else {
-                        updatedCustomJSLibList = unpublishedCustomJSLibList.stream()
-                                .map(lib -> lib.getUidString())
-                                .collect(Collectors.toList());
-                    }
-                    applicationJson
-                            .getUpdatedResources()
-                            .put(FieldName.CUSTOM_JS_LIB_LIST, new HashSet<>(updatedCustomJSLibList));
-
-                    /**
-                     * Previously it was a Set and as Set is an unordered collection of elements that
-                     * resulted in uncommitted changes. Making it a list and sorting it by the UidString
-                     * ensure that the order will be maintained. And this solves the issue.
-                     */
-                    Collections.sort(unpublishedCustomJSLibList, Comparator.comparing(CustomJSLib::getUidString));
-                    return unpublishedCustomJSLibList;
-                });
-
         // Set json schema version which will be used to check the compatibility while importing the JSON
         applicationJson.setServerSchemaVersion(JsonSchemaVersions.serverVersion);
         applicationJson.setClientSchemaVersion(JsonSchemaVersions.clientVersion);
 
-        Mono<Theme> defaultThemeMono = themeService
-                .getSystemTheme(Theme.DEFAULT_THEME_NAME)
-                .map(theme -> {
-                    log.debug("Default theme found: {}", theme.getName());
-                    return theme;
-                })
-                .cache();
-
-        return pluginRepository
-                .findAll()
-                .map(plugin -> {
-                    pluginMap.put(
-                            plugin.getId(),
-                            plugin.getPluginName() == null ? plugin.getPackageName() : plugin.getPluginName());
-                    return plugin;
-                })
-                .then(applicationMono)
-                .flatMap(application -> themeService
-                        .getThemeById(application.getEditModeThemeId(), READ_THEMES)
-                        .switchIfEmpty(defaultThemeMono) // setting default theme if theme is missing
-                        .zipWith(
-                                themeService
-                                        .getThemeById(application.getPublishedModeThemeId(), READ_THEMES)
-                                        .switchIfEmpty(defaultThemeMono) // setting default theme if theme is missing
-                                )
-                        .map(themesTuple -> {
-                            Theme editModeTheme = themesTuple.getT1();
-                            Theme publishedModeTheme = themesTuple.getT2();
-                            editModeTheme.sanitiseToExportDBObject();
-                            publishedModeTheme.sanitiseToExportDBObject();
-                            applicationJson.setEditModeTheme(editModeTheme);
-                            applicationJson.setPublishedTheme(publishedModeTheme);
-                            return themesTuple;
-                        })
-                        .thenReturn(application))
+        return applicationMono
                 .flatMap(application -> {
-
                     // Refactor application to remove the ids
-                    final String workspaceId = application.getWorkspaceId();
                     GitApplicationMetadata gitApplicationMetadata = application.getGitApplicationMetadata();
                     Instant applicationLastCommittedAt =
                             gitApplicationMetadata != null ? gitApplicationMetadata.getLastCommittedAt() : null;
@@ -310,347 +215,48 @@ public class ImportExportApplicationServiceCEImpl implements ImportExportApplica
                             !JsonSchemaVersions.clientVersion.equals(application.getClientSchemaVersion());
                     boolean isServerSchemaMigrated =
                             !JsonSchemaVersions.serverVersion.equals(application.getServerSchemaVersion());
-                    application.makePristine();
-                    application.sanitiseToExportDBObject();
+                    exportingMetaDTO.setApplicationLastCommittedAt(applicationLastCommittedAt);
+                    exportingMetaDTO.setClientSchemaMigrated(isClientSchemaMigrated);
+                    exportingMetaDTO.setServerSchemaMigrated(isServerSchemaMigrated);
                     applicationJson.setExportedApplication(application);
-                    Set<String> dbNamesUsedInActions = new HashSet<>();
 
-                    Optional<AclPermission> optionalPermission = isGitSync
-                            ? Optional.empty()
-                            : TRUE.equals(exportWithConfiguration.get())
-                                    ? Optional.of(pagePermission.getReadPermission())
-                                    : Optional.of(pagePermission.getEditPermission());
-                    Flux<NewPage> pageFlux = newPageRepository.findByApplicationId(applicationId, optionalPermission);
-
-                    List<String> unPublishedPages = application.getPages().stream()
+                    List<String> unpublishedPages = application.getPages().stream()
                             .map(ApplicationPage::getId)
                             .collect(Collectors.toList());
 
-                    return pageFlux.collectList()
-                            .flatMap(newPageList -> {
-                                // Extract mongoEscapedWidgets from pages and save it to applicationJson object as this
-                                // field is JsonIgnored. Also remove any ids those are present in the page objects
+                    exportingMetaDTO.setUnpublishedPages(unpublishedPages);
 
-                                Set<String> updatedPageSet = new HashSet<String>();
+                    return pluginExportableService
+                            .getExportableEntities(
+                                    exportingMetaDTO, mappedResourcesDTO, applicationMono, applicationJson)
+                            .then(themeExportableService.getExportableEntities(
+                                    exportingMetaDTO, mappedResourcesDTO, applicationMono, applicationJson))
+                            .then(newPageExportableService.getExportableEntities(
+                                    exportingMetaDTO, mappedResourcesDTO, applicationMono, applicationJson))
+                            .then(datasourceExportableService.getExportableEntities(
+                                    exportingMetaDTO, mappedResourcesDTO, applicationMono, applicationJson))
+                            .then(actionCollectionExportableService.getExportableEntities(
+                                    exportingMetaDTO, mappedResourcesDTO, applicationMono, applicationJson))
+                            .then(newActionExportableService.getExportableEntities(
+                                    exportingMetaDTO, mappedResourcesDTO, applicationMono, applicationJson))
+                            .then(customJSLibExportableService.getExportableEntities(
+                                    exportingMetaDTO, mappedResourcesDTO, applicationMono, applicationJson))
+                            .map(newActions -> {
+                                datasourceExportableService.sanitizeEntities(
+                                        exportingMetaDTO, mappedResourcesDTO, applicationJson, serialiseFor);
 
-                                // check the application object for the page reference in the page list
-                                // Exclude the deleted pages that are present in view mode  because the app is not
-                                // published yet
-                                newPageList.removeIf(newPage -> !unPublishedPages.contains(newPage.getId()));
-                                newPageList.forEach(newPage -> {
-                                    if (newPage.getUnpublishedPage() != null) {
-                                        pageIdToNameMap.put(
-                                                newPage.getId() + EDIT,
-                                                newPage.getUnpublishedPage().getName());
-                                        PageDTO unpublishedPageDTO = newPage.getUnpublishedPage();
-                                        if (!CollectionUtils.isEmpty(unpublishedPageDTO.getLayouts())) {
-                                            unpublishedPageDTO.getLayouts().forEach(layout -> {
-                                                layout.setId(unpublishedPageDTO.getName());
-                                            });
-                                        }
-                                    }
+                                newPageExportableService.sanitizeEntities(
+                                        exportingMetaDTO, mappedResourcesDTO, applicationJson, serialiseFor);
 
-                                    if (newPage.getPublishedPage() != null) {
-                                        pageIdToNameMap.put(
-                                                newPage.getId() + VIEW,
-                                                newPage.getPublishedPage().getName());
-                                        PageDTO publishedPageDTO = newPage.getPublishedPage();
-                                        if (!CollectionUtils.isEmpty(publishedPageDTO.getLayouts())) {
-                                            publishedPageDTO.getLayouts().forEach(layout -> {
-                                                layout.setId(publishedPageDTO.getName());
-                                            });
-                                        }
-                                    }
-                                    // Including updated pages list for git file storage
-                                    Instant newPageUpdatedAt = newPage.getUpdatedAt();
-                                    boolean isNewPageUpdated = isClientSchemaMigrated
-                                            || isServerSchemaMigrated
-                                            || applicationLastCommittedAt == null
-                                            || newPageUpdatedAt == null
-                                            || applicationLastCommittedAt.isBefore(newPageUpdatedAt);
-                                    String newPageName = newPage.getUnpublishedPage() != null
-                                            ? newPage.getUnpublishedPage().getName()
-                                            : newPage.getPublishedPage() != null
-                                                    ? newPage.getPublishedPage().getName()
-                                                    : null;
-                                    if (isNewPageUpdated && newPageName != null) {
-                                        updatedPageSet.add(newPageName);
-                                    }
-                                    newPage.sanitiseToExportDBObject();
-                                });
-                                applicationJson.setPageList(newPageList);
-                                applicationJson.setUpdatedResources(new HashMap<>() {
-                                    {
-                                        put(FieldName.PAGE_LIST, updatedPageSet);
-                                    }
-                                });
-
-                                Optional<AclPermission> optionalPermission3 = isGitSync
-                                        ? Optional.empty()
-                                        : TRUE.equals(exportWithConfiguration.get())
-                                                ? Optional.of(datasourcePermission.getReadPermission())
-                                                : Optional.of(datasourcePermission.getEditPermission());
-
-                                Flux<Datasource> datasourceFlux = datasourceService.getAllByWorkspaceIdWithStorages(
-                                        workspaceId, optionalPermission3);
-                                return datasourceFlux.collectList().zipWith(defaultEnvironmentIdMono);
-                            })
-                            .flatMapMany(tuple2 -> {
-                                List<Datasource> datasourceList = tuple2.getT1();
-                                String environmentId = tuple2.getT2();
-                                datasourceList.forEach(datasource -> {
-                                    datasourceIdToNameMap.put(datasource.getId(), datasource.getName());
-                                    datasourceNameToUpdatedAtMap.put(datasource.getName(), datasource.getUpdatedAt());
-                                });
-
-                                List<DatasourceStorage> storageList = datasourceList.stream()
-                                        .map(datasource -> {
-                                            DatasourceStorage storage =
-                                                    datasourceStorageService.getDatasourceStorageFromDatasource(
-                                                            datasource, environmentId);
-
-                                            if (storage == null) {
-                                                // This means we were unable to find a storage for default environment
-                                                // We still need the user to be able to configure this datasource in a
-                                                // new workspace,
-                                                // So we will create a fallback storage using transient fields from the
-                                                // datasource
-                                                storage = new DatasourceStorage();
-                                                storage.prepareTransientFields(datasource);
-                                            }
-                                            return storage;
-                                        })
-                                        .collect(Collectors.toList());
-                                applicationJson.setDatasourceList(storageList);
-
-                                Optional<AclPermission> optionalPermission1 = isGitSync
-                                        ? Optional.empty()
-                                        : TRUE.equals(exportWithConfiguration.get())
-                                                ? Optional.of(actionPermission.getReadPermission())
-                                                : Optional.of(actionPermission.getEditPermission());
-                                Flux<ActionCollection> actionCollectionFlux =
-                                        actionCollectionRepository.findByListOfPageIds(
-                                                unPublishedPages, optionalPermission1);
-                                return actionCollectionFlux;
-                            })
-                            .map(actionCollection -> {
-                                // Remove references to ids since the serialized version does not have this information
-                                actionCollection.setWorkspaceId(null);
-                                actionCollection.setPolicies(null);
-                                actionCollection.setApplicationId(null);
-                                // Set unique ids for actionCollection, also populate collectionIdToName map which will
-                                // be used to replace collectionIds in action
-                                if (actionCollection.getUnpublishedCollection() != null) {
-                                    ActionCollectionDTO actionCollectionDTO =
-                                            actionCollection.getUnpublishedCollection();
-                                    actionCollectionDTO.setPageId(
-                                            pageIdToNameMap.get(actionCollectionDTO.getPageId() + EDIT));
-                                    actionCollectionDTO.setPluginId(pluginMap.get(actionCollectionDTO.getPluginId()));
-
-                                    final String updatedCollectionId =
-                                            actionCollectionDTO.getPageId() + "_" + actionCollectionDTO.getName();
-                                    collectionIdToNameMap.put(actionCollection.getId(), updatedCollectionId);
-                                    actionCollection.setId(updatedCollectionId);
-                                }
-                                if (actionCollection.getPublishedCollection() != null) {
-                                    ActionCollectionDTO actionCollectionDTO = actionCollection.getPublishedCollection();
-                                    actionCollectionDTO.setPageId(
-                                            pageIdToNameMap.get(actionCollectionDTO.getPageId() + VIEW));
-                                    actionCollectionDTO.setPluginId(pluginMap.get(actionCollectionDTO.getPluginId()));
-
-                                    if (!collectionIdToNameMap.containsValue(actionCollection.getId())) {
-                                        final String updatedCollectionId =
-                                                actionCollectionDTO.getPageId() + "_" + actionCollectionDTO.getName();
-                                        collectionIdToNameMap.put(actionCollection.getId(), updatedCollectionId);
-                                        actionCollection.setId(updatedCollectionId);
-                                    }
-                                }
-                                return actionCollection;
-                            })
-                            .collectList()
-                            .flatMapMany(actionCollections -> {
-                                // This object won't have the list of actions but we don't care about that today
-                                // Because the actions will have a reference to the collection
-
-                                Set<String> updatedActionCollectionSet = new HashSet<>();
-                                actionCollections.forEach(actionCollection -> {
-                                    ActionCollectionDTO publishedActionCollectionDTO =
-                                            actionCollection.getPublishedCollection();
-                                    ActionCollectionDTO unpublishedActionCollectionDTO =
-                                            actionCollection.getUnpublishedCollection();
-                                    ActionCollectionDTO actionCollectionDTO = unpublishedActionCollectionDTO != null
-                                            ? unpublishedActionCollectionDTO
-                                            : publishedActionCollectionDTO;
-
-                                    // TODO: check whether resource updated after last commit - move to a function
-                                    // we've replaced page id with page name in previous step
-                                    String pageName = actionCollectionDTO.getPageId();
-                                    boolean isPageUpdated =
-                                            ImportExportUtils.isPageNameInUpdatedList(applicationJson, pageName);
-                                    String actionCollectionName = actionCollectionDTO != null
-                                            ? actionCollectionDTO.getName()
-                                                    + NAME_SEPARATOR
-                                                    + actionCollectionDTO.getPageId()
-                                            : null;
-                                    Instant actionCollectionUpdatedAt = actionCollection.getUpdatedAt();
-                                    boolean isActionCollectionUpdated = isClientSchemaMigrated
-                                            || isServerSchemaMigrated
-                                            || isPageUpdated
-                                            || applicationLastCommittedAt == null
-                                            || actionCollectionUpdatedAt == null
-                                            || applicationLastCommittedAt.isBefore(actionCollectionUpdatedAt);
-                                    if (isActionCollectionUpdated && actionCollectionName != null) {
-                                        updatedActionCollectionSet.add(actionCollectionName);
-                                    }
-                                    actionCollection.sanitiseToExportDBObject();
-                                });
-
-                                applicationJson.setActionCollectionList(actionCollections);
-                                applicationJson
-                                        .getUpdatedResources()
-                                        .put(FieldName.ACTION_COLLECTION_LIST, updatedActionCollectionSet);
-
-                                Optional<AclPermission> optionalPermission2 = isGitSync
-                                        ? Optional.empty()
-                                        : TRUE.equals(exportWithConfiguration.get())
-                                                ? Optional.of(actionPermission.getReadPermission())
-                                                : Optional.of(actionPermission.getEditPermission());
-
-                                Flux<NewAction> actionFlux =
-                                        newActionRepository.findByListOfPageIds(unPublishedPages, optionalPermission2);
-                                return actionFlux;
-                            })
-                            .map(newAction -> {
-                                newAction.setPluginId(pluginMap.get(newAction.getPluginId()));
-                                newAction.setWorkspaceId(null);
-                                newAction.setPolicies(null);
-                                newAction.setApplicationId(null);
-                                dbNamesUsedInActions.add(sanitizeDatasourceInActionDTO(
-                                        newAction.getPublishedAction(), datasourceIdToNameMap, pluginMap, null, true));
-                                dbNamesUsedInActions.add(sanitizeDatasourceInActionDTO(
-                                        newAction.getUnpublishedAction(),
-                                        datasourceIdToNameMap,
-                                        pluginMap,
-                                        null,
-                                        true));
-
-                                // Set unique id for action
-                                if (newAction.getUnpublishedAction() != null) {
-                                    ActionDTO actionDTO = newAction.getUnpublishedAction();
-                                    actionDTO.setPageId(pageIdToNameMap.get(actionDTO.getPageId() + EDIT));
-
-                                    if (!StringUtils.isEmpty(actionDTO.getCollectionId())
-                                            && collectionIdToNameMap.containsKey(actionDTO.getCollectionId())) {
-                                        actionDTO.setCollectionId(
-                                                collectionIdToNameMap.get(actionDTO.getCollectionId()));
-                                    }
-
-                                    final String updatedActionId =
-                                            actionDTO.getPageId() + "_" + actionDTO.getValidName();
-                                    actionIdToNameMap.put(newAction.getId(), updatedActionId);
-                                    newAction.setId(updatedActionId);
-                                }
-                                if (newAction.getPublishedAction() != null) {
-                                    ActionDTO actionDTO = newAction.getPublishedAction();
-                                    actionDTO.setPageId(pageIdToNameMap.get(actionDTO.getPageId() + VIEW));
-
-                                    if (!StringUtils.isEmpty(actionDTO.getCollectionId())
-                                            && collectionIdToNameMap.containsKey(actionDTO.getCollectionId())) {
-                                        actionDTO.setCollectionId(
-                                                collectionIdToNameMap.get(actionDTO.getCollectionId()));
-                                    }
-
-                                    if (!actionIdToNameMap.containsValue(newAction.getId())) {
-                                        final String updatedActionId =
-                                                actionDTO.getPageId() + "_" + actionDTO.getValidName();
-                                        actionIdToNameMap.put(newAction.getId(), updatedActionId);
-                                        newAction.setId(updatedActionId);
-                                    }
-                                }
-                                return newAction;
-                            })
-                            .collectList()
-                            .map(actionList -> {
-                                Set<String> updatedActionSet = new HashSet<>();
-                                actionList.forEach(newAction -> {
-                                    ActionDTO unpublishedActionDTO = newAction.getUnpublishedAction();
-                                    ActionDTO publishedActionDTO = newAction.getPublishedAction();
-                                    ActionDTO actionDTO =
-                                            unpublishedActionDTO != null ? unpublishedActionDTO : publishedActionDTO;
-                                    String newActionName = actionDTO != null
-                                            ? actionDTO.getValidName() + NAME_SEPARATOR + actionDTO.getPageId()
-                                            : null;
-                                    // TODO: check whether resource updated after last commit - move to a function
-                                    String pageName = actionDTO.getPageId();
-                                    // we've replaced the datasource id with datasource name in previous step
-                                    boolean isDatasourceUpdated = ImportExportUtils.isDatasourceUpdatedSinceLastCommit(
-                                            datasourceNameToUpdatedAtMap, actionDTO, applicationLastCommittedAt);
-
-                                    boolean isPageUpdated =
-                                            ImportExportUtils.isPageNameInUpdatedList(applicationJson, pageName);
-                                    Instant newActionUpdatedAt = newAction.getUpdatedAt();
-                                    boolean isNewActionUpdated = isClientSchemaMigrated
-                                            || isServerSchemaMigrated
-                                            || applicationLastCommittedAt == null
-                                            || isPageUpdated
-                                            || isDatasourceUpdated
-                                            || newActionUpdatedAt == null
-                                            || applicationLastCommittedAt.isBefore(newActionUpdatedAt);
-                                    if (isNewActionUpdated && newActionName != null) {
-                                        updatedActionSet.add(newActionName);
-                                    }
-                                    newAction.sanitiseToExportDBObject();
-                                });
-                                applicationJson.getUpdatedResources().put(FieldName.ACTION_LIST, updatedActionSet);
-                                applicationJson.setActionList(actionList);
-                                // This is where we're removing global datasources that are unused in this application
-                                applicationJson
-                                        .getDatasourceList()
-                                        .removeIf(datasource -> !dbNamesUsedInActions.contains(datasource.getName()));
-
-                                // Save decrypted fields for datasources for internally used sample apps and templates
-                                // only
-                                // when serialising for file sharing
-                                if (TRUE.equals(exportWithConfiguration.get())
-                                        && SerialiseApplicationObjective.SHARE.equals(serialiseFor)) {
-                                    // Save decrypted fields for datasources
-                                    Map<String, DecryptedSensitiveFields> decryptedFields = new HashMap<>();
-                                    applicationJson.getDatasourceList().forEach(datasourceStorage -> {
-                                        decryptedFields.put(
-                                                datasourceStorage.getName(), getDecryptedFields(datasourceStorage));
-                                        datasourceStorage.sanitiseToExportResource(pluginMap);
-                                    });
-                                    applicationJson.setDecryptedFields(decryptedFields);
-                                } else {
-                                    applicationJson.getDatasourceList().forEach(datasourceStorage -> {
-                                        // Remove the datasourceConfiguration object as user will configure it once
-                                        // imported to other instance
-                                        datasourceStorage.setDatasourceConfiguration(null);
-                                        datasourceStorage.sanitiseToExportResource(pluginMap);
-                                    });
-                                }
-
-                                // Update ids for layoutOnLoadAction
-                                for (NewPage newPage : applicationJson.getPageList()) {
-                                    updateIdsForLayoutOnLoadAction(
-                                            newPage.getUnpublishedPage(), actionIdToNameMap, collectionIdToNameMap);
-                                    updateIdsForLayoutOnLoadAction(
-                                            newPage.getPublishedPage(), actionIdToNameMap, collectionIdToNameMap);
-                                }
-
-                                application.exportApplicationPages(pageIdToNameMap);
+                                application.makePristine();
+                                application.sanitiseToExportDBObject();
                                 // Disable exporting the application with datasource config once imported in destination
                                 // instance
                                 application.setExportWithConfiguration(null);
                                 return applicationJson;
                             });
                 })
-                .then(allCustomJSLibListMono)
-                .map(allCustomLibList -> {
-                    applicationJson.setCustomJSLibList(allCustomLibList);
-                    return applicationJson;
-                })
-                .then(currentUserMono)
+                .then(sessionUserService.getCurrentUser())
                 .map(user -> {
                     stopwatch.stopTimer();
                     final Map<String, Object> data = Map.of(
@@ -670,6 +276,7 @@ public class ImportExportApplicationServiceCEImpl implements ImportExportApplica
                             AnalyticsEvents.UNIT_EXECUTION_TIME.getEventName(), user.getUsername(), data);
                     return applicationJson;
                 })
+                // TODO : Why are we sending two sets of events here? -- Ask Git team
                 .then(sendImportExportApplicationAnalyticsEvent(applicationId, AnalyticsEvents.EXPORT))
                 .thenReturn(applicationJson);
     }
@@ -680,26 +287,6 @@ public class ImportExportApplicationServiceCEImpl implements ImportExportApplica
                 .flatMap(branchedAppId -> exportApplicationById(branchedAppId, SerialiseApplicationObjective.SHARE));
     }
 
-    private void updateIdsForLayoutOnLoadAction(
-            PageDTO page, Map<String, String> actionIdToNameMap, Map<String, String> collectionIdToNameMap) {
-
-        if (page != null && !CollectionUtils.isEmpty(page.getLayouts())) {
-            for (Layout layout : page.getLayouts()) {
-                if (!CollectionUtils.isEmpty(layout.getLayoutOnLoadActions())) {
-                    layout.getLayoutOnLoadActions()
-                            .forEach(onLoadAction -> onLoadAction.forEach(actionDTO -> {
-                                if (actionIdToNameMap.containsKey(actionDTO.getId())) {
-                                    actionDTO.setId(actionIdToNameMap.get(actionDTO.getId()));
-                                }
-                                if (collectionIdToNameMap.containsKey(actionDTO.getCollectionId())) {
-                                    actionDTO.setCollectionId(collectionIdToNameMap.get(actionDTO.getCollectionId()));
-                                }
-                            }));
-                }
-            }
-        }
-    }
-
     public Mono<ExportFileDTO> getApplicationFile(String applicationId, String branchName) {
         return this.exportApplicationById(applicationId, branchName).map(applicationJson -> {
             String stringifiedFile = gson.toJson(applicationJson);
@@ -2303,8 +1890,8 @@ public class ImportExportApplicationServiceCEImpl implements ImportExportApplica
      * This will check if the datasource is already present in the workspace and create a new one if unable to find one
      *
      * @param existingDatasources already present datasource in the workspace
-     * @param datasourceStorage      which will be checked against existing datasources
-     * @param workspace              workspace where duplicate datasource should be checked
+     * @param datasourceStorage   which will be checked against existing datasources
+     * @param workspace           workspace where duplicate datasource should be checked
      * @return already present or brand new datasource depending upon the equality check
      */
     private Mono<Datasource> createUniqueDatasourceIfNotPresent(
@@ -2420,43 +2007,6 @@ public class ImportExportApplicationServiceCEImpl implements ImportExportApplica
         return themeService.importThemesToApplication(application, importedApplicationJson);
     }
 
-    /**
-     * This will be used to dehydrate sensitive fields from the datasourceStorage while exporting the application
-     *
-     * @param datasourceStorage entity from which sensitive fields need to be dehydrated
-     * @return sensitive fields which then will be deserialized and exported in JSON file
-     */
-    private DecryptedSensitiveFields getDecryptedFields(DatasourceStorage datasourceStorage) {
-        final AuthenticationDTO authentication = datasourceStorage.getDatasourceConfiguration() == null
-                ? null
-                : datasourceStorage.getDatasourceConfiguration().getAuthentication();
-
-        if (authentication != null) {
-            DecryptedSensitiveFields dsDecryptedFields = authentication.getAuthenticationResponse() == null
-                    ? new DecryptedSensitiveFields()
-                    : new DecryptedSensitiveFields(authentication.getAuthenticationResponse());
-
-            if (authentication instanceof DBAuth) {
-                DBAuth auth = (DBAuth) authentication;
-                dsDecryptedFields.setPassword(auth.getPassword());
-                dsDecryptedFields.setDbAuth(auth);
-            } else if (authentication instanceof OAuth2) {
-                OAuth2 auth = (OAuth2) authentication;
-                dsDecryptedFields.setPassword(auth.getClientSecret());
-                dsDecryptedFields.setOpenAuth2(auth);
-            } else if (authentication instanceof BasicAuth) {
-                BasicAuth auth = (BasicAuth) authentication;
-                dsDecryptedFields.setPassword(auth.getPassword());
-                dsDecryptedFields.setBasicAuth(auth);
-            } else if (authentication instanceof BearerTokenAuth auth) {
-                dsDecryptedFields.setBearerTokenAuth(auth);
-            }
-            dsDecryptedFields.setAuthType(authentication.getClass().getName());
-            return dsDecryptedFields;
-        }
-        return null;
-    }
-
     public Mono<List<Datasource>> findDatasourceByApplicationId(String applicationId, String workspaceId) {
         // TODO: Investigate further why datasourcePermission.getReadPermission() is not being used.
         Mono<List<Datasource>> listMono = datasourceService
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ImportExportApplicationServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/export/internal/ImportExportApplicationServiceImpl.java
similarity index 60%
rename from app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ImportExportApplicationServiceImpl.java
rename to app/server/appsmith-server/src/main/java/com/appsmith/server/export/internal/ImportExportApplicationServiceImpl.java
index 2d38e2d32b..1667f859b5 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ImportExportApplicationServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/export/internal/ImportExportApplicationServiceImpl.java
@@ -1,25 +1,33 @@
-package com.appsmith.server.solutions;
+package com.appsmith.server.export.internal;
 
+import com.appsmith.external.models.Datasource;
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.datasources.base.DatasourceService;
-import com.appsmith.server.datasourcestorages.base.DatasourceStorageService;
+import com.appsmith.server.domains.ActionCollection;
+import com.appsmith.server.domains.CustomJSLib;
+import com.appsmith.server.domains.NewAction;
+import com.appsmith.server.domains.NewPage;
+import com.appsmith.server.domains.Plugin;
+import com.appsmith.server.domains.Theme;
+import com.appsmith.server.export.exportable.ExportableService;
+import com.appsmith.server.export.exportable.ExportableServiceCE;
+import com.appsmith.server.jslibs.base.CustomJSLibService;
 import com.appsmith.server.newactions.base.NewActionService;
-import com.appsmith.server.repositories.ActionCollectionRepository;
-import com.appsmith.server.repositories.DatasourceRepository;
-import com.appsmith.server.repositories.NewActionRepository;
-import com.appsmith.server.repositories.NewPageRepository;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.repositories.PermissionGroupRepository;
 import com.appsmith.server.repositories.PluginRepository;
-import com.appsmith.server.services.ActionCollectionService;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.ApplicationService;
-import com.appsmith.server.services.CustomJSLibService;
-import com.appsmith.server.services.NewPageService;
 import com.appsmith.server.services.SequenceService;
 import com.appsmith.server.services.SessionUserService;
-import com.appsmith.server.services.ThemeService;
 import com.appsmith.server.services.WorkspaceService;
-import com.appsmith.server.solutions.ce.ImportExportApplicationServiceCEImpl;
+import com.appsmith.server.solutions.ActionPermission;
+import com.appsmith.server.solutions.ApplicationPermission;
+import com.appsmith.server.solutions.DatasourcePermission;
+import com.appsmith.server.solutions.PagePermission;
+import com.appsmith.server.solutions.WorkspacePermission;
+import com.appsmith.server.themes.base.ThemeService;
 import com.google.gson.Gson;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Primary;
@@ -34,21 +42,24 @@ public class ImportExportApplicationServiceImpl extends ImportExportApplicationS
 
     public ImportExportApplicationServiceImpl(
             DatasourceService datasourceService,
+            ExportableService<Datasource> datasourceExportableService,
             SessionUserService sessionUserService,
-            NewActionRepository newActionRepository,
-            DatasourceRepository datasourceRepository,
             PluginRepository pluginRepository,
+            ExportableService<Plugin> pluginExportableService,
             WorkspaceService workspaceService,
             ApplicationService applicationService,
             NewPageService newPageService,
             ApplicationPageService applicationPageService,
-            NewPageRepository newPageRepository,
+            ExportableService<NewPage> newPageExportableService,
             NewActionService newActionService,
             SequenceService sequenceService,
-            ActionCollectionRepository actionCollectionRepository,
+            ExportableService<NewAction> newActionExportableService,
+            ExportableService<ActionCollection> actionCollectionExportableService,
             ActionCollectionService actionCollectionService,
+            ExportableServiceCE<Theme> themeExportableService,
             ThemeService themeService,
             AnalyticsService analyticsService,
+            ExportableService<CustomJSLib> customJSLibExportableService,
             CustomJSLibService customJSLibService,
             DatasourcePermission datasourcePermission,
             WorkspacePermission workspacePermission,
@@ -57,26 +68,27 @@ public class ImportExportApplicationServiceImpl extends ImportExportApplicationS
             ActionPermission actionPermission,
             Gson gson,
             TransactionalOperator transactionalOperator,
-            DatasourceStorageService datasourceStorageService,
             PermissionGroupRepository permissionGroupRepository) {
-
         super(
                 datasourceService,
+                datasourceExportableService,
                 sessionUserService,
-                newActionRepository,
-                datasourceRepository,
                 pluginRepository,
+                pluginExportableService,
                 workspaceService,
                 applicationService,
                 newPageService,
                 applicationPageService,
-                newPageRepository,
+                newPageExportableService,
                 newActionService,
                 sequenceService,
-                actionCollectionRepository,
+                newActionExportableService,
+                actionCollectionExportableService,
                 actionCollectionService,
+                themeExportableService,
                 themeService,
                 analyticsService,
+                customJSLibExportableService,
                 customJSLibService,
                 datasourcePermission,
                 workspacePermission,
@@ -85,7 +97,6 @@ public class ImportExportApplicationServiceImpl extends ImportExportApplicationS
                 actionPermission,
                 gson,
                 transactionalOperator,
-                datasourceStorageService,
                 permissionGroupRepository);
     }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/filters/PreAuth.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/filters/PreAuth.java
index 20f998d1e5..ccaceda3d8 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/filters/PreAuth.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/filters/PreAuth.java
@@ -15,6 +15,8 @@ import java.net.URI;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 
+import static java.lang.Boolean.FALSE;
+
 @Slf4j
 public class PreAuth implements WebFilter {
 
@@ -27,21 +29,23 @@ public class PreAuth implements WebFilter {
 
     @Override
     public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
+
+        Mono<Void> filterMono = chain.filter(exchange);
+
         return getUsername(exchange).flatMap(username -> {
             if (!username.isEmpty()) {
                 return rateLimitService
                         .tryIncreaseCounter(RateLimitConstants.BUCKET_KEY_FOR_LOGIN_API, username)
                         .flatMap(counterIncreaseAttemptSuccessful -> {
-                            if (Boolean.FALSE.equals(counterIncreaseAttemptSuccessful)) {
-                                log.error("Rate limit exceeded. Redirecting to login page.");
+                            if (FALSE.equals(counterIncreaseAttemptSuccessful)) {
                                 return handleRateLimitExceeded(exchange);
                             }
 
-                            return chain.filter(exchange);
+                            return filterMono;
                         });
             } else {
                 // If username is empty, simply continue with the filter chain
-                return chain.filter(exchange);
+                return filterMono;
             }
         });
     }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/fork/internal/ApplicationForkingServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/fork/internal/ApplicationForkingServiceCEImpl.java
index d820f77eb3..142c2dfa3d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/fork/internal/ApplicationForkingServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/fork/internal/ApplicationForkingServiceCEImpl.java
@@ -8,6 +8,7 @@ import com.appsmith.external.models.ActionDTO;
 import com.appsmith.external.models.BaseDomain;
 import com.appsmith.external.models.Datasource;
 import com.appsmith.external.models.DefaultResources;
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.domains.ActionCollection;
 import com.appsmith.server.domains.Application;
@@ -24,6 +25,7 @@ import com.appsmith.server.dtos.ForkingMetaDTO;
 import com.appsmith.server.dtos.PageDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.export.internal.ImportExportApplicationService;
 import com.appsmith.server.fork.forkable.ForkableService;
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.helpers.UserPermissionUtils;
@@ -32,20 +34,18 @@ import com.appsmith.server.repositories.ActionCollectionRepository;
 import com.appsmith.server.repositories.NewActionRepository;
 import com.appsmith.server.repositories.NewPageRepository;
 import com.appsmith.server.repositories.WorkspaceRepository;
-import com.appsmith.server.services.ActionCollectionService;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.LayoutActionService;
 import com.appsmith.server.services.PermissionGroupService;
 import com.appsmith.server.services.SessionUserService;
-import com.appsmith.server.services.ThemeService;
 import com.appsmith.server.services.WorkspaceService;
 import com.appsmith.server.solutions.ActionPermission;
 import com.appsmith.server.solutions.ApplicationPermission;
-import com.appsmith.server.solutions.ImportExportApplicationService;
 import com.appsmith.server.solutions.PagePermission;
 import com.appsmith.server.solutions.WorkspacePermission;
+import com.appsmith.server.themes.base.ThemeService;
 import com.mongodb.client.result.UpdateResult;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/fork/internal/ApplicationForkingServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/fork/internal/ApplicationForkingServiceImpl.java
index 10176c7954..1f762aa187 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/fork/internal/ApplicationForkingServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/fork/internal/ApplicationForkingServiceImpl.java
@@ -1,6 +1,8 @@
 package com.appsmith.server.fork.internal;
 
 import com.appsmith.external.models.Datasource;
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
+import com.appsmith.server.export.internal.ImportExportApplicationService;
 import com.appsmith.server.fork.forkable.ForkableService;
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.newactions.base.NewActionService;
@@ -8,20 +10,18 @@ import com.appsmith.server.repositories.ActionCollectionRepository;
 import com.appsmith.server.repositories.NewActionRepository;
 import com.appsmith.server.repositories.NewPageRepository;
 import com.appsmith.server.repositories.WorkspaceRepository;
-import com.appsmith.server.services.ActionCollectionService;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.LayoutActionService;
 import com.appsmith.server.services.PermissionGroupService;
 import com.appsmith.server.services.SessionUserService;
-import com.appsmith.server.services.ThemeService;
 import com.appsmith.server.services.WorkspaceService;
 import com.appsmith.server.solutions.ActionPermission;
 import com.appsmith.server.solutions.ApplicationPermission;
-import com.appsmith.server.solutions.ImportExportApplicationService;
 import com.appsmith.server.solutions.PagePermission;
 import com.appsmith.server.solutions.WorkspacePermission;
+import com.appsmith.server.themes.base.ThemeService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/EmailServiceHelper.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/EmailServiceHelper.java
new file mode 100644
index 0000000000..bcaf02df37
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/EmailServiceHelper.java
@@ -0,0 +1,5 @@
+package com.appsmith.server.helpers;
+
+import com.appsmith.server.helpers.ce.EmailServiceHelperCE;
+
+public interface EmailServiceHelper extends EmailServiceHelperCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/EmailServiceHelperImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/EmailServiceHelperImpl.java
new file mode 100644
index 0000000000..afa9819ce7
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/EmailServiceHelperImpl.java
@@ -0,0 +1,12 @@
+package com.appsmith.server.helpers;
+
+import com.appsmith.server.helpers.ce.EmailServiceHelperCEImpl;
+import com.appsmith.server.services.TenantService;
+import org.springframework.stereotype.Component;
+
+@Component
+public class EmailServiceHelperImpl extends EmailServiceHelperCEImpl implements EmailServiceHelper {
+    public EmailServiceHelperImpl(TenantService tenantService) {
+        super(tenantService);
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/InMemoryCacheableRepositoryHelper.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/InMemoryCacheableRepositoryHelper.java
new file mode 100644
index 0000000000..cbf2e123c3
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/InMemoryCacheableRepositoryHelper.java
@@ -0,0 +1,38 @@
+package com.appsmith.server.helpers;
+
+import org.springframework.stereotype.Component;
+
+import java.util.Set;
+
+@Component
+public class InMemoryCacheableRepositoryHelper {
+    private Set<String> anonymousUserPermissionGroupIds = null;
+
+    private String defaultTenantId = null;
+
+    private String instanceAdminPermissionGroupId = null;
+
+    public Set<String> getAnonymousUserPermissionGroupIds() {
+        return anonymousUserPermissionGroupIds;
+    }
+
+    public void setAnonymousUserPermissionGroupIds(Set<String> anonymousUserPermissionGroupIds) {
+        this.anonymousUserPermissionGroupIds = anonymousUserPermissionGroupIds;
+    }
+
+    public String getDefaultTenantId() {
+        return defaultTenantId;
+    }
+
+    public void setDefaultTenantId(String defaultTenantId) {
+        this.defaultTenantId = defaultTenantId;
+    }
+
+    public void setInstanceAdminPermissionGroupId(String instanceAdminPermissionGroupId) {
+        this.instanceAdminPermissionGroupId = instanceAdminPermissionGroupId;
+    }
+
+    public String getInstanceAdminPermissionGroupId() {
+        return instanceAdminPermissionGroupId;
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/PluginScheduledTaskUtilsImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/PluginScheduledTaskUtilsImpl.java
index 10d183613e..b65e6d97c8 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/PluginScheduledTaskUtilsImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/PluginScheduledTaskUtilsImpl.java
@@ -2,8 +2,8 @@ package com.appsmith.server.helpers;
 
 import com.appsmith.server.configurations.CloudServicesConfig;
 import com.appsmith.server.helpers.ce.PluginScheduledTaskUtilsCEImpl;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.services.ConfigService;
-import com.appsmith.server.services.PluginService;
 import org.springframework.stereotype.Component;
 
 @Component
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/UserServiceHelper.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/UserServiceHelper.java
new file mode 100644
index 0000000000..6e66e33eea
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/UserServiceHelper.java
@@ -0,0 +1,5 @@
+package com.appsmith.server.helpers;
+
+import com.appsmith.server.helpers.ce.UserServiceHelperCE;
+
+public interface UserServiceHelper extends UserServiceHelperCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/UserServiceHelperImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/UserServiceHelperImpl.java
new file mode 100644
index 0000000000..8b96e78ec9
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/UserServiceHelperImpl.java
@@ -0,0 +1,13 @@
+package com.appsmith.server.helpers;
+
+import com.appsmith.server.helpers.ce.UserServiceHelperCEImpl;
+import com.appsmith.server.services.PermissionGroupService;
+import com.appsmith.server.solutions.PolicySolution;
+import org.springframework.stereotype.Component;
+
+@Component
+public class UserServiceHelperImpl extends UserServiceHelperCEImpl implements UserServiceHelper {
+    public UserServiceHelperImpl(PolicySolution policySolution, PermissionGroupService permissionGroupService) {
+        super(policySolution, permissionGroupService);
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/WorkspaceServiceHelper.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/WorkspaceServiceHelper.java
new file mode 100644
index 0000000000..59e53ffa5b
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/WorkspaceServiceHelper.java
@@ -0,0 +1,5 @@
+package com.appsmith.server.helpers;
+
+import com.appsmith.server.helpers.ce.WorkspaceServiceHelperCE;
+
+public interface WorkspaceServiceHelper extends WorkspaceServiceHelperCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/WorkspaceServiceHelperImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/WorkspaceServiceHelperImpl.java
new file mode 100644
index 0000000000..d82dd81a00
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/WorkspaceServiceHelperImpl.java
@@ -0,0 +1,7 @@
+package com.appsmith.server.helpers;
+
+import com.appsmith.server.helpers.ce.WorkspaceServiceHelperCEImpl;
+import org.springframework.stereotype.Component;
+
+@Component
+public class WorkspaceServiceHelperImpl extends WorkspaceServiceHelperCEImpl implements WorkspaceServiceHelper {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/EmailServiceHelperCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/EmailServiceHelperCE.java
new file mode 100644
index 0000000000..0c4ff608fd
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/EmailServiceHelperCE.java
@@ -0,0 +1,17 @@
+package com.appsmith.server.helpers.ce;
+
+import reactor.core.publisher.Mono;
+
+import java.util.Map;
+
+public interface EmailServiceHelperCE {
+    Mono<Map<String, String>> enrichWithBrandParams(Map<String, String> params, String origin);
+
+    String getForgotPasswordTemplate();
+
+    String getWorkspaceInviteTemplate(boolean isNewUser);
+
+    String getEmailVerificationTemplate();
+
+    String getAdminInstanceInviteTemplate();
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/EmailServiceHelperCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/EmailServiceHelperCEImpl.java
new file mode 100644
index 0000000000..3360126080
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/EmailServiceHelperCEImpl.java
@@ -0,0 +1,55 @@
+package com.appsmith.server.helpers.ce;
+
+import com.appsmith.server.domains.TenantConfiguration;
+import com.appsmith.server.services.TenantService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Mono;
+
+import java.util.Map;
+
+import static com.appsmith.server.constants.ce.EmailConstantsCE.EMAIL_VERIFICATION_EMAIL_TEMPLATE_CE;
+import static com.appsmith.server.constants.ce.EmailConstantsCE.FORGOT_PASSWORD_TEMPLATE_CE;
+import static com.appsmith.server.constants.ce.EmailConstantsCE.INSTANCE_ADMIN_INVITE_EMAIL_TEMPLATE;
+import static com.appsmith.server.constants.ce.EmailConstantsCE.INSTANCE_NAME;
+import static com.appsmith.server.constants.ce.EmailConstantsCE.INVITE_WORKSPACE_TEMPLATE_EXISTING_USER_CE;
+import static com.appsmith.server.constants.ce.EmailConstantsCE.INVITE_WORKSPACE_TEMPLATE_NEW_USER_CE;
+
+@Component
+@AllArgsConstructor
+public class EmailServiceHelperCEImpl implements EmailServiceHelperCE {
+
+    private final TenantService tenantService;
+
+    @Override
+    public Mono<Map<String, String>> enrichWithBrandParams(Map<String, String> params, String origin) {
+        return tenantService.getTenantConfiguration().map(tenant -> {
+            final TenantConfiguration tenantConfiguration = tenant.getTenantConfiguration();
+            params.put(INSTANCE_NAME, StringUtils.defaultIfEmpty(tenantConfiguration.getInstanceName(), "Appsmith"));
+            return params;
+        });
+    }
+
+    @Override
+    public String getForgotPasswordTemplate() {
+        return FORGOT_PASSWORD_TEMPLATE_CE;
+    }
+
+    @Override
+    public String getWorkspaceInviteTemplate(boolean isNewUser) {
+        if (isNewUser) return INVITE_WORKSPACE_TEMPLATE_NEW_USER_CE;
+
+        return INVITE_WORKSPACE_TEMPLATE_EXISTING_USER_CE;
+    }
+
+    @Override
+    public String getEmailVerificationTemplate() {
+        return EMAIL_VERIFICATION_EMAIL_TEMPLATE_CE;
+    }
+
+    @Override
+    public String getAdminInstanceInviteTemplate() {
+        return INSTANCE_ADMIN_INVITE_EMAIL_TEMPLATE;
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/FeatureFlagMigrationHelperCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/FeatureFlagMigrationHelperCEImpl.java
index 3980530087..658c9390cc 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/FeatureFlagMigrationHelperCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/FeatureFlagMigrationHelperCEImpl.java
@@ -14,7 +14,9 @@ import reactor.core.publisher.Mono;
 
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import static com.appsmith.server.constants.FeatureMigrationType.DISABLE;
@@ -136,6 +138,9 @@ public class FeatureFlagMigrationHelperCEImpl implements FeatureFlagMigrationHel
                 } catch (Exception e) {
                     // Ignore IllegalArgumentException as all the feature flags are not added on
                     // server side
+                    if (!(e instanceof IllegalArgumentException)) {
+                        log.error("Error while parsing the feature flag {} with value {}", key, value, e);
+                    }
                 }
             }
         });
@@ -157,13 +162,13 @@ public class FeatureFlagMigrationHelperCEImpl implements FeatureFlagMigrationHel
         // featuresWithPendingMigrationDB       => {feature1 : enable, feature2 : disable}
         // latestFeatureDiffsWithMigrationType  => {feature1 : enable, feature2 : enable, feature3 : disable}
         // updatedFlagsForMigrations            => {feature1 : enable, feature3 : disable}
-
+        List<FeatureFlagEnum> featureFlagsToBeRemoved = new ArrayList<>();
         updatedFlagsForMigrations.forEach((featureFlagEnum, featureMigrationType) -> {
             if (latestFeatureDiffsWithMigrationType.containsKey(featureFlagEnum)
                     && !featureMigrationType.equals(latestFeatureDiffsWithMigrationType.get(featureFlagEnum))) {
                 /*
                 Scenario when the migrations will be blocked on user input and may end up in a case where we just have
-                to remove the entry as migration it's no longer needed:
+                to remove the entry as migration is no longer needed:
                     Step 1: Feature gets enabled by adding a valid licence and enable migration gets registered
                     Step 2: License expires which results in feature getting disabled so migration entry gets registered
                             with disable type (This will happen via cron to check the license status)
@@ -172,10 +177,16 @@ public class FeatureFlagMigrationHelperCEImpl implements FeatureFlagMigrationHel
                     Step 4: User adds the valid key or renews the subscription again which results in enabling the
                             feature and ends up in nullifying the effect for step 2
                  */
-                updatedFlagsForMigrations.remove(featureFlagEnum);
-                latestFeatureDiffsWithMigrationType.remove(featureFlagEnum);
+                featureFlagsToBeRemoved.add(featureFlagEnum);
             }
         });
+
+        // Added a separate loop to remove the flags as we cannot remove the entry while iterating over the map to
+        // avoid the ConcurrentModificationException
+        featureFlagsToBeRemoved.forEach(featureFlagEnum -> {
+            updatedFlagsForMigrations.remove(featureFlagEnum);
+            latestFeatureDiffsWithMigrationType.remove(featureFlagEnum);
+        });
         // Add the latest flags which were not part of earlier check.
         updatedFlagsForMigrations.putAll(latestFeatureDiffsWithMigrationType);
         return updatedFlagsForMigrations;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/PluginScheduledTaskUtilsCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/PluginScheduledTaskUtilsCEImpl.java
index 6c379e42e4..3be44287bd 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/PluginScheduledTaskUtilsCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/PluginScheduledTaskUtilsCEImpl.java
@@ -4,8 +4,8 @@ import com.appsmith.server.configurations.CloudServicesConfig;
 import com.appsmith.server.domains.Plugin;
 import com.appsmith.server.domains.Workspace;
 import com.appsmith.server.dtos.ResponseDTO;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.services.ConfigService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.solutions.ce.PluginScheduledTaskCEImpl;
 import com.appsmith.util.WebClientUtils;
 import lombok.RequiredArgsConstructor;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/UserServiceHelperCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/UserServiceHelperCE.java
new file mode 100644
index 0000000000..f8fd147529
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/UserServiceHelperCE.java
@@ -0,0 +1,8 @@
+package com.appsmith.server.helpers.ce;
+
+import com.appsmith.server.domains.User;
+import reactor.core.publisher.Mono;
+
+public interface UserServiceHelperCE {
+    Mono<User> addPoliciesToUser(User user);
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/UserServiceHelperCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/UserServiceHelperCEImpl.java
new file mode 100644
index 0000000000..25d8cbb52d
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/UserServiceHelperCEImpl.java
@@ -0,0 +1,48 @@
+package com.appsmith.server.helpers.ce;
+
+import com.appsmith.external.models.Policy;
+import com.appsmith.server.constants.FieldName;
+import com.appsmith.server.domains.PermissionGroup;
+import com.appsmith.server.domains.User;
+import com.appsmith.server.dtos.Permission;
+import com.appsmith.server.services.PermissionGroupService;
+import com.appsmith.server.solutions.PolicySolution;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Mono;
+
+import java.util.Map;
+import java.util.Set;
+
+import static com.appsmith.server.acl.AclPermission.MANAGE_USERS;
+
+@Component
+@AllArgsConstructor
+public class UserServiceHelperCEImpl implements UserServiceHelperCE {
+
+    private final PolicySolution policySolution;
+    private final PermissionGroupService permissionGroupService;
+
+    @Override
+    public Mono<User> addPoliciesToUser(User user) {
+        // Create user management permission group
+        PermissionGroup userManagementPermissionGroup = new PermissionGroup();
+        userManagementPermissionGroup.setName(user.getUsername() + FieldName.SUFFIX_USER_MANAGEMENT_ROLE);
+        // Add CRUD permissions for user to the group
+        userManagementPermissionGroup.setPermissions(Set.of(new Permission(user.getId(), MANAGE_USERS)));
+        userManagementPermissionGroup.setDefaultDomainType(User.class.getSimpleName());
+        userManagementPermissionGroup.setDefaultDomainId(user.getId());
+
+        // Assign the permission group to the user
+        userManagementPermissionGroup.setAssignedToUserIds(Set.of(user.getId()));
+
+        return permissionGroupService.save(userManagementPermissionGroup).map(savedPermissionGroup -> {
+            Map<String, Policy> crudUserPolicies =
+                    policySolution.generatePolicyFromPermissionGroupForObject(savedPermissionGroup, user.getId());
+
+            User updatedWithPolicies = policySolution.addPoliciesToExistingObject(crudUserPolicies, user);
+
+            return updatedWithPolicies;
+        });
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/UserUtilsCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/UserUtilsCE.java
index b080c7784c..4255102e54 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/UserUtilsCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/UserUtilsCE.java
@@ -39,7 +39,6 @@ public class UserUtilsCE {
 
     private final PermissionGroupRepository permissionGroupRepository;
 
-    private final CacheableRepositoryHelper cacheableRepositoryHelper;
     private final PermissionGroupPermission permissionGroupPermission;
 
     public UserUtilsCE(
@@ -49,7 +48,6 @@ public class UserUtilsCE {
             PermissionGroupPermission permissionGroupPermission) {
         this.configRepository = configRepository;
         this.permissionGroupRepository = permissionGroupRepository;
-        this.cacheableRepositoryHelper = cacheableRepositoryHelper;
         this.permissionGroupPermission = permissionGroupPermission;
     }
 
@@ -204,7 +202,7 @@ public class UserUtilsCE {
                 .flatMap(instanceConfig -> {
                     JSONObject config = instanceConfig.getConfig();
                     String defaultPermissionGroup = (String) config.getOrDefault(DEFAULT_PERMISSION_GROUP, "");
-                    return permissionGroupRepository.findById(defaultPermissionGroup);
+                    return permissionGroupRepository.retrieveById(defaultPermissionGroup);
                 });
     }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/WorkspaceServiceHelperCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/WorkspaceServiceHelperCE.java
new file mode 100644
index 0000000000..d299747c1d
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/WorkspaceServiceHelperCE.java
@@ -0,0 +1,7 @@
+package com.appsmith.server.helpers.ce;
+
+import reactor.core.publisher.Mono;
+
+public interface WorkspaceServiceHelperCE {
+    Mono<Boolean> isCreateWorkspaceAllowed(Boolean isDefaultWorkspace);
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/WorkspaceServiceHelperCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/WorkspaceServiceHelperCEImpl.java
new file mode 100644
index 0000000000..e579ba4456
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/WorkspaceServiceHelperCEImpl.java
@@ -0,0 +1,17 @@
+package com.appsmith.server.helpers.ce;
+
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Mono;
+
+import static java.lang.Boolean.TRUE;
+
+@Component
+@AllArgsConstructor
+public class WorkspaceServiceHelperCEImpl implements WorkspaceServiceHelperCE {
+
+    @Override
+    public Mono<Boolean> isCreateWorkspaceAllowed(Boolean isDefaultWorkspace) {
+        return Mono.just(TRUE);
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/jslibs/base/CustomJSLibService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/jslibs/base/CustomJSLibService.java
new file mode 100644
index 0000000000..b8d63eef67
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/jslibs/base/CustomJSLibService.java
@@ -0,0 +1,3 @@
+package com.appsmith.server.jslibs.base;
+
+public interface CustomJSLibService extends CustomJSLibServiceCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CustomJSLibServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/jslibs/base/CustomJSLibServiceCE.java
similarity index 96%
rename from app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CustomJSLibServiceCE.java
rename to app/server/appsmith-server/src/main/java/com/appsmith/server/jslibs/base/CustomJSLibServiceCE.java
index e7eba7bd5f..34c3baec26 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CustomJSLibServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/jslibs/base/CustomJSLibServiceCE.java
@@ -1,4 +1,4 @@
-package com.appsmith.server.services.ce;
+package com.appsmith.server.jslibs.base;
 
 import com.appsmith.server.domains.CustomJSLib;
 import com.appsmith.server.dtos.CustomJSLibApplicationDTO;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CustomJSLibServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/jslibs/base/CustomJSLibServiceCEImpl.java
similarity index 99%
rename from app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CustomJSLibServiceCEImpl.java
rename to app/server/appsmith-server/src/main/java/com/appsmith/server/jslibs/base/CustomJSLibServiceCEImpl.java
index 228781d003..00162dd392 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CustomJSLibServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/jslibs/base/CustomJSLibServiceCEImpl.java
@@ -1,4 +1,4 @@
-package com.appsmith.server.services.ce;
+package com.appsmith.server.jslibs.base;
 
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.domains.CustomJSLib;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CustomJSLibServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/jslibs/base/CustomJSLibServiceImpl.java
similarity index 87%
rename from app/server/appsmith-server/src/main/java/com/appsmith/server/services/CustomJSLibServiceImpl.java
rename to app/server/appsmith-server/src/main/java/com/appsmith/server/jslibs/base/CustomJSLibServiceImpl.java
index c0239e2af6..2745596285 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CustomJSLibServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/jslibs/base/CustomJSLibServiceImpl.java
@@ -1,7 +1,8 @@
-package com.appsmith.server.services;
+package com.appsmith.server.jslibs.base;
 
 import com.appsmith.server.repositories.CustomJSLibRepository;
-import com.appsmith.server.services.ce.CustomJSLibServiceCEImpl;
+import com.appsmith.server.services.AnalyticsService;
+import com.appsmith.server.services.ApplicationService;
 import jakarta.validation.Validator;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/jslibs/export/CustomJSLibExportableServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/jslibs/export/CustomJSLibExportableServiceCEImpl.java
new file mode 100644
index 0000000000..28a66ef648
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/jslibs/export/CustomJSLibExportableServiceCEImpl.java
@@ -0,0 +1,83 @@
+package com.appsmith.server.jslibs.export;
+
+import com.appsmith.server.constants.FieldName;
+import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.CustomJSLib;
+import com.appsmith.server.domains.GitApplicationMetadata;
+import com.appsmith.server.dtos.ApplicationJson;
+import com.appsmith.server.dtos.ExportingMetaDTO;
+import com.appsmith.server.dtos.MappedExportableResourcesDTO;
+import com.appsmith.server.export.exportable.ExportableServiceCE;
+import com.appsmith.server.jslibs.base.CustomJSLibService;
+import reactor.core.publisher.Mono;
+
+import java.time.Instant;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class CustomJSLibExportableServiceCEImpl implements ExportableServiceCE<CustomJSLib> {
+
+    private final CustomJSLibService customJSLibService;
+
+    public CustomJSLibExportableServiceCEImpl(CustomJSLibService customJSLibService) {
+        this.customJSLibService = customJSLibService;
+    }
+
+    @Override
+    public Mono<List<CustomJSLib>> getExportableEntities(
+            ExportingMetaDTO exportingMetaDTO,
+            MappedExportableResourcesDTO mappedExportableResourcesDTO,
+            Mono<Application> applicationMono,
+            ApplicationJson applicationJson) {
+        /**
+         * Since we are exporting for git, we only consider unpublished JS libraries
+         * Ref: https://theappsmith.slack.com/archives/CGBPVEJ5C/p1672225134025919
+         */
+        return customJSLibService
+                .getAllJSLibsInApplication(exportingMetaDTO.getApplicationId(), exportingMetaDTO.getBranchName(), false)
+                .map(jsLibList -> {
+                    jsLibList.forEach(jsLib -> {
+                        jsLib.setId(null);
+                        jsLib.setCreatedAt(null);
+                        jsLib.setUpdatedAt(null);
+                    });
+
+                    return jsLibList;
+                })
+                .zipWith(applicationMono)
+                .map(tuple2 -> {
+                    Application application = tuple2.getT2();
+                    GitApplicationMetadata gitApplicationMetadata = application.getGitApplicationMetadata();
+                    Instant applicationLastCommittedAt =
+                            gitApplicationMetadata != null ? gitApplicationMetadata.getLastCommittedAt() : null;
+
+                    List<CustomJSLib> unpublishedCustomJSLibList = tuple2.getT1();
+                    Set<String> updatedCustomJSLibSet;
+                    if (applicationLastCommittedAt != null) {
+                        updatedCustomJSLibSet = unpublishedCustomJSLibList.stream()
+                                .filter(lib -> lib.getUpdatedAt() == null
+                                        || applicationLastCommittedAt.isBefore(lib.getUpdatedAt()))
+                                .map(lib -> lib.getUidString())
+                                .collect(Collectors.toSet());
+                    } else {
+                        updatedCustomJSLibSet = unpublishedCustomJSLibList.stream()
+                                .map(lib -> lib.getUidString())
+                                .collect(Collectors.toSet());
+                    }
+
+                    applicationJson.getUpdatedResources().put(FieldName.CUSTOM_JS_LIB_LIST, updatedCustomJSLibSet);
+
+                    /**
+                     * Previously it was a Set and as Set is an unordered collection of elements that
+                     * resulted in uncommitted changes. Making it a list and sorting it by the UidString
+                     * ensure that the order will be maintained. And this solves the issue.
+                     */
+                    Collections.sort(unpublishedCustomJSLibList, Comparator.comparing(CustomJSLib::getUidString));
+                    applicationJson.setCustomJSLibList(unpublishedCustomJSLibList);
+                    return unpublishedCustomJSLibList;
+                });
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/jslibs/export/CustomJSLibExportableServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/jslibs/export/CustomJSLibExportableServiceImpl.java
new file mode 100644
index 0000000000..805f3d0ae9
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/jslibs/export/CustomJSLibExportableServiceImpl.java
@@ -0,0 +1,14 @@
+package com.appsmith.server.jslibs.export;
+
+import com.appsmith.server.domains.CustomJSLib;
+import com.appsmith.server.export.exportable.ExportableService;
+import com.appsmith.server.jslibs.base.CustomJSLibService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CustomJSLibExportableServiceImpl extends CustomJSLibExportableServiceCEImpl
+        implements ExportableService<CustomJSLib> {
+    public CustomJSLibExportableServiceImpl(CustomJSLibService customJSLibService) {
+        super(customJSLibService);
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration028TagUserManagementRolesWithoutDefaultDomainTypeAndId.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration028TagUserManagementRolesWithoutDefaultDomainTypeAndId.java
new file mode 100644
index 0000000000..49d163b95f
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration028TagUserManagementRolesWithoutDefaultDomainTypeAndId.java
@@ -0,0 +1,88 @@
+package com.appsmith.server.migrations.db.ce;
+
+import com.appsmith.external.models.Policy;
+import com.appsmith.server.domains.PermissionGroup;
+import com.appsmith.server.domains.QPermissionGroup;
+import com.appsmith.server.domains.QUser;
+import com.appsmith.server.domains.User;
+import com.appsmith.server.helpers.CollectionUtils;
+import io.mongock.api.annotations.ChangeUnit;
+import io.mongock.api.annotations.Execution;
+import io.mongock.api.annotations.RollbackExecution;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+import static com.appsmith.server.acl.AclPermission.RESET_PASSWORD_USERS;
+import static com.appsmith.server.repositories.ce.BaseAppsmithRepositoryCEImpl.fieldName;
+import static com.appsmith.server.repositories.ce.BaseAppsmithRepositoryCEImpl.notDeleted;
+
+@Slf4j
+@RequiredArgsConstructor
+@ChangeUnit(order = "028", id = "tag-user-management-roles-without-default-domain-type-and-id")
+public class Migration028TagUserManagementRolesWithoutDefaultDomainTypeAndId {
+    private final MongoTemplate mongoTemplate;
+
+    public static final String MIGRATION_FLAG_028_TAG_USER_MANAGEMENT_ROLE_WITHOUT_DEFAULT_DOMAIN_TYPE_AND_ID =
+            "tagUserManagementRoleWithoutDefaultDomainTypeAndId";
+
+    @RollbackExecution
+    public void rollbackExecution() {}
+
+    @Execution
+    public void tagUserManagementRolesWithoutDefaultDomainTypeAndId() {
+        Criteria resetPasswordPolicyExistsAndNotDeleted = Criteria.where("policies.permission")
+                .is(RESET_PASSWORD_USERS.getValue())
+                .andOperator(notDeleted());
+        Query queryExistingUsersWithResetPasswordPolicy = new Query(resetPasswordPolicyExistsAndNotDeleted);
+        queryExistingUsersWithResetPasswordPolicy.fields().include(fieldName(QUser.user.policies));
+
+        List<User> existingUsers = mongoTemplate.find(queryExistingUsersWithResetPasswordPolicy, User.class);
+
+        /*
+         * At the moment, RESET_PASSWORD_USERS policy for the user resource only contains 1 permission group ID, i.e.
+         * the ID of user management role for that user resource. Hence, we pick the ID present at the 0th index below.
+         */
+        Set<String> userManagementRoleIds = new HashSet<>();
+        existingUsers.forEach(existingUser -> {
+            Optional<Policy> resetPasswordPolicyOptional = existingUser.getPolicies().stream()
+                    .filter(policy1 -> RESET_PASSWORD_USERS.getValue().equals(policy1.getPermission()))
+                    .findFirst();
+            resetPasswordPolicyOptional.ifPresent(resetPasswordPolicy -> {
+                List<String> roleIdList =
+                        resetPasswordPolicy.getPermissionGroups().stream().toList();
+                if (!CollectionUtils.isNullOrEmpty(roleIdList)) {
+                    userManagementRoleIds.add(roleIdList.get(0));
+                }
+            });
+        });
+
+        Criteria criteriaUserManagementRoleIds =
+                Criteria.where(fieldName(QPermissionGroup.permissionGroup.id)).in(userManagementRoleIds);
+        Criteria criteriaDefaultDomainIdDoesNotExist = new Criteria()
+                .orOperator(
+                        Criteria.where(fieldName(QPermissionGroup.permissionGroup.defaultDomainId))
+                                .isNull(),
+                        Criteria.where(fieldName(QPermissionGroup.permissionGroup.defaultDomainId))
+                                .exists(false));
+        Criteria criteriaUserManagementRolesWithDefaultDomainIdDoesNotExist =
+                new Criteria().andOperator(criteriaUserManagementRoleIds, criteriaDefaultDomainIdDoesNotExist);
+        Query queryUserManagementRolesWithDefaultDomainIdDoesNotExist =
+                new Query(criteriaUserManagementRolesWithDefaultDomainIdDoesNotExist);
+
+        Update updateSetMigrationFlag = new Update();
+        updateSetMigrationFlag.set(
+                MIGRATION_FLAG_028_TAG_USER_MANAGEMENT_ROLE_WITHOUT_DEFAULT_DOMAIN_TYPE_AND_ID, Boolean.TRUE);
+
+        mongoTemplate.updateMulti(
+                queryUserManagementRolesWithDefaultDomainIdDoesNotExist, updateSetMigrationFlag, PermissionGroup.class);
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration029PopulateDefaultDomainIdInUserManagementRoles.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration029PopulateDefaultDomainIdInUserManagementRoles.java
new file mode 100644
index 0000000000..332f76a529
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration029PopulateDefaultDomainIdInUserManagementRoles.java
@@ -0,0 +1,117 @@
+package com.appsmith.server.migrations.db.ce;
+
+import com.appsmith.external.models.Policy;
+import com.appsmith.server.domains.PermissionGroup;
+import com.appsmith.server.domains.QPermissionGroup;
+import com.appsmith.server.domains.QUser;
+import com.appsmith.server.domains.User;
+import com.appsmith.server.exceptions.AppsmithError;
+import com.appsmith.server.exceptions.AppsmithException;
+import io.mongock.api.annotations.ChangeUnit;
+import io.mongock.api.annotations.Execution;
+import io.mongock.api.annotations.RollbackExecution;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static com.appsmith.server.acl.AclPermission.RESET_PASSWORD_USERS;
+import static com.appsmith.server.repositories.ce.BaseAppsmithRepositoryCEImpl.fieldName;
+import static com.appsmith.server.repositories.ce.BaseAppsmithRepositoryCEImpl.notDeleted;
+
+@Slf4j
+@RequiredArgsConstructor
+@ChangeUnit(order = "029", id = "populate-default-domain-id-in-user-management-roles")
+public class Migration029PopulateDefaultDomainIdInUserManagementRoles {
+
+    private final MongoTemplate mongoTemplate;
+
+    private static final int migrationRetries = 5;
+    private static final String migrationId = "populate-default-domain-id-in-user-management-roles";
+    private static final String migrationNote = "This will not have any adverse effects on the Data. Restarting the "
+            + "server will begin the migration from where it left.";
+
+    @RollbackExecution
+    public void rollbackExecution() {}
+
+    @Execution
+    public void populateDefaultDomainIdInUserManagementRoles() {
+        Criteria resetPasswordPolicyExistsAndNotDeleted = Criteria.where("policies.permission")
+                .is(RESET_PASSWORD_USERS.getValue())
+                .andOperator(notDeleted());
+        Query queryExistingUsersWithResetPasswordPolicy = new Query(resetPasswordPolicyExistsAndNotDeleted);
+        queryExistingUsersWithResetPasswordPolicy.fields().include(fieldName(QUser.user.policies));
+        Map<String, String> userManagementRoleIdToUserIdMap = new HashMap<>();
+        mongoTemplate.stream(queryExistingUsersWithResetPasswordPolicy, User.class)
+                .forEach(existingUser -> {
+                    Optional<Policy> resetPasswordPolicyOptional = existingUser.getPolicies().stream()
+                            .filter(policy1 -> RESET_PASSWORD_USERS.getValue().equals(policy1.getPermission()))
+                            .findFirst();
+                    resetPasswordPolicyOptional.ifPresent(resetPasswordPolicy -> {
+                        List<String> roleIdList = resetPasswordPolicy.getPermissionGroups().stream()
+                                .toList();
+                        roleIdList.forEach(roleId -> userManagementRoleIdToUserIdMap.put(roleId, existingUser.getId()));
+                    });
+                });
+
+        Criteria criteriaUserManagementRolesWithMigrationFlag028Set = Criteria.where(
+                        Migration028TagUserManagementRolesWithoutDefaultDomainTypeAndId
+                                .MIGRATION_FLAG_028_TAG_USER_MANAGEMENT_ROLE_WITHOUT_DEFAULT_DOMAIN_TYPE_AND_ID)
+                .exists(Boolean.TRUE);
+        Query queryUserManagementRolesWithWithMigrationFlag028Set =
+                new Query(criteriaUserManagementRolesWithMigrationFlag028Set);
+
+        queryUserManagementRolesWithWithMigrationFlag028Set
+                .fields()
+                .include(fieldName(QPermissionGroup.permissionGroup.id));
+        long countOfUserManagementRolesWithMigrationFlag028Set =
+                mongoTemplate.count(queryUserManagementRolesWithWithMigrationFlag028Set, PermissionGroup.class);
+        int attempt = 0;
+
+        while (countOfUserManagementRolesWithMigrationFlag028Set > 0 && attempt < migrationRetries) {
+            List<PermissionGroup> userManagementRolesWithMigrationFlag028Set =
+                    mongoTemplate.find(queryUserManagementRolesWithWithMigrationFlag028Set, PermissionGroup.class);
+            userManagementRolesWithMigrationFlag028Set.parallelStream().forEach(userManagementRole -> {
+                if (userManagementRoleIdToUserIdMap.containsKey(userManagementRole.getId())
+                        && StringUtils.isNotEmpty(userManagementRoleIdToUserIdMap.get(userManagementRole.getId()))) {
+                    Criteria criteriaUserManagementRoleById = Criteria.where(
+                                    fieldName(QPermissionGroup.permissionGroup.id))
+                            .is(userManagementRole.getId());
+                    Query queryUserManagementRoleById = new Query(criteriaUserManagementRoleById);
+                    Update updateDefaultDomainIdOfUserManagementRole = new Update();
+
+                    updateDefaultDomainIdOfUserManagementRole.set(
+                            fieldName(QPermissionGroup.permissionGroup.defaultDomainId),
+                            userManagementRoleIdToUserIdMap.get(userManagementRole.getId()));
+
+                    updateDefaultDomainIdOfUserManagementRole.set(
+                            fieldName(QPermissionGroup.permissionGroup.defaultDomainType), User.class.getSimpleName());
+
+                    updateDefaultDomainIdOfUserManagementRole.unset(
+                            Migration028TagUserManagementRolesWithoutDefaultDomainTypeAndId
+                                    .MIGRATION_FLAG_028_TAG_USER_MANAGEMENT_ROLE_WITHOUT_DEFAULT_DOMAIN_TYPE_AND_ID);
+                    mongoTemplate.updateFirst(
+                            queryUserManagementRoleById,
+                            updateDefaultDomainIdOfUserManagementRole,
+                            PermissionGroup.class);
+                }
+            });
+            countOfUserManagementRolesWithMigrationFlag028Set =
+                    mongoTemplate.count(queryUserManagementRolesWithWithMigrationFlag028Set, PermissionGroup.class);
+            attempt += 1;
+        }
+
+        if (countOfUserManagementRolesWithMigrationFlag028Set != 0) {
+            String reasonForFailure = "All user management roles were not tagged.";
+            throw new AppsmithException(AppsmithError.MIGRATION_FAILED, migrationId, reasonForFailure, migrationNote);
+        }
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration030TagUsersWithNoUserManagementRoles.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration030TagUsersWithNoUserManagementRoles.java
new file mode 100644
index 0000000000..11555cc0bd
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration030TagUsersWithNoUserManagementRoles.java
@@ -0,0 +1,70 @@
+package com.appsmith.server.migrations.db.ce;
+
+import com.appsmith.external.models.QBaseDomain;
+import com.appsmith.server.domains.PermissionGroup;
+import com.appsmith.server.domains.User;
+import io.mongock.api.annotations.ChangeUnit;
+import io.mongock.api.annotations.Execution;
+import io.mongock.api.annotations.RollbackExecution;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+
+import java.util.List;
+
+import static com.appsmith.server.repositories.ce.BaseAppsmithRepositoryCEImpl.fieldName;
+
+@Slf4j
+@RequiredArgsConstructor
+@ChangeUnit(order = "030", id = "tag-users-with-no-user-management-roles")
+public class Migration030TagUsersWithNoUserManagementRoles {
+
+    private final MongoTemplate mongoTemplate;
+
+    public static final String MIGRATION_FLAG_030_TAG_USER_WITHOUT_USER_MANAGEMENT_ROLE =
+            "tagUserWithoutUserManagementRole";
+
+    @RollbackExecution
+    public void rollbackExecution() {}
+
+    @Execution
+    public void tagUsersWithNoUserManagementRoles() {
+        Criteria criteriaDefaultDomainTypeExists =
+                Criteria.where("defaultDomainType").exists(true);
+        Criteria criteriaDefaultDomainTypeIsUser =
+                Criteria.where("defaultDomainType").is(User.class.getSimpleName());
+
+        Criteria criteriaUserManagementRoles =
+                new Criteria().andOperator(criteriaDefaultDomainTypeExists, criteriaDefaultDomainTypeIsUser);
+        Query queryUserManagementRoles = new Query(criteriaUserManagementRoles);
+        queryUserManagementRoles.fields().include("defaultDomainId");
+
+        List<PermissionGroup> userManagementRoles = mongoTemplate.find(queryUserManagementRoles, PermissionGroup.class);
+
+        List<String> userIdsWithUserManagementRoles = userManagementRoles.stream()
+                .map(PermissionGroup::getDefaultDomainId)
+                .toList();
+
+        Criteria criteriaUsersWithNoUserManagementRoles =
+                Criteria.where(fieldName(QBaseDomain.baseDomain.id)).nin(userIdsWithUserManagementRoles);
+        Criteria criteriaUsersPoliciesExists =
+                Criteria.where(fieldName(QBaseDomain.baseDomain.policies)).exists(true);
+        Criteria criteriaUsersPoliciesNotEmpty =
+                Criteria.where(fieldName(QBaseDomain.baseDomain.policies)).not().size(0);
+        Criteria criteriaUsersWithNoUserManagementRolesAndUserPoliciesExists = new Criteria()
+                .andOperator(
+                        criteriaUsersWithNoUserManagementRoles,
+                        criteriaUsersPoliciesExists,
+                        criteriaUsersPoliciesNotEmpty);
+        Query queryUsersWithNoUserManagementRoles =
+                new Query(criteriaUsersWithNoUserManagementRolesAndUserPoliciesExists);
+
+        Update updateSetMigrationFlag = new Update();
+        updateSetMigrationFlag.set(MIGRATION_FLAG_030_TAG_USER_WITHOUT_USER_MANAGEMENT_ROLE, Boolean.TRUE);
+
+        mongoTemplate.updateMulti(queryUsersWithNoUserManagementRoles, updateSetMigrationFlag, User.class);
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration031CreateUserManagementRolesForUsersTaggedIn030.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration031CreateUserManagementRolesForUsersTaggedIn030.java
new file mode 100644
index 0000000000..b450af9daf
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration031CreateUserManagementRolesForUsersTaggedIn030.java
@@ -0,0 +1,110 @@
+package com.appsmith.server.migrations.db.ce;
+
+import com.appsmith.external.models.Policy;
+import com.appsmith.external.models.QBaseDomain;
+import com.appsmith.server.constants.FieldName;
+import com.appsmith.server.domains.PermissionGroup;
+import com.appsmith.server.domains.QUser;
+import com.appsmith.server.domains.User;
+import com.appsmith.server.dtos.Permission;
+import com.appsmith.server.exceptions.AppsmithError;
+import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.migrations.utils.CompatibilityUtils;
+import com.appsmith.server.solutions.PolicySolution;
+import io.mongock.api.annotations.ChangeUnit;
+import io.mongock.api.annotations.Execution;
+import io.mongock.api.annotations.RollbackExecution;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+
+import java.util.Map;
+import java.util.Set;
+
+import static com.appsmith.server.acl.AclPermission.MANAGE_USERS;
+import static com.appsmith.server.repositories.ce.BaseAppsmithRepositoryCEImpl.fieldName;
+import static java.lang.Boolean.TRUE;
+
+@Slf4j
+@RequiredArgsConstructor
+@ChangeUnit(order = "031", id = "create-user-management-roles-for-users-tagged-in-migration-030")
+public class Migration031CreateUserManagementRolesForUsersTaggedIn030 {
+    private final MongoTemplate mongoTemplate;
+    private final PolicySolution policySolution;
+
+    private static final int migrationRetries = 5;
+    private static final String migrationNote = "This will not have any adverse effects on the Data. Restarting the "
+            + "server will begin the migration from where it left.";
+    private static final String migrationId = "create-user-management-roles-for-users-tagged-in-migration-030";
+
+    @RollbackExecution
+    public void rollbackExecution() {}
+
+    @Execution
+    public void createUserManagementRolesForUsersTaggedInMigration030() {
+        Criteria criteriaUsersTaggedInMigration030 = Criteria.where(
+                        Migration030TagUsersWithNoUserManagementRoles
+                                .MIGRATION_FLAG_030_TAG_USER_WITHOUT_USER_MANAGEMENT_ROLE)
+                .is(TRUE);
+
+        Query queryUsersTaggedInMigration030 = new Query(criteriaUsersTaggedInMigration030);
+        queryUsersTaggedInMigration030.fields().include(fieldName(QUser.user.id));
+        queryUsersTaggedInMigration030.fields().include(fieldName(QUser.user.policies));
+        queryUsersTaggedInMigration030.fields().include(fieldName(QUser.user.email));
+
+        Query optimisedQueryUsersTaggedInMigration030 = CompatibilityUtils.optimizeQueryForNoCursorTimeout(
+                mongoTemplate, queryUsersTaggedInMigration030, User.class);
+
+        int attempt = 0;
+        long countUsersTaggedInMigration030 = mongoTemplate.count(optimisedQueryUsersTaggedInMigration030, User.class);
+
+        while (attempt < migrationRetries && countUsersTaggedInMigration030 > 0) {
+            mongoTemplate.stream(optimisedQueryUsersTaggedInMigration030, User.class)
+                    .forEach(user -> {
+                        User userWithUpdatedPolicies = createUserManagementRoleAndGetUserWithUpdatedPolicies(user);
+                        Update updateMigrationFlagAndPoliciesForUser = new Update();
+                        updateMigrationFlagAndPoliciesForUser.unset(
+                                Migration030TagUsersWithNoUserManagementRoles
+                                        .MIGRATION_FLAG_030_TAG_USER_WITHOUT_USER_MANAGEMENT_ROLE);
+                        updateMigrationFlagAndPoliciesForUser.set(
+                                fieldName(QUser.user.policies), userWithUpdatedPolicies.getPolicies());
+                        Criteria criteriaUserId = Criteria.where(fieldName(QBaseDomain.baseDomain.id))
+                                .is(user.getId());
+                        Query queryUserId = new Query(criteriaUserId);
+                        mongoTemplate.updateFirst(queryUserId, updateMigrationFlagAndPoliciesForUser, User.class);
+                    });
+            attempt += 1;
+            countUsersTaggedInMigration030 = mongoTemplate.count(optimisedQueryUsersTaggedInMigration030, User.class);
+        }
+
+        if (countUsersTaggedInMigration030 > 0) {
+            String reasonForFailure = "All user management roles were not created.";
+            throw new AppsmithException(AppsmithError.MIGRATION_FAILED, migrationId, reasonForFailure, migrationNote);
+        }
+    }
+
+    private User createUserManagementRoleAndGetUserWithUpdatedPolicies(User user) {
+        // Create user management permission group
+        PermissionGroup userManagementRole = new PermissionGroup();
+        userManagementRole.setName(user.getUsername() + FieldName.SUFFIX_USER_MANAGEMENT_ROLE);
+        // Add CRUD permissions for user to the group
+        userManagementRole.setPermissions(Set.of(new Permission(user.getId(), MANAGE_USERS)));
+        userManagementRole.setDefaultDomainId(user.getId());
+        userManagementRole.setDefaultDomainType(User.class.getSimpleName());
+
+        // Assign the permission group to the user
+        userManagementRole.setAssignedToUserIds(Set.of(user.getId()));
+
+        PermissionGroup savedUserManagementRole = mongoTemplate.save(userManagementRole);
+
+        Map<String, Policy> crudUserPolicies =
+                policySolution.generatePolicyFromPermissionGroupForObject(savedUserManagementRole, user.getId());
+
+        User updatedWithPolicies = policySolution.addPoliciesToExistingObject(crudUserPolicies, user);
+
+        return updatedWithPolicies;
+    }
+}
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 20290e0c00..7cf487081c 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
@@ -141,4 +141,6 @@ public interface NewActionServiceCE extends CrudService<NewAction, String> {
     Mono<List<BulkWriteResult>> publishActions(String applicationId, AclPermission permission);
 
     Flux<PluginTypeAndCountDTO> countActionsByPluginType(String applicationId);
+
+    Flux<NewAction> findByListOfPageIds(List<String> unpublishedPages, Optional<AclPermission> optionalPermission);
 }
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 766d900416..b56531662f 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
@@ -40,15 +40,15 @@ import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.helpers.ce.ImportApplicationPermissionProvider;
+import com.appsmith.server.newpages.base.NewPageService;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.repositories.NewActionRepository;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.BaseService;
 import com.appsmith.server.services.ConfigService;
 import com.appsmith.server.services.MarketplaceService;
-import com.appsmith.server.services.NewPageService;
 import com.appsmith.server.services.PermissionGroupService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.solutions.ActionPermission;
 import com.appsmith.server.solutions.ApplicationPermission;
 import com.appsmith.server.solutions.DatasourcePermission;
@@ -1688,12 +1688,12 @@ public class NewActionServiceCEImpl extends BaseService<NewActionRepository, New
      * - update default resource ids along with branch-name if the application is connected to git
      * - update the map of imported collectionIds to the actionIds in saved in DB
      *
-     * @param importedNewActionList                 action list extracted from the imported JSON file
-     * @param application                           imported and saved application in DB
-     * @param branchName                            branch to which the actions needs to be saved if the application is connected to git
-     * @param pageNameMap                           map of page name to saved page in DB
-     * @param pluginMap                             map of plugin name to saved plugin id in DB
-     * @param datasourceMap                         map of plugin name to saved datasource id in DB
+     * @param importedNewActionList action list extracted from the imported JSON file
+     * @param application           imported and saved application in DB
+     * @param branchName            branch to which the actions needs to be saved if the application is connected to git
+     * @param pageNameMap           map of page name to saved page in DB
+     * @param pluginMap             map of plugin name to saved plugin id in DB
+     * @param datasourceMap         map of plugin name to saved datasource id in DB
      * @return A DTO class with several information
      */
     @Override
@@ -1987,4 +1987,10 @@ public class NewActionServiceCEImpl extends BaseService<NewActionRepository, New
     public Flux<PluginTypeAndCountDTO> countActionsByPluginType(String applicationId) {
         return repository.countActionsByPluginType(applicationId);
     }
+
+    @Override
+    public Flux<NewAction> findByListOfPageIds(
+            List<String> unpublishedPages, Optional<AclPermission> optionalPermission) {
+        return repository.findByListOfPageIds(unpublishedPages, optionalPermission);
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceImpl.java
index 85242dc5a8..d083496ab7 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceImpl.java
@@ -4,14 +4,14 @@ import com.appsmith.server.acl.PolicyGenerator;
 import com.appsmith.server.datasources.base.DatasourceService;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.helpers.ResponseUtils;
+import com.appsmith.server.newpages.base.NewPageService;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.repositories.NewActionRepository;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.ConfigService;
 import com.appsmith.server.services.MarketplaceService;
-import com.appsmith.server.services.NewPageService;
 import com.appsmith.server.services.PermissionGroupService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.solutions.ActionPermission;
 import com.appsmith.server.solutions.ApplicationPermission;
 import com.appsmith.server.solutions.DatasourcePermission;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/export/NewActionExportableServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/export/NewActionExportableServiceCEImpl.java
new file mode 100644
index 0000000000..054f5516a3
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/export/NewActionExportableServiceCEImpl.java
@@ -0,0 +1,162 @@
+package com.appsmith.server.newactions.export;
+
+import com.appsmith.external.models.ActionDTO;
+import com.appsmith.server.acl.AclPermission;
+import com.appsmith.server.constants.FieldName;
+import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.NewAction;
+import com.appsmith.server.dtos.ApplicationJson;
+import com.appsmith.server.dtos.ExportingMetaDTO;
+import com.appsmith.server.dtos.MappedExportableResourcesDTO;
+import com.appsmith.server.export.exportable.ExportableServiceCE;
+import com.appsmith.server.helpers.ImportExportUtils;
+import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.solutions.ActionPermission;
+import org.apache.commons.lang3.StringUtils;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.time.Instant;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+import static com.appsmith.external.constants.GitConstants.NAME_SEPARATOR;
+import static com.appsmith.server.constants.ResourceModes.EDIT;
+import static com.appsmith.server.constants.ResourceModes.VIEW;
+import static com.appsmith.server.helpers.ImportExportUtils.sanitizeDatasourceInActionDTO;
+
+public class NewActionExportableServiceCEImpl implements ExportableServiceCE<NewAction> {
+
+    private final NewActionService newActionService;
+    private final ActionPermission actionPermission;
+
+    public NewActionExportableServiceCEImpl(NewActionService newActionService, ActionPermission actionPermission) {
+        this.newActionService = newActionService;
+        this.actionPermission = actionPermission;
+    }
+
+    @Override
+    public Mono<List<NewAction>> getExportableEntities(
+            ExportingMetaDTO exportingMetaDTO,
+            MappedExportableResourcesDTO mappedExportableResourcesDTO,
+            Mono<Application> applicationMono,
+            ApplicationJson applicationJson) {
+
+        Set<String> dbNamesUsedInActions = new HashSet<>();
+        Optional<AclPermission> optionalPermission = Optional.ofNullable(actionPermission.getExportPermission(
+                exportingMetaDTO.getIsGitSync(), exportingMetaDTO.getExportWithConfiguration()));
+
+        Flux<NewAction> actionFlux =
+                newActionService.findByListOfPageIds(exportingMetaDTO.getUnpublishedPages(), optionalPermission);
+
+        return actionFlux
+                .map(newAction -> {
+                    newAction.setPluginId(
+                            mappedExportableResourcesDTO.getPluginMap().get(newAction.getPluginId()));
+                    newAction.setWorkspaceId(null);
+                    newAction.setPolicies(null);
+                    newAction.setApplicationId(null);
+                    dbNamesUsedInActions.add(sanitizeDatasourceInActionDTO(
+                            newAction.getPublishedAction(),
+                            mappedExportableResourcesDTO.getDatasourceIdToNameMap(),
+                            mappedExportableResourcesDTO.getPluginMap(),
+                            null,
+                            true));
+                    dbNamesUsedInActions.add(sanitizeDatasourceInActionDTO(
+                            newAction.getUnpublishedAction(),
+                            mappedExportableResourcesDTO.getDatasourceIdToNameMap(),
+                            mappedExportableResourcesDTO.getPluginMap(),
+                            null,
+                            true));
+
+                    // Set unique id for action
+                    if (newAction.getUnpublishedAction() != null) {
+                        ActionDTO actionDTO = newAction.getUnpublishedAction();
+                        actionDTO.setPageId(mappedExportableResourcesDTO
+                                .getPageIdToNameMap()
+                                .get(actionDTO.getPageId() + EDIT));
+
+                        if (!StringUtils.isEmpty(actionDTO.getCollectionId())
+                                && mappedExportableResourcesDTO
+                                        .getCollectionIdToNameMap()
+                                        .containsKey(actionDTO.getCollectionId())) {
+                            actionDTO.setCollectionId(mappedExportableResourcesDTO
+                                    .getCollectionIdToNameMap()
+                                    .get(actionDTO.getCollectionId()));
+                        }
+
+                        final String updatedActionId = actionDTO.getPageId() + "_" + actionDTO.getValidName();
+                        mappedExportableResourcesDTO.getActionIdToNameMap().put(newAction.getId(), updatedActionId);
+                        newAction.setId(updatedActionId);
+                    }
+                    if (newAction.getPublishedAction() != null) {
+                        ActionDTO actionDTO = newAction.getPublishedAction();
+                        actionDTO.setPageId(mappedExportableResourcesDTO
+                                .getPageIdToNameMap()
+                                .get(actionDTO.getPageId() + VIEW));
+
+                        if (!StringUtils.isEmpty(actionDTO.getCollectionId())
+                                && mappedExportableResourcesDTO
+                                        .getCollectionIdToNameMap()
+                                        .containsKey(actionDTO.getCollectionId())) {
+                            actionDTO.setCollectionId(mappedExportableResourcesDTO
+                                    .getCollectionIdToNameMap()
+                                    .get(actionDTO.getCollectionId()));
+                        }
+
+                        if (!mappedExportableResourcesDTO.getActionIdToNameMap().containsValue(newAction.getId())) {
+                            final String updatedActionId = actionDTO.getPageId() + "_" + actionDTO.getValidName();
+                            mappedExportableResourcesDTO.getActionIdToNameMap().put(newAction.getId(), updatedActionId);
+                            newAction.setId(updatedActionId);
+                        }
+                    }
+                    return newAction;
+                })
+                .collectList()
+                .map(actionList -> {
+                    Set<String> updatedActionSet = new HashSet<>();
+                    actionList.forEach(newAction -> {
+                        ActionDTO unpublishedActionDTO = newAction.getUnpublishedAction();
+                        ActionDTO publishedActionDTO = newAction.getPublishedAction();
+                        ActionDTO actionDTO = unpublishedActionDTO != null ? unpublishedActionDTO : publishedActionDTO;
+                        String newActionName = actionDTO != null
+                                ? actionDTO.getValidName() + NAME_SEPARATOR + actionDTO.getPageId()
+                                : null;
+                        // TODO: check whether resource updated after last commit - move to a function
+                        String pageName = actionDTO.getPageId();
+                        // we've replaced the datasource id with datasource name in previous step
+                        boolean isDatasourceUpdated = ImportExportUtils.isDatasourceUpdatedSinceLastCommit(
+                                mappedExportableResourcesDTO.getDatasourceNameToUpdatedAtMap(),
+                                actionDTO,
+                                exportingMetaDTO.getApplicationLastCommittedAt());
+
+                        boolean isPageUpdated = ImportExportUtils.isPageNameInUpdatedList(applicationJson, pageName);
+                        Instant newActionUpdatedAt = newAction.getUpdatedAt();
+                        boolean isNewActionUpdated = exportingMetaDTO.isClientSchemaMigrated()
+                                || exportingMetaDTO.isServerSchemaMigrated()
+                                || exportingMetaDTO.getApplicationLastCommittedAt() == null
+                                || isPageUpdated
+                                || isDatasourceUpdated
+                                || newActionUpdatedAt == null
+                                || exportingMetaDTO
+                                        .getApplicationLastCommittedAt()
+                                        .isBefore(newActionUpdatedAt);
+                        if (isNewActionUpdated && newActionName != null) {
+                            updatedActionSet.add(newActionName);
+                        }
+                        newAction.sanitiseToExportDBObject();
+                    });
+                    applicationJson.getUpdatedResources().put(FieldName.ACTION_LIST, updatedActionSet);
+                    applicationJson.setActionList(actionList);
+
+                    // This is where we're removing global datasources that are unused in this application
+                    applicationJson
+                            .getDatasourceList()
+                            .removeIf(datasource -> !dbNamesUsedInActions.contains(datasource.getName()));
+
+                    return actionList;
+                });
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/export/NewActionExportableServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/export/NewActionExportableServiceImpl.java
new file mode 100644
index 0000000000..5c761dea6b
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/export/NewActionExportableServiceImpl.java
@@ -0,0 +1,16 @@
+package com.appsmith.server.newactions.export;
+
+import com.appsmith.server.domains.NewAction;
+import com.appsmith.server.export.exportable.ExportableService;
+import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.solutions.ActionPermission;
+import org.springframework.stereotype.Service;
+
+@Service
+public class NewActionExportableServiceImpl extends NewActionExportableServiceCEImpl
+        implements ExportableService<NewAction> {
+
+    public NewActionExportableServiceImpl(NewActionService newActionService, ActionPermission actionPermission) {
+        super(newActionService, actionPermission);
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageService.java
new file mode 100644
index 0000000000..3e97cf0721
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageService.java
@@ -0,0 +1,3 @@
+package com.appsmith.server.newpages.base;
+
+public interface NewPageService extends NewPageServiceCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NewPageServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCE.java
similarity index 98%
rename from app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NewPageServiceCE.java
rename to app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCE.java
index b42c05c5fd..e77a81f24c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NewPageServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCE.java
@@ -1,4 +1,4 @@
-package com.appsmith.server.services.ce;
+package com.appsmith.server.newpages.base;
 
 import com.appsmith.server.acl.AclPermission;
 import com.appsmith.server.domains.ApplicationMode;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NewPageServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCEImpl.java
similarity index 99%
rename from app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NewPageServiceCEImpl.java
rename to app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCEImpl.java
index 938e82179f..85395b3ba5 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NewPageServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCEImpl.java
@@ -1,4 +1,4 @@
-package com.appsmith.server.services.ce;
+package com.appsmith.server.newpages.base;
 
 import com.appsmith.external.models.DefaultResources;
 import com.appsmith.server.acl.AclPermission;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewPageServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceImpl.java
similarity index 89%
rename from app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewPageServiceImpl.java
rename to app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceImpl.java
index debc3905b1..8cf93789ac 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewPageServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceImpl.java
@@ -1,9 +1,11 @@
-package com.appsmith.server.services;
+package com.appsmith.server.newpages.base;
 
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.repositories.ApplicationSnapshotRepository;
 import com.appsmith.server.repositories.NewPageRepository;
-import com.appsmith.server.services.ce.NewPageServiceCEImpl;
+import com.appsmith.server.services.AnalyticsService;
+import com.appsmith.server.services.ApplicationService;
+import com.appsmith.server.services.UserDataService;
 import com.appsmith.server.solutions.ApplicationPermission;
 import com.appsmith.server.solutions.PagePermission;
 import jakarta.validation.Validator;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/export/NewPageExportableServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/export/NewPageExportableServiceCEImpl.java
new file mode 100644
index 0000000000..c20d76e720
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/export/NewPageExportableServiceCEImpl.java
@@ -0,0 +1,163 @@
+package com.appsmith.server.newpages.export;
+
+import com.appsmith.server.acl.AclPermission;
+import com.appsmith.server.constants.FieldName;
+import com.appsmith.server.constants.SerialiseApplicationObjective;
+import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.Layout;
+import com.appsmith.server.domains.NewPage;
+import com.appsmith.server.dtos.ApplicationJson;
+import com.appsmith.server.dtos.ExportingMetaDTO;
+import com.appsmith.server.dtos.MappedExportableResourcesDTO;
+import com.appsmith.server.dtos.PageDTO;
+import com.appsmith.server.export.exportable.ExportableServiceCE;
+import com.appsmith.server.newpages.base.NewPageService;
+import com.appsmith.server.solutions.PagePermission;
+import org.apache.commons.collections.CollectionUtils;
+import reactor.core.publisher.Mono;
+
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+import static com.appsmith.server.constants.ResourceModes.EDIT;
+import static com.appsmith.server.constants.ResourceModes.VIEW;
+
+public class NewPageExportableServiceCEImpl implements ExportableServiceCE<NewPage> {
+
+    private final NewPageService newPageService;
+    private final PagePermission pagePermission;
+
+    public NewPageExportableServiceCEImpl(NewPageService newPageService, PagePermission pagePermission) {
+        this.newPageService = newPageService;
+        this.pagePermission = pagePermission;
+    }
+
+    @Override
+    public Mono<List<NewPage>> getExportableEntities(
+            ExportingMetaDTO exportingMetaDTO,
+            MappedExportableResourcesDTO mappedExportableResourcesDTO,
+            Mono<Application> applicationMono,
+            ApplicationJson applicationJson) {
+        Optional<AclPermission> optionalPermission = Optional.ofNullable(pagePermission.getExportPermission(
+                exportingMetaDTO.getIsGitSync(), exportingMetaDTO.getExportWithConfiguration()));
+
+        List<String> unpublishedPages = exportingMetaDTO.getUnpublishedPages();
+
+        return newPageService
+                .findNewPagesByApplicationId(exportingMetaDTO.getApplicationId(), optionalPermission)
+                .collectList()
+                .map(newPageList -> {
+                    // Extract mongoEscapedWidgets from pages and save it to applicationJson object as this
+                    // field is JsonIgnored. Also remove any ids those are present in the page objects
+
+                    Set<String> updatedPageSet = new HashSet<String>();
+
+                    // check the application object for the page reference in the page list
+                    // Exclude the deleted pages that are present in view mode  because the app is not
+                    // published yet
+                    newPageList.removeIf(newPage -> !unpublishedPages.contains(newPage.getId()));
+                    newPageList.forEach(newPage -> {
+                        if (newPage.getUnpublishedPage() != null) {
+                            mappedExportableResourcesDTO
+                                    .getPageIdToNameMap()
+                                    .put(
+                                            newPage.getId() + EDIT,
+                                            newPage.getUnpublishedPage().getName());
+                            PageDTO unpublishedPageDTO = newPage.getUnpublishedPage();
+                            if (!CollectionUtils.isEmpty(unpublishedPageDTO.getLayouts())) {
+                                unpublishedPageDTO.getLayouts().forEach(layout -> {
+                                    layout.setId(unpublishedPageDTO.getName());
+                                });
+                            }
+                        }
+
+                        if (newPage.getPublishedPage() != null) {
+                            mappedExportableResourcesDTO
+                                    .getPageIdToNameMap()
+                                    .put(
+                                            newPage.getId() + VIEW,
+                                            newPage.getPublishedPage().getName());
+                            PageDTO publishedPageDTO = newPage.getPublishedPage();
+                            if (!CollectionUtils.isEmpty(publishedPageDTO.getLayouts())) {
+                                publishedPageDTO.getLayouts().forEach(layout -> {
+                                    layout.setId(publishedPageDTO.getName());
+                                });
+                            }
+                        }
+                        // Including updated pages list for git file storage
+                        Instant newPageUpdatedAt = newPage.getUpdatedAt();
+                        boolean isNewPageUpdated = exportingMetaDTO.isClientSchemaMigrated()
+                                || exportingMetaDTO.isServerSchemaMigrated()
+                                || exportingMetaDTO.getApplicationLastCommittedAt() == null
+                                || newPageUpdatedAt == null
+                                || exportingMetaDTO
+                                        .getApplicationLastCommittedAt()
+                                        .isBefore(newPageUpdatedAt);
+                        String newPageName = newPage.getUnpublishedPage() != null
+                                ? newPage.getUnpublishedPage().getName()
+                                : newPage.getPublishedPage() != null
+                                        ? newPage.getPublishedPage().getName()
+                                        : null;
+                        if (isNewPageUpdated && newPageName != null) {
+                            updatedPageSet.add(newPageName);
+                        }
+                        newPage.sanitiseToExportDBObject();
+                    });
+                    applicationJson.setPageList(newPageList);
+                    applicationJson.setUpdatedResources(new HashMap<>() {
+                        {
+                            put(FieldName.PAGE_LIST, updatedPageSet);
+                        }
+                    });
+                    return newPageList;
+                });
+    }
+
+    @Override
+    public void sanitizeEntities(
+            ExportingMetaDTO exportingMetaDTO,
+            MappedExportableResourcesDTO mappedExportableResourcesDTO,
+            ApplicationJson applicationJson,
+            SerialiseApplicationObjective serialiseFor) {
+        // Update ids for layoutOnLoadAction
+        for (NewPage newPage : applicationJson.getPageList()) {
+            updateIdsForLayoutOnLoadAction(
+                    newPage.getUnpublishedPage(),
+                    mappedExportableResourcesDTO.getActionIdToNameMap(),
+                    mappedExportableResourcesDTO.getCollectionIdToNameMap());
+            updateIdsForLayoutOnLoadAction(
+                    newPage.getPublishedPage(),
+                    mappedExportableResourcesDTO.getActionIdToNameMap(),
+                    mappedExportableResourcesDTO.getCollectionIdToNameMap());
+        }
+
+        applicationJson
+                .getExportedApplication()
+                .exportApplicationPages(mappedExportableResourcesDTO.getPageIdToNameMap());
+    }
+
+    private void updateIdsForLayoutOnLoadAction(
+            PageDTO page, Map<String, String> actionIdToNameMap, Map<String, String> collectionIdToNameMap) {
+
+        if (page != null && !CollectionUtils.isEmpty(page.getLayouts())) {
+            for (Layout layout : page.getLayouts()) {
+                if (!CollectionUtils.isEmpty(layout.getLayoutOnLoadActions())) {
+                    layout.getLayoutOnLoadActions()
+                            .forEach(onLoadAction -> onLoadAction.forEach(actionDTO -> {
+                                if (actionIdToNameMap.containsKey(actionDTO.getId())) {
+                                    actionDTO.setId(actionIdToNameMap.get(actionDTO.getId()));
+                                }
+                                if (collectionIdToNameMap.containsKey(actionDTO.getCollectionId())) {
+                                    actionDTO.setCollectionId(collectionIdToNameMap.get(actionDTO.getCollectionId()));
+                                }
+                            }));
+                }
+            }
+        }
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/export/NewPageExportableServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/export/NewPageExportableServiceImpl.java
new file mode 100644
index 0000000000..0a849f094c
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/export/NewPageExportableServiceImpl.java
@@ -0,0 +1,15 @@
+package com.appsmith.server.newpages.export;
+
+import com.appsmith.server.domains.NewPage;
+import com.appsmith.server.export.exportable.ExportableService;
+import com.appsmith.server.newpages.base.NewPageService;
+import com.appsmith.server.solutions.PagePermission;
+import org.springframework.stereotype.Service;
+
+@Service
+public class NewPageExportableServiceImpl extends NewPageExportableServiceCEImpl implements ExportableService<NewPage> {
+
+    public NewPageExportableServiceImpl(NewPageService newPageService, PagePermission pagePermission) {
+        super(newPageService, pagePermission);
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/onpageload/internal/PageLoadExecutablesUtilCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/onpageload/internal/PageLoadExecutablesUtilCEImpl.java
index 7dae0f7c7d..fef69e7f49 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/onpageload/internal/PageLoadExecutablesUtilCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/onpageload/internal/PageLoadExecutablesUtilCEImpl.java
@@ -990,8 +990,7 @@ public class PageLoadExecutablesUtilCEImpl implements PageLoadExecutablesUtilCE
         executableBindingsMap.values().stream().forEach(bindings -> allBindings.addAll(bindings));
 
         // TODO : Throw an error on executable save when bindings from dynamic binding path list do not match the json
-        // path
-        //   keys and get the client to recompute the dynamic binding path list and try again.
+        //  path keys and get the client to recompute the dynamic binding path list and try again.
         if (!allBindings.containsAll(executable.getJsonPathKeys())) {
             Set<String> invalidBindings = new HashSet<>(executable.getJsonPathKeys());
             invalidBindings.removeAll(allBindings);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginService.java
new file mode 100644
index 0000000000..ff9b933735
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginService.java
@@ -0,0 +1,3 @@
+package com.appsmith.server.plugins.base;
+
+public interface PluginService extends PluginServiceCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PluginServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceCE.java
similarity index 89%
rename from app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PluginServiceCE.java
rename to app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceCE.java
index ff9c68d7b4..8a8f3a19a4 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PluginServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceCE.java
@@ -1,4 +1,4 @@
-package com.appsmith.server.services.ce;
+package com.appsmith.server.plugins.base;
 
 import com.appsmith.external.models.Datasource;
 import com.appsmith.server.domains.Plugin;
@@ -11,6 +11,7 @@ import reactor.core.publisher.Mono;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public interface PluginServiceCE extends CrudService<Plugin, String> {
 
@@ -45,4 +46,6 @@ public interface PluginServiceCE extends CrudService<Plugin, String> {
     Map loadEditorPluginResourceUqi(Plugin plugin);
 
     Flux<Plugin> saveAll(Iterable<Plugin> plugins);
+
+    Flux<Plugin> findAllByIdsWithoutPermission(Set<String> ids, List<String> includeFields);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PluginServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceCEImpl.java
similarity index 99%
rename from app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PluginServiceCEImpl.java
rename to app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceCEImpl.java
index 8756c48f61..657a0284da 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PluginServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceCEImpl.java
@@ -1,4 +1,4 @@
-package com.appsmith.server.services.ce;
+package com.appsmith.server.plugins.base;
 
 import com.appsmith.external.models.Datasource;
 import com.appsmith.external.models.PluginType;
@@ -628,6 +628,11 @@ public class PluginServiceCEImpl extends BaseService<PluginRepository, Plugin, S
         return repository.saveAll(plugins);
     }
 
+    @Override
+    public Flux<Plugin> findAllByIdsWithoutPermission(Set<String> ids, List<String> includeFields) {
+        return repository.findAllByIdsWithoutPermission(ids, includeFields);
+    }
+
     @Override
     public Flux<Plugin> getAllRemotePlugins() {
         return repository.findByType(PluginType.REMOTE);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PluginServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceImpl.java
similarity index 91%
rename from app/server/appsmith-server/src/main/java/com/appsmith/server/services/PluginServiceImpl.java
rename to app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceImpl.java
index 56ab881b91..619b67cc60 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PluginServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/base/PluginServiceImpl.java
@@ -1,7 +1,8 @@
-package com.appsmith.server.services;
+package com.appsmith.server.plugins.base;
 
 import com.appsmith.server.repositories.PluginRepository;
-import com.appsmith.server.services.ce.PluginServiceCEImpl;
+import com.appsmith.server.services.AnalyticsService;
+import com.appsmith.server.services.WorkspaceService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.validation.Validator;
 import lombok.extern.slf4j.Slf4j;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/export/PluginExportableServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/export/PluginExportableServiceCEImpl.java
new file mode 100644
index 0000000000..5ea07de3e1
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/export/PluginExportableServiceCEImpl.java
@@ -0,0 +1,54 @@
+package com.appsmith.server.plugins.export;
+
+import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.Plugin;
+import com.appsmith.server.domains.QPlugin;
+import com.appsmith.server.domains.WorkspacePlugin;
+import com.appsmith.server.dtos.ApplicationJson;
+import com.appsmith.server.dtos.ExportingMetaDTO;
+import com.appsmith.server.dtos.MappedExportableResourcesDTO;
+import com.appsmith.server.export.exportable.ExportableServiceCE;
+import com.appsmith.server.plugins.base.PluginService;
+import com.appsmith.server.services.WorkspaceService;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static com.appsmith.server.repositories.ce.BaseAppsmithRepositoryCEImpl.fieldName;
+
+public class PluginExportableServiceCEImpl implements ExportableServiceCE<Plugin> {
+
+    private final PluginService pluginService;
+    private final WorkspaceService workspaceService;
+
+    public PluginExportableServiceCEImpl(PluginService pluginService, WorkspaceService workspaceService) {
+        this.pluginService = pluginService;
+        this.workspaceService = workspaceService;
+    }
+
+    @Override
+    public Mono<List<Plugin>> getExportableEntities(
+            ExportingMetaDTO exportingMetaDTO,
+            MappedExportableResourcesDTO mappedExportableResourcesDTO,
+            Mono<Application> applicationMono,
+            ApplicationJson applicationJson) {
+        return workspaceService
+                .getById(applicationJson.getExportedApplication().getWorkspaceId())
+                .map(workspace -> workspace.getPlugins().stream()
+                        .map(WorkspacePlugin::getPluginId)
+                        .collect(Collectors.toSet()))
+                .flatMapMany(pluginIds -> pluginService.findAllByIdsWithoutPermission(
+                        pluginIds,
+                        List.of(fieldName(QPlugin.plugin.pluginName), fieldName(QPlugin.plugin.packageName))))
+                .map(plugin -> {
+                    mappedExportableResourcesDTO
+                            .getPluginMap()
+                            .put(
+                                    plugin.getId(),
+                                    plugin.getPluginName() == null ? plugin.getPackageName() : plugin.getPluginName());
+                    return plugin;
+                })
+                .collectList();
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/export/PluginExportableServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/export/PluginExportableServiceImpl.java
new file mode 100644
index 0000000000..60efebcfd6
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/plugins/export/PluginExportableServiceImpl.java
@@ -0,0 +1,14 @@
+package com.appsmith.server.plugins.export;
+
+import com.appsmith.server.domains.Plugin;
+import com.appsmith.server.export.exportable.ExportableService;
+import com.appsmith.server.plugins.base.PluginService;
+import com.appsmith.server.services.WorkspaceService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class PluginExportableServiceImpl extends PluginExportableServiceCEImpl implements ExportableService<Plugin> {
+    public PluginExportableServiceImpl(PluginService pluginService, WorkspaceService workspaceService) {
+        super(pluginService, workspaceService);
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/ratelimiting/RateLimitConfig.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/ratelimiting/RateLimitConfig.java
index 84ac04cce5..2ed255f5b4 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/ratelimiting/RateLimitConfig.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/ratelimiting/RateLimitConfig.java
@@ -10,6 +10,7 @@ import io.github.bucket4j.redis.lettuce.cas.LettuceBasedProxyManager;
 import io.lettuce.core.AbstractRedisClient;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.cluster.RedisClusterClient;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -20,8 +21,9 @@ import java.util.Map;
 import java.util.Optional;
 
 @Configuration
+@Slf4j
 public class RateLimitConfig {
-    private static final Map<String, BucketConfiguration> apiConfigurations = new HashMap<>();
+    private static final Map<String, BucketConfiguration> apiConfigurationMap = new HashMap<>();
 
     @Autowired
     private final AbstractRedisClient redisClient;
@@ -31,7 +33,7 @@ public class RateLimitConfig {
     }
 
     static {
-        apiConfigurations.put(
+        apiConfigurationMap.put(
                 RateLimitConstants.BUCKET_KEY_FOR_LOGIN_API, createBucketConfiguration(Duration.ofDays(1), 5));
         // Add more API configurations as needed
     }
@@ -60,7 +62,7 @@ public class RateLimitConfig {
     public Map<String, BucketProxy> apiBuckets() {
         Map<String, BucketProxy> apiBuckets = new HashMap<>();
 
-        apiConfigurations.forEach((apiIdentifier, configuration) ->
+        apiConfigurationMap.forEach((apiIdentifier, configuration) ->
                 apiBuckets.put(apiIdentifier, proxyManager().builder().build(apiIdentifier.getBytes(), configuration)));
 
         return apiBuckets;
@@ -73,7 +75,7 @@ public class RateLimitConfig {
             return proxyManager().builder().build(bucketIdentifier.getBytes(), bucketProxy.get());
         }
 
-        return proxyManager().builder().build(bucketIdentifier.getBytes(), apiConfigurations.get(apiIdentifier));
+        return proxyManager().builder().build(bucketIdentifier.getBytes(), apiConfigurationMap.get(apiIdentifier));
     }
 
     private static BucketConfiguration createBucketConfiguration(Duration refillDuration, int limit) {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/ratelimiting/RateLimitService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/ratelimiting/RateLimitService.java
index 51a9b048d9..483d001a2d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/ratelimiting/RateLimitService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/ratelimiting/RateLimitService.java
@@ -1,45 +1,5 @@
 package com.appsmith.server.ratelimiting;
 
-import io.github.bucket4j.distributed.BucketProxy;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import reactor.core.publisher.Mono;
+import com.appsmith.server.ratelimiting.ce.RateLimitServiceCE;
 
-import java.util.Map;
-
-@Slf4j
-@Service
-public class RateLimitService {
-
-    private final Map<String, BucketProxy> apiBuckets;
-    private final RateLimitConfig rateLimitConfig;
-    // this number of tokens var can later be customised per API in the configuration.
-    private final Integer DEFAULT_NUMBER_OF_TOKENS_CONSUMED_PER_REQUEST = 1;
-
-    public RateLimitService(Map<String, BucketProxy> apiBuckets, RateLimitConfig rateLimitConfig) {
-        this.apiBuckets = apiBuckets;
-        this.rateLimitConfig = rateLimitConfig;
-    }
-
-    public Mono<Boolean> tryIncreaseCounter(String apiIdentifier, String userIdentifier) {
-        log.debug(
-                "RateLimitService.tryIncreaseCounter() called with apiIdentifier = {}, userIdentifier = {}",
-                apiIdentifier,
-                userIdentifier);
-        // handle the case where API itself is not rate limited
-        log.debug(
-                apiBuckets.containsKey(apiIdentifier) ? "apiBuckets contains key" : "apiBuckets does not contain key");
-        if (!apiBuckets.containsKey(apiIdentifier)) return Mono.just(false);
-
-        BucketProxy userSpecificBucket =
-                rateLimitConfig.getOrCreateAPIUserSpecificBucket(apiIdentifier, userIdentifier);
-        log.debug("userSpecificBucket = {}", userSpecificBucket);
-        return Mono.just(userSpecificBucket.tryConsume(DEFAULT_NUMBER_OF_TOKENS_CONSUMED_PER_REQUEST));
-    }
-
-    public void resetCounter(String apiIdentifier, String userIdentifier) {
-        rateLimitConfig
-                .getOrCreateAPIUserSpecificBucket(apiIdentifier, userIdentifier)
-                .reset();
-    }
-}
+public interface RateLimitService extends RateLimitServiceCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/ratelimiting/RateLimitServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/ratelimiting/RateLimitServiceImpl.java
new file mode 100644
index 0000000000..697445a4d9
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/ratelimiting/RateLimitServiceImpl.java
@@ -0,0 +1,17 @@
+package com.appsmith.server.ratelimiting;
+
+import com.appsmith.server.ratelimiting.ce.RateLimitServiceCEImpl;
+import io.github.bucket4j.distributed.BucketProxy;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+@Slf4j
+@Service
+public class RateLimitServiceImpl extends RateLimitServiceCEImpl implements RateLimitService {
+
+    public RateLimitServiceImpl(Map<String, BucketProxy> apiBuckets, RateLimitConfig rateLimitConfig) {
+        super(apiBuckets, rateLimitConfig);
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/ratelimiting/aspects/RateLimitAspect.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/ratelimiting/aspects/RateLimitAspect.java
index 5e67421bb0..da42da1743 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/ratelimiting/aspects/RateLimitAspect.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/ratelimiting/aspects/RateLimitAspect.java
@@ -42,8 +42,7 @@ public class RateLimitAspect {
                     Object result = joinPoint.proceed();
                     return result instanceof Mono ? (Mono) result : Mono.just(result);
                 } catch (Throwable e) {
-                    AppsmithError error = AppsmithError.INTERNAL_SERVER_ERROR;
-                    throw new AppsmithException(error, e.getMessage());
+                    return Mono.error(new AppsmithException(AppsmithError.INTERNAL_SERVER_ERROR));
                 }
             });
         });
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/ratelimiting/ce/RateLimitServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/ratelimiting/ce/RateLimitServiceCE.java
new file mode 100644
index 0000000000..78bbe99efc
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/ratelimiting/ce/RateLimitServiceCE.java
@@ -0,0 +1,9 @@
+package com.appsmith.server.ratelimiting.ce;
+
+import reactor.core.publisher.Mono;
+
+public interface RateLimitServiceCE {
+    Mono<Boolean> tryIncreaseCounter(String apiIdentifier, String userIdentifier);
+
+    Mono<Void> resetCounter(String apiIdentifier, String userIdentifier);
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/ratelimiting/ce/RateLimitServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/ratelimiting/ce/RateLimitServiceCEImpl.java
new file mode 100644
index 0000000000..4eb33c9a83
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/ratelimiting/ce/RateLimitServiceCEImpl.java
@@ -0,0 +1,90 @@
+package com.appsmith.server.ratelimiting.ce;
+
+import com.appsmith.server.exceptions.AppsmithError;
+import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.ratelimiting.RateLimitConfig;
+import io.github.bucket4j.distributed.BucketProxy;
+import lombok.extern.slf4j.Slf4j;
+import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Scheduler;
+import reactor.core.scheduler.Schedulers;
+
+import java.util.Map;
+
+import static java.lang.Boolean.FALSE;
+import static java.lang.Boolean.TRUE;
+
+@Slf4j
+public class RateLimitServiceCEImpl implements RateLimitServiceCE {
+
+    private final Scheduler scheduler = Schedulers.boundedElastic();
+    private final Map<String, BucketProxy> apiBuckets;
+    private final RateLimitConfig rateLimitConfig;
+    // this number of tokens can later be customised per API in the configuration.
+    private final Integer DEFAULT_NUMBER_OF_TOKENS_CONSUMED_PER_REQUEST = 1;
+
+    public RateLimitServiceCEImpl(Map<String, BucketProxy> apiBuckets, RateLimitConfig rateLimitConfig) {
+        this.apiBuckets = apiBuckets;
+        this.rateLimitConfig = rateLimitConfig;
+    }
+
+    @Override
+    public Mono<Boolean> tryIncreaseCounter(String apiIdentifier, String userIdentifier) {
+
+        return sanitizeInput(apiIdentifier, userIdentifier)
+                .flatMap(isInputValid -> {
+                    BucketProxy userSpecificBucket =
+                            rateLimitConfig.getOrCreateAPIUserSpecificBucket(apiIdentifier, userIdentifier);
+
+                    return Mono.just(userSpecificBucket.tryConsume(DEFAULT_NUMBER_OF_TOKENS_CONSUMED_PER_REQUEST));
+                })
+                .map(isSuccessful -> {
+                    if (FALSE.equals(isSuccessful)) {
+                        log.debug(
+                                "{} - Rate Limit exceeded for apiIdentifier = {}, userIdentifier = {}",
+                                Thread.currentThread().getName(),
+                                apiIdentifier,
+                                userIdentifier);
+                    }
+
+                    return isSuccessful;
+                })
+                // Since we are interacting with redis, we want to make sure that the operation is done on a separate
+                // thread pool
+                .subscribeOn(scheduler);
+    }
+
+    @Override
+    public Mono<Void> resetCounter(String apiIdentifier, String userIdentifier) {
+
+        return sanitizeInput(apiIdentifier, userIdentifier)
+                .flatMap(isInputValid -> {
+                    rateLimitConfig
+                            .getOrCreateAPIUserSpecificBucket(apiIdentifier, userIdentifier)
+                            .reset();
+
+                    return Mono.just(TRUE);
+                })
+                .then()
+                // Since we are interacting with redis, we want to make sure that the operation is done on a separate
+                // thread pool
+                .subscribeOn(scheduler);
+    }
+
+    private Mono<Boolean> sanitizeInput(String apiIdentifier, String userIdentifier) {
+        if (userIdentifier == null) {
+            return Mono.error(new AppsmithException(AppsmithError.INTERNAL_SERVER_ERROR));
+        }
+
+        return Mono.just(userIdentifier)
+                .flatMap(username -> {
+                    // Handle the case where API itself is not rate limited.
+                    if (!apiBuckets.containsKey(apiIdentifier)) {
+                        return Mono.error(new AppsmithException(AppsmithError.UNSUPPORTED_OPERATION));
+                    }
+
+                    return Mono.just(true);
+                })
+                .subscribeOn(scheduler);
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CacheableRepositoryHelper.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CacheableRepositoryHelper.java
index 6d4a45d5cd..ece6fe5e7a 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CacheableRepositoryHelper.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CacheableRepositoryHelper.java
@@ -1,5 +1,5 @@
 package com.appsmith.server.repositories;
 
-import com.appsmith.server.repositories.ce.CacheableRepositoryHelperCE;
+import com.appsmith.server.repositories.ce_compatible.CacheableRepositoryHelperCECompatible;
 
-public interface CacheableRepositoryHelper extends CacheableRepositoryHelperCE {}
+public interface CacheableRepositoryHelper extends CacheableRepositoryHelperCECompatible {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CacheableRepositoryHelperImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CacheableRepositoryHelperImpl.java
index 9bbb4787b1..ed91d3b621 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CacheableRepositoryHelperImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CacheableRepositoryHelperImpl.java
@@ -1,14 +1,17 @@
 package com.appsmith.server.repositories;
 
-import com.appsmith.server.repositories.ce.CacheableRepositoryHelperCEImpl;
+import com.appsmith.server.helpers.InMemoryCacheableRepositoryHelper;
+import com.appsmith.server.repositories.ce_compatible.CacheableRepositoryHelperCECompatibleImpl;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.stereotype.Component;
 
 @Component
-public class CacheableRepositoryHelperImpl extends CacheableRepositoryHelperCEImpl
+public class CacheableRepositoryHelperImpl extends CacheableRepositoryHelperCECompatibleImpl
         implements CacheableRepositoryHelper {
 
-    public CacheableRepositoryHelperImpl(ReactiveMongoOperations mongoOperations) {
-        super(mongoOperations);
+    public CacheableRepositoryHelperImpl(
+            ReactiveMongoOperations mongoOperations,
+            InMemoryCacheableRepositoryHelper inMemoryCacheableRepositoryHelper) {
+        super(mongoOperations, inMemoryCacheableRepositoryHelper);
     }
 }
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 b5e780f293..c0527340ec 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
@@ -20,4 +20,6 @@ public interface CacheableRepositoryHelperCE {
     Mono<User> getAnonymousUser();
 
     Mono<String> getDefaultTenantId();
+
+    Mono<String> getInstanceAdminPermissionGroupId();
 }
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 2629602b69..307281baeb 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
@@ -11,12 +11,16 @@ import com.appsmith.server.domains.QTenant;
 import com.appsmith.server.domains.QUser;
 import com.appsmith.server.domains.Tenant;
 import com.appsmith.server.domains.User;
+import com.appsmith.server.domains.Workspace;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.helpers.InMemoryCacheableRepositoryHelper;
 import lombok.extern.slf4j.Slf4j;
+import net.minidev.json.JSONObject;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;
 
 import java.util.HashMap;
@@ -26,23 +30,23 @@ import java.util.stream.Collectors;
 
 import static com.appsmith.server.constants.FieldName.PERMISSION_GROUP_ID;
 import static com.appsmith.server.constants.ce.FieldNameCE.ANONYMOUS_USER;
+import static com.appsmith.server.constants.ce.FieldNameCE.DEFAULT_PERMISSION_GROUP;
+import static com.appsmith.server.constants.ce.FieldNameCE.INSTANCE_CONFIG;
 import static com.appsmith.server.repositories.BaseAppsmithRepositoryImpl.fieldName;
 import static com.appsmith.server.repositories.ce.BaseAppsmithRepositoryCEImpl.notDeleted;
 
 @Slf4j
+@Component
 public class CacheableRepositoryHelperCEImpl implements CacheableRepositoryHelperCE {
     private final ReactiveMongoOperations mongoOperations;
-    private final Map<String, User> tenantAnonymousUserMap;
+    private final InMemoryCacheableRepositoryHelper inMemoryCacheableRepositoryHelper;
+    private final Map<String, User> tenantAnonymousUserMap = new HashMap<>();
 
-    private Set<String> anonymousUserPermissionGroupIds;
-
-    private String defaultTenantId;
-
-    public CacheableRepositoryHelperCEImpl(ReactiveMongoOperations mongoOperations) {
+    public CacheableRepositoryHelperCEImpl(
+            ReactiveMongoOperations mongoOperations,
+            InMemoryCacheableRepositoryHelper inMemoryCacheableRepositoryHelper) {
         this.mongoOperations = mongoOperations;
-        this.defaultTenantId = null;
-        this.tenantAnonymousUserMap = new HashMap<>();
-        anonymousUserPermissionGroupIds = null;
+        this.inMemoryCacheableRepositoryHelper = inMemoryCacheableRepositoryHelper;
     }
 
     @Cache(cacheName = "permissionGroupsForUser", key = "{#user.email + #user.tenantId}")
@@ -62,28 +66,48 @@ public class CacheableRepositoryHelperCEImpl implements CacheableRepositoryHelpe
             return Mono.error(new AppsmithException(AppsmithError.SESSION_BAD_STATE));
         }
 
-        Criteria assignedToUserIdsCriteria = Criteria.where(
-                        fieldName(QPermissionGroup.permissionGroup.assignedToUserIds))
-                .is(user.getId());
-        Criteria notDeletedCriteria = notDeleted();
+        Mono<Query> createQueryMono = getInstanceAdminPermissionGroupId().map(instanceAdminPermissionGroupId -> {
+            Criteria assignedToUserIdsCriteria = Criteria.where(
+                            fieldName(QPermissionGroup.permissionGroup.assignedToUserIds))
+                    .is(user.getId());
 
-        Criteria andCriteria = new Criteria();
-        andCriteria.andOperator(assignedToUserIdsCriteria, notDeletedCriteria);
+            Criteria notDeletedCriteria = notDeleted();
 
-        Query query = new Query();
-        query.addCriteria(andCriteria);
+            // The roles should be either workspace default roles, user management role, or instance admin role
+            Criteria ceSupportedRolesCriteria = new Criteria()
+                    .orOperator(
+                            Criteria.where(fieldName(QPermissionGroup.permissionGroup.defaultDomainType))
+                                    .is(Workspace.class.getSimpleName()),
+                            Criteria.where(fieldName(QPermissionGroup.permissionGroup.defaultDomainType))
+                                    .is(User.class.getSimpleName()),
+                            Criteria.where(fieldName(QPermissionGroup.permissionGroup.id))
+                                    .is(instanceAdminPermissionGroupId));
 
-        return mongoOperations
-                .find(query, PermissionGroup.class)
+            Criteria andCriteria = new Criteria();
+            andCriteria.andOperator(assignedToUserIdsCriteria, notDeletedCriteria, ceSupportedRolesCriteria);
+
+            Query query = new Query();
+            query.addCriteria(andCriteria);
+
+            // Since we are only interested in the permission group ids, we can project only the id field.
+            query.fields().include(fieldName(QPermissionGroup.permissionGroup.id));
+
+            return query;
+        });
+
+        return createQueryMono
+                .map(query -> mongoOperations.find(query, PermissionGroup.class))
+                .flatMapMany(obj -> obj)
                 .map(permissionGroup -> permissionGroup.getId())
                 .collect(Collectors.toSet());
     }
 
     @Override
     public Mono<Set<String>> preFillAnonymousUserPermissionGroupIdsCache() {
+        Set<String> roleIdsForAnonymousUser = inMemoryCacheableRepositoryHelper.getAnonymousUserPermissionGroupIds();
 
-        if (anonymousUserPermissionGroupIds != null && !anonymousUserPermissionGroupIds.isEmpty()) {
-            return Mono.just(anonymousUserPermissionGroupIds);
+        if (roleIdsForAnonymousUser != null && !roleIdsForAnonymousUser.isEmpty()) {
+            return Mono.just(inMemoryCacheableRepositoryHelper.getAnonymousUserPermissionGroupIds());
         }
 
         log.debug(
@@ -97,14 +121,15 @@ public class CacheableRepositoryHelperCEImpl implements CacheableRepositoryHelpe
                         Config.class)
                 .map(publicPermissionGroupConfig ->
                         Set.of(publicPermissionGroupConfig.getConfig().getAsString(PERMISSION_GROUP_ID)))
-                .doOnSuccess(permissionGroupIds -> anonymousUserPermissionGroupIds = permissionGroupIds);
+                .doOnSuccess(inMemoryCacheableRepositoryHelper::setAnonymousUserPermissionGroupIds);
     }
 
     @Override
     public Mono<Set<String>> getPermissionGroupsOfAnonymousUser() {
+        Set<String> roleIdsForAnonymousUser = inMemoryCacheableRepositoryHelper.getAnonymousUserPermissionGroupIds();
 
-        if (anonymousUserPermissionGroupIds != null) {
-            return Mono.just(anonymousUserPermissionGroupIds);
+        if (roleIdsForAnonymousUser != null) {
+            return Mono.just(roleIdsForAnonymousUser);
         }
 
         // If we have reached this state, then the cache is not populated. We need to wait for this to get populated
@@ -142,6 +167,7 @@ public class CacheableRepositoryHelperCEImpl implements CacheableRepositoryHelpe
 
     @Override
     public Mono<User> getAnonymousUser() {
+        String defaultTenantId = inMemoryCacheableRepositoryHelper.getDefaultTenantId();
         if (defaultTenantId != null && !defaultTenantId.isEmpty()) {
             return getAnonymousUser(defaultTenantId);
         }
@@ -152,13 +178,14 @@ public class CacheableRepositoryHelperCEImpl implements CacheableRepositoryHelpe
         query.addCriteria(defaultTenantCriteria);
 
         return mongoOperations.findOne(query, Tenant.class).flatMap(defaultTenant -> {
-            defaultTenantId = defaultTenant.getId();
+            inMemoryCacheableRepositoryHelper.setDefaultTenantId(defaultTenant.getId());
             return getAnonymousUser(defaultTenant.getId());
         });
     }
 
     @Override
     public Mono<String> getDefaultTenantId() {
+        String defaultTenantId = inMemoryCacheableRepositoryHelper.getDefaultTenantId();
         if (defaultTenantId != null && !defaultTenantId.isEmpty()) {
             return Mono.just(defaultTenantId);
         }
@@ -169,8 +196,28 @@ public class CacheableRepositoryHelperCEImpl implements CacheableRepositoryHelpe
         query.addCriteria(defaultTenantCriteria);
 
         return mongoOperations.findOne(query, Tenant.class).map(defaultTenant -> {
-            defaultTenantId = defaultTenant.getId();
-            return defaultTenantId;
+            String newDefaultTenantId = defaultTenant.getId();
+            inMemoryCacheableRepositoryHelper.setDefaultTenantId(newDefaultTenantId);
+            return newDefaultTenantId;
         });
     }
+
+    @Override
+    public Mono<String> getInstanceAdminPermissionGroupId() {
+        String instanceAdminPermissionGroupId = inMemoryCacheableRepositoryHelper.getInstanceAdminPermissionGroupId();
+        if (instanceAdminPermissionGroupId != null && !instanceAdminPermissionGroupId.isEmpty()) {
+            return Mono.just(instanceAdminPermissionGroupId);
+        }
+
+        Criteria configName = Criteria.where(fieldName(QConfig.config1.name)).is(INSTANCE_CONFIG);
+
+        return mongoOperations
+                .findOne(new Query().addCriteria(configName), Config.class)
+                .map(instanceConfig -> {
+                    JSONObject config = instanceConfig.getConfig();
+                    return (String) config.getOrDefault(DEFAULT_PERMISSION_GROUP, "");
+                })
+                .doOnSuccess(permissionGroupId ->
+                        inMemoryCacheableRepositoryHelper.setInstanceAdminPermissionGroupId(permissionGroupId));
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomPluginRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomPluginRepositoryCE.java
index 8e7062c51a..1482381afa 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomPluginRepositoryCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomPluginRepositoryCE.java
@@ -4,6 +4,11 @@ import com.appsmith.server.domains.Plugin;
 import com.appsmith.server.repositories.AppsmithRepository;
 import reactor.core.publisher.Flux;
 
+import java.util.List;
+import java.util.Set;
+
 public interface CustomPluginRepositoryCE extends AppsmithRepository<Plugin> {
     Flux<Plugin> findDefaultPluginIcons();
+
+    Flux<Plugin> findAllByIdsWithoutPermission(Set<String> ids, List<String> includeFields);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomPluginRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomPluginRepositoryCEImpl.java
index 6dfdeeff80..4d28c99404 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomPluginRepositoryCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomPluginRepositoryCEImpl.java
@@ -10,6 +10,10 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import reactor.core.publisher.Flux;
 
 import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+import static org.springframework.data.mongodb.core.query.Criteria.where;
 
 public class CustomPluginRepositoryCEImpl extends BaseAppsmithRepositoryImpl<Plugin>
         implements CustomPluginRepositoryCE {
@@ -31,4 +35,15 @@ public class CustomPluginRepositoryCEImpl extends BaseAppsmithRepositoryImpl<Plu
                 fieldName(QPlugin.plugin.iconLocation));
         return this.queryAll(List.of(criteria), projections, null, null);
     }
+
+    @Override
+    public Flux<Plugin> findAllByIdsWithoutPermission(Set<String> ids, List<String> includeFields) {
+        Criteria idCriteria = where(fieldName(QPlugin.plugin.id)).in(ids);
+        return queryAll(
+                List.of(idCriteria),
+                Optional.ofNullable(includeFields),
+                Optional.empty(),
+                Optional.empty(),
+                NO_RECORD_LIMIT);
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce_compatible/CacheableRepositoryHelperCECompatible.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce_compatible/CacheableRepositoryHelperCECompatible.java
new file mode 100644
index 0000000000..d2ecd348a2
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce_compatible/CacheableRepositoryHelperCECompatible.java
@@ -0,0 +1,5 @@
+package com.appsmith.server.repositories.ce_compatible;
+
+import com.appsmith.server.repositories.ce.CacheableRepositoryHelperCE;
+
+public interface CacheableRepositoryHelperCECompatible extends CacheableRepositoryHelperCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce_compatible/CacheableRepositoryHelperCECompatibleImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce_compatible/CacheableRepositoryHelperCECompatibleImpl.java
new file mode 100644
index 0000000000..d7c0f10cfa
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce_compatible/CacheableRepositoryHelperCECompatibleImpl.java
@@ -0,0 +1,18 @@
+package com.appsmith.server.repositories.ce_compatible;
+
+import com.appsmith.server.helpers.InMemoryCacheableRepositoryHelper;
+import com.appsmith.server.repositories.ce.CacheableRepositoryHelperCEImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.mongodb.core.ReactiveMongoOperations;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class CacheableRepositoryHelperCECompatibleImpl extends CacheableRepositoryHelperCEImpl
+        implements CacheableRepositoryHelperCECompatible {
+    public CacheableRepositoryHelperCECompatibleImpl(
+            ReactiveMongoOperations mongoOperations,
+            InMemoryCacheableRepositoryHelper inMemoryCacheableRepositoryHelper) {
+        super(mongoOperations, inMemoryCacheableRepositoryHelper);
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ActionCollectionService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ActionCollectionService.java
deleted file mode 100644
index f5e2368483..0000000000
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ActionCollectionService.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.appsmith.server.services;
-
-import com.appsmith.server.services.ce.ActionCollectionServiceCE;
-
-public interface ActionCollectionService extends ActionCollectionServiceCE {}
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 84d269465e..a8637b3827 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
@@ -1,9 +1,11 @@
 package com.appsmith.server.services;
 
 import com.appsmith.server.acl.PolicyGenerator;
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.helpers.GitFileUtils;
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.repositories.ActionCollectionRepository;
 import com.appsmith.server.repositories.ApplicationRepository;
 import com.appsmith.server.repositories.DatasourceRepository;
@@ -16,6 +18,7 @@ import com.appsmith.server.solutions.ApplicationPermission;
 import com.appsmith.server.solutions.DatasourcePermission;
 import com.appsmith.server.solutions.PagePermission;
 import com.appsmith.server.solutions.WorkspacePermission;
+import com.appsmith.server.themes.base.ThemeService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.reactive.TransactionalOperator;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationService.java
index cdbd24a48a..c028a8c689 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationService.java
@@ -1,5 +1,5 @@
 package com.appsmith.server.services;
 
-import com.appsmith.server.services.ce.ApplicationServiceCE;
+import com.appsmith.server.services.ce_compatible.ApplicationServiceCECompatible;
 
-public interface ApplicationService extends ApplicationServiceCE {}
+public interface ApplicationService extends ApplicationServiceCECompatible {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationServiceImpl.java
index 52173dfa09..7d2f78bb44 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationServiceImpl.java
@@ -3,7 +3,7 @@ package com.appsmith.server.services;
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.repositories.ApplicationRepository;
 import com.appsmith.server.repositories.NewActionRepository;
-import com.appsmith.server.services.ce.ApplicationServiceCEImpl;
+import com.appsmith.server.services.ce_compatible.ApplicationServiceCECompatibleImpl;
 import com.appsmith.server.solutions.ApplicationPermission;
 import com.appsmith.server.solutions.DatasourcePermission;
 import com.appsmith.server.solutions.PolicySolution;
@@ -16,7 +16,7 @@ import reactor.core.scheduler.Scheduler;
 
 @Slf4j
 @Service
-public class ApplicationServiceImpl extends ApplicationServiceCEImpl implements ApplicationService {
+public class ApplicationServiceImpl extends ApplicationServiceCECompatibleImpl implements ApplicationService {
 
     public ApplicationServiceImpl(
             Scheduler scheduler,
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationSnapshotServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationSnapshotServiceImpl.java
index 9268d4bf55..7f48502066 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationSnapshotServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationSnapshotServiceImpl.java
@@ -1,10 +1,10 @@
 package com.appsmith.server.services;
 
+import com.appsmith.server.export.internal.ImportExportApplicationService;
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.repositories.ApplicationSnapshotRepository;
 import com.appsmith.server.services.ce.ApplicationSnapshotServiceCEImpl;
 import com.appsmith.server.solutions.ApplicationPermission;
-import com.appsmith.server.solutions.ImportExportApplicationService;
 import com.google.gson.Gson;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationTemplateServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationTemplateServiceImpl.java
index 28f5f46885..fe3beba176 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationTemplateServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationTemplateServiceImpl.java
@@ -1,10 +1,10 @@
 package com.appsmith.server.services;
 
 import com.appsmith.server.configurations.CloudServicesConfig;
+import com.appsmith.server.export.internal.ImportExportApplicationService;
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.services.ce.ApplicationTemplateServiceCEImpl;
 import com.appsmith.server.solutions.ApplicationPermission;
-import com.appsmith.server.solutions.ImportExportApplicationService;
 import com.appsmith.server.solutions.ReleaseNotesService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CurlImporterServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CurlImporterServiceImpl.java
index e2e9870539..47ed7001d4 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CurlImporterServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CurlImporterServiceImpl.java
@@ -1,6 +1,8 @@
 package com.appsmith.server.services;
 
 import com.appsmith.server.helpers.ResponseUtils;
+import com.appsmith.server.newpages.base.NewPageService;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.services.ce.CurlImporterServiceCEImpl;
 import com.appsmith.server.solutions.PagePermission;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CustomJSLibService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CustomJSLibService.java
deleted file mode 100644
index 3526a2a9e6..0000000000
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CustomJSLibService.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.appsmith.server.services;
-
-import com.appsmith.server.services.ce.CustomJSLibServiceCE;
-
-public interface CustomJSLibService extends CustomJSLibServiceCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/DatasourceContextServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/DatasourceContextServiceImpl.java
index 0487b5ce72..1a686d1635 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/DatasourceContextServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/DatasourceContextServiceImpl.java
@@ -3,6 +3,7 @@ package com.appsmith.server.services;
 import com.appsmith.server.datasources.base.DatasourceService;
 import com.appsmith.server.datasourcestorages.base.DatasourceStorageService;
 import com.appsmith.server.helpers.PluginExecutorHelper;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.services.ce.DatasourceContextServiceCEImpl;
 import com.appsmith.server.solutions.DatasourcePermission;
 import lombok.extern.slf4j.Slf4j;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/EmailServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/EmailServiceImpl.java
index 6fa983232c..7e4d440d3a 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/EmailServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/EmailServiceImpl.java
@@ -1,12 +1,13 @@
 package com.appsmith.server.services;
 
+import com.appsmith.server.helpers.EmailServiceHelper;
 import com.appsmith.server.notifications.EmailSender;
 import com.appsmith.server.services.ce.EmailServiceCEImpl;
 import org.springframework.stereotype.Service;
 
 @Service
 public class EmailServiceImpl extends EmailServiceCEImpl implements EmailService {
-    public EmailServiceImpl(EmailSender emailSender, TenantService tenantService) {
-        super(emailSender, tenantService);
+    public EmailServiceImpl(EmailSender emailSender, EmailServiceHelper emailServiceHelper) {
+        super(emailSender, emailServiceHelper);
     }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/GitServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/GitServiceImpl.java
index bfab81d384..701276a854 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/GitServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/GitServiceImpl.java
@@ -2,18 +2,21 @@ package com.appsmith.server.services;
 
 import com.appsmith.external.git.GitExecutor;
 import com.appsmith.git.service.GitExecutorImpl;
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.configurations.EmailConfig;
 import com.appsmith.server.datasources.base.DatasourceService;
+import com.appsmith.server.export.internal.ImportExportApplicationService;
 import com.appsmith.server.helpers.GitFileUtils;
 import com.appsmith.server.helpers.GitPrivateRepoHelper;
 import com.appsmith.server.helpers.RedisUtils;
 import com.appsmith.server.helpers.ResponseUtils;
 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.GitDeployKeysRepository;
 import com.appsmith.server.services.ce.GitServiceCEImpl;
 import com.appsmith.server.solutions.ApplicationPermission;
 import com.appsmith.server.solutions.DatasourcePermission;
-import com.appsmith.server.solutions.ImportExportApplicationService;
 import io.micrometer.observation.ObservationRegistry;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Import;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ItemServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ItemServiceImpl.java
index cf09c976d8..fd12f36beb 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ItemServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ItemServiceImpl.java
@@ -1,6 +1,7 @@
 package com.appsmith.server.services;
 
 import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.services.ce.ItemServiceCEImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
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 4a5df4b8a4..2ecbd42872 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
@@ -1,8 +1,10 @@
 package com.appsmith.server.services;
 
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.datasources.base.DatasourceService;
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.onpageload.internal.PageLoadExecutablesUtil;
 import com.appsmith.server.services.ce.LayoutActionServiceCEImpl;
 import com.appsmith.server.solutions.ActionPermission;
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 b85ddfb00b..9a6488340f 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
@@ -1,7 +1,9 @@
 package com.appsmith.server.services;
 
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.repositories.ActionCollectionRepository;
 import com.appsmith.server.services.ce.LayoutCollectionServiceCEImpl;
 import com.appsmith.server.solutions.ActionPermission;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutServiceImpl.java
index db46f8d67d..73b9f920cf 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutServiceImpl.java
@@ -1,6 +1,7 @@
 package com.appsmith.server.services;
 
 import com.appsmith.server.helpers.ResponseUtils;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.services.ce.LayoutServiceCEImpl;
 import com.appsmith.server.solutions.PagePermission;
 import lombok.extern.slf4j.Slf4j;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewPageService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewPageService.java
deleted file mode 100644
index 134bb936d5..0000000000
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewPageService.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.appsmith.server.services;
-
-import com.appsmith.server.services.ce.NewPageServiceCE;
-
-public interface NewPageService extends NewPageServiceCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PermissionGroupService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PermissionGroupService.java
index 2aec6a1f3e..d7c617be5d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PermissionGroupService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PermissionGroupService.java
@@ -1,5 +1,5 @@
 package com.appsmith.server.services;
 
-import com.appsmith.server.services.ce.PermissionGroupServiceCE;
+import com.appsmith.server.services.ce_compatible.PermissionGroupServiceCECompatible;
 
-public interface PermissionGroupService extends PermissionGroupServiceCE {}
+public interface PermissionGroupService extends PermissionGroupServiceCECompatible {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PermissionGroupServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PermissionGroupServiceImpl.java
index 826f7290da..76a4083f31 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PermissionGroupServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PermissionGroupServiceImpl.java
@@ -3,7 +3,7 @@ package com.appsmith.server.services;
 import com.appsmith.server.repositories.ConfigRepository;
 import com.appsmith.server.repositories.PermissionGroupRepository;
 import com.appsmith.server.repositories.UserRepository;
-import com.appsmith.server.services.ce.PermissionGroupServiceCEImpl;
+import com.appsmith.server.services.ce_compatible.PermissionGroupServiceCECompatibleImpl;
 import com.appsmith.server.solutions.PermissionGroupPermission;
 import com.appsmith.server.solutions.PolicySolution;
 import jakarta.validation.Validator;
@@ -13,7 +13,8 @@ import org.springframework.stereotype.Service;
 import reactor.core.scheduler.Scheduler;
 
 @Service
-public class PermissionGroupServiceImpl extends PermissionGroupServiceCEImpl implements PermissionGroupService {
+public class PermissionGroupServiceImpl extends PermissionGroupServiceCECompatibleImpl
+        implements PermissionGroupService {
 
     public PermissionGroupServiceImpl(
             Scheduler scheduler,
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PluginService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PluginService.java
deleted file mode 100644
index 88d903f95f..0000000000
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PluginService.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.appsmith.server.services;
-
-import com.appsmith.server.services.ce.PluginServiceCE;
-
-public interface PluginService extends PluginServiceCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PostmanImporterServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PostmanImporterServiceImpl.java
index f3aff415a7..d511ea21e2 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PostmanImporterServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PostmanImporterServiceImpl.java
@@ -1,6 +1,7 @@
 package com.appsmith.server.services;
 
 import com.appsmith.server.helpers.ResponseUtils;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.services.ce.PostmanImporterServiceCEImpl;
 import com.appsmith.server.solutions.PagePermission;
 import lombok.extern.slf4j.Slf4j;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ThemeService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ThemeService.java
deleted file mode 100644
index 1c3f843c51..0000000000
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ThemeService.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.appsmith.server.services;
-
-import com.appsmith.server.services.ce.ThemeServiceCE;
-
-public interface ThemeService extends ThemeServiceCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java
index 9f53632fe7..ffd2131688 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java
@@ -3,6 +3,7 @@ package com.appsmith.server.services;
 import com.appsmith.external.services.EncryptionService;
 import com.appsmith.server.configurations.CommonConfig;
 import com.appsmith.server.configurations.EmailConfig;
+import com.appsmith.server.helpers.UserServiceHelper;
 import com.appsmith.server.helpers.UserUtils;
 import com.appsmith.server.notifications.EmailSender;
 import com.appsmith.server.ratelimiting.RateLimitService;
@@ -50,7 +51,8 @@ public class UserServiceImpl extends UserServiceCECompatibleImpl implements User
             EmailVerificationTokenRepository emailVerificationTokenRepository,
             EmailService emailService,
             RateLimitService rateLimitService,
-            PACConfigurationService pacConfigurationService) {
+            PACConfigurationService pacConfigurationService,
+            UserServiceHelper userServiceHelper) {
         super(
                 scheduler,
                 validator,
@@ -62,20 +64,16 @@ public class UserServiceImpl extends UserServiceCECompatibleImpl implements User
                 sessionUserService,
                 passwordResetTokenRepository,
                 passwordEncoder,
-                emailSender,
-                applicationRepository,
-                policySolution,
                 commonConfig,
-                emailConfig,
                 userChangedHandler,
                 encryptionService,
                 userDataService,
                 tenantService,
-                permissionGroupService,
                 userUtils,
                 emailVerificationTokenRepository,
                 emailService,
                 rateLimitService,
-                pacConfigurationService);
+                pacConfigurationService,
+                userServiceHelper);
     }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/WorkspaceServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/WorkspaceServiceImpl.java
index 68f27aac6b..b9c3ebc09b 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/WorkspaceServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/WorkspaceServiceImpl.java
@@ -1,5 +1,6 @@
 package com.appsmith.server.services;
 
+import com.appsmith.server.helpers.WorkspaceServiceHelper;
 import com.appsmith.server.repositories.ApplicationRepository;
 import com.appsmith.server.repositories.AssetRepository;
 import com.appsmith.server.repositories.PluginRepository;
@@ -36,7 +37,8 @@ public class WorkspaceServiceImpl extends WorkspaceServiceCEImpl implements Work
             PolicySolution policySolution,
             ModelMapper modelMapper,
             WorkspacePermission workspacePermission,
-            PermissionGroupPermission permissionGroupPermission) {
+            PermissionGroupPermission permissionGroupPermission,
+            WorkspaceServiceHelper workspaceServiceHelper) {
 
         super(
                 scheduler,
@@ -54,6 +56,7 @@ public class WorkspaceServiceImpl extends WorkspaceServiceCEImpl implements Work
                 policySolution,
                 modelMapper,
                 workspacePermission,
-                permissionGroupPermission);
+                permissionGroupPermission,
+                workspaceServiceHelper);
     }
 }
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 abcb1fff0d..bc34c133db 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
@@ -10,6 +10,7 @@ import com.appsmith.external.models.PluginType;
 import com.appsmith.external.models.Policy;
 import com.appsmith.server.acl.AclPermission;
 import com.appsmith.server.acl.PolicyGenerator;
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.domains.ActionCollection;
 import com.appsmith.server.domains.Application;
@@ -37,26 +38,25 @@ import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.helpers.UserPermissionUtils;
 import com.appsmith.server.migrations.ApplicationVersion;
 import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.repositories.ActionCollectionRepository;
 import com.appsmith.server.repositories.ApplicationRepository;
 import com.appsmith.server.repositories.DatasourceRepository;
 import com.appsmith.server.repositories.NewActionRepository;
 import com.appsmith.server.repositories.NewPageRepository;
 import com.appsmith.server.repositories.WorkspaceRepository;
-import com.appsmith.server.services.ActionCollectionService;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.LayoutActionService;
-import com.appsmith.server.services.NewPageService;
 import com.appsmith.server.services.PermissionGroupService;
 import com.appsmith.server.services.SessionUserService;
-import com.appsmith.server.services.ThemeService;
 import com.appsmith.server.services.WorkspaceService;
 import com.appsmith.server.solutions.ActionPermission;
 import com.appsmith.server.solutions.ApplicationPermission;
 import com.appsmith.server.solutions.DatasourcePermission;
 import com.appsmith.server.solutions.PagePermission;
 import com.appsmith.server.solutions.WorkspacePermission;
+import com.appsmith.server.themes.base.ThemeService;
 import com.google.common.base.Strings;
 import com.mongodb.bulk.BulkWriteResult;
 import com.mongodb.client.result.UpdateResult;
@@ -64,6 +64,7 @@ import jakarta.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.bson.types.ObjectId;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.reactive.TransactionalOperator;
 import org.springframework.util.StringUtils;
 import reactor.core.publisher.Flux;
@@ -88,6 +89,7 @@ import static org.apache.commons.lang.ObjectUtils.defaultIfNull;
 
 @Slf4j
 @RequiredArgsConstructor
+@Service
 public class ApplicationPageServiceCEImpl implements ApplicationPageServiceCE {
 
     private final WorkspaceService workspaceService;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationServiceCEImpl.java
index f57877907f..d04373096e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationServiceCEImpl.java
@@ -46,6 +46,7 @@ import org.springframework.dao.DuplicateKeyException;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.http.codec.multipart.Part;
+import org.springframework.stereotype.Service;
 import org.springframework.util.MultiValueMap;
 import org.springframework.util.StringUtils;
 import reactor.core.publisher.Flux;
@@ -68,6 +69,7 @@ import static com.appsmith.server.constants.Constraint.MAX_LOGO_SIZE_KB;
 import static org.apache.commons.lang3.StringUtils.isBlank;
 
 @Slf4j
+@Service
 public class ApplicationServiceCEImpl extends BaseService<ApplicationRepository, Application, String>
         implements ApplicationServiceCE {
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationSnapshotServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationSnapshotServiceCEImpl.java
index 09eeb4d230..29e45f38ff 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationSnapshotServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationSnapshotServiceCEImpl.java
@@ -7,11 +7,11 @@ import com.appsmith.server.domains.ApplicationSnapshot;
 import com.appsmith.server.dtos.ApplicationJson;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.export.internal.ImportExportApplicationService;
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.repositories.ApplicationSnapshotRepository;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.solutions.ApplicationPermission;
-import com.appsmith.server.solutions.ImportExportApplicationService;
 import com.google.gson.Gson;
 import lombok.RequiredArgsConstructor;
 import reactor.core.publisher.Flux;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationTemplateServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationTemplateServiceCEImpl.java
index dd3e7c52ad..673e7178e5 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationTemplateServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationTemplateServiceCEImpl.java
@@ -10,12 +10,12 @@ import com.appsmith.server.domains.UserData;
 import com.appsmith.server.dtos.*;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.export.internal.ImportExportApplicationService;
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.UserDataService;
 import com.appsmith.server.solutions.ApplicationPermission;
-import com.appsmith.server.solutions.ImportExportApplicationService;
 import com.appsmith.server.solutions.ReleaseNotesService;
 import com.appsmith.util.WebClientUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CacheableFeatureFlagHelperCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CacheableFeatureFlagHelperCEImpl.java
index fb1d601ec3..45aab7808c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CacheableFeatureFlagHelperCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CacheableFeatureFlagHelperCEImpl.java
@@ -15,6 +15,7 @@ import com.appsmith.server.featureflags.CachedFeatures;
 import com.appsmith.server.featureflags.CachedFlags;
 import com.appsmith.server.featureflags.FeatureFlagIdentityTraits;
 import com.appsmith.server.helpers.CollectionUtils;
+import com.appsmith.server.helpers.SignatureVerifier;
 import com.appsmith.server.repositories.TenantRepository;
 import com.appsmith.server.services.ConfigService;
 import com.appsmith.server.services.UserIdentifierService;
@@ -24,6 +25,10 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatusCode;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.reactive.function.BodyInserters;
 import reactor.core.publisher.Mono;
 
@@ -31,8 +36,10 @@ import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
+import static com.appsmith.server.constants.ApiConstants.CLOUD_SERVICES_SIGNATURE;
 import static com.appsmith.server.constants.ce.FieldNameCE.DEFAULT;
 
 @Slf4j
@@ -212,17 +219,30 @@ public class CacheableFeatureFlagHelperCEImpl implements CacheableFeatureFlagHel
      */
     @Override
     public Mono<FeaturesResponseDTO> getRemoteFeaturesForTenant(FeaturesRequestDTO featuresRequestDTO) {
-        return WebClientUtils.create(cloudServicesConfig.getBaseUrlWithSignatureVerification())
+        Mono<ResponseEntity<ResponseDTO<FeaturesResponseDTO>>> responseEntityMono = WebClientUtils.create(
+                        cloudServicesConfig.getBaseUrlWithSignatureVerification())
                 .post()
                 .uri("/api/v1/business-features")
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON)
                 .body(BodyInserters.fromValue(featuresRequestDTO))
-                .exchangeToMono(clientResponse -> {
-                    if (clientResponse.statusCode().is2xxSuccessful()) {
-                        return clientResponse.bodyToMono(
-                                new ParameterizedTypeReference<ResponseDTO<FeaturesResponseDTO>>() {});
-                    } else {
-                        return clientResponse.createError();
+                .retrieve()
+                .onStatus(
+                        HttpStatusCode::isError,
+                        response -> Mono.error(new AppsmithException(
+                                AppsmithError.CLOUD_SERVICES_ERROR,
+                                "unable to connect to cloud-services with error status ",
+                                response.statusCode())))
+                .toEntity(new ParameterizedTypeReference<>() {});
+
+        return responseEntityMono
+                .flatMap(entity -> {
+                    HttpHeaders headers = entity.getHeaders();
+                    if (!SignatureVerifier.isSignatureValid(headers)) {
+                        return Mono.error(
+                                new AppsmithException(AppsmithError.INVALID_PARAMETER, CLOUD_SERVICES_SIGNATURE));
                     }
+                    return Mono.just(Objects.requireNonNull(entity.getBody()));
                 })
                 .map(ResponseDTO::getData)
                 .onErrorMap(
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 b146c343e5..e7127297f4 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
@@ -11,10 +11,10 @@ import com.appsmith.server.domains.Plugin;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.ResponseUtils;
+import com.appsmith.server.newpages.base.NewPageService;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.services.BaseApiImporter;
 import com.appsmith.server.services.LayoutActionService;
-import com.appsmith.server.services.NewPageService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.solutions.PagePermission;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/DatasourceContextServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/DatasourceContextServiceCEImpl.java
index 6b47ded978..5594ad7cb6 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/DatasourceContextServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/DatasourceContextServiceCEImpl.java
@@ -13,8 +13,8 @@ import com.appsmith.server.domains.DatasourceContext;
 import com.appsmith.server.domains.DatasourceContextIdentifier;
 import com.appsmith.server.domains.Plugin;
 import com.appsmith.server.helpers.PluginExecutorHelper;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.services.ConfigService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.solutions.DatasourcePermission;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/EmailServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/EmailServiceCEImpl.java
index bab662d65a..95571ce473 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/EmailServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/EmailServiceCEImpl.java
@@ -2,12 +2,12 @@ package com.appsmith.server.services.ce;
 
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.domains.PermissionGroup;
-import com.appsmith.server.domains.TenantConfiguration;
 import com.appsmith.server.domains.User;
 import com.appsmith.server.domains.Workspace;
+import com.appsmith.server.helpers.EmailServiceHelper;
 import com.appsmith.server.notifications.EmailSender;
-import com.appsmith.server.services.TenantService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;
 
 import java.net.URLEncoder;
@@ -17,26 +17,28 @@ import java.util.Map;
 
 import static com.appsmith.server.constants.ce.EmailConstantsCE.*;
 
+@Component
 public class EmailServiceCEImpl implements EmailServiceCE {
     private final EmailSender emailSender;
-    private final TenantService tenantService;
 
-    public EmailServiceCEImpl(EmailSender emailSender, TenantService tenantService) {
+    private final EmailServiceHelper emailServiceHelper;
+
+    public EmailServiceCEImpl(EmailSender emailSender, EmailServiceHelper emailServiceHelper) {
         this.emailSender = emailSender;
-        this.tenantService = tenantService;
+        this.emailServiceHelper = emailServiceHelper;
     }
 
     @Override
     public Mono<Boolean> sendForgotPasswordEmail(String email, String resetUrl, String originHeader) {
         Map<String, String> params = new HashMap<>();
         params.put(RESET_URL, resetUrl);
-        return this.enrichParams(params)
-                .flatMap(enrichedParams -> this.enrichWithBrandParams(enrichedParams, originHeader)
-                        .flatMap(updatedParams -> emailSender.sendMail(
-                                email,
-                                String.format(FORGOT_PASSWORD_EMAIL_SUBJECT, updatedParams.get(INSTANCE_NAME)),
-                                getForgotPasswordTemplate(),
-                                updatedParams)));
+        return emailServiceHelper
+                .enrichWithBrandParams(params, originHeader)
+                .flatMap(updatedParams -> emailSender.sendMail(
+                        email,
+                        String.format(FORGOT_PASSWORD_EMAIL_SUBJECT, updatedParams.get(INSTANCE_NAME)),
+                        emailServiceHelper.getForgotPasswordTemplate(),
+                        updatedParams));
     }
 
     @Override
@@ -56,23 +58,26 @@ public class EmailServiceCEImpl implements EmailServiceCE {
         String emailSubject = String.format(WORKSPACE_EMAIL_SUBJECT_FOR_NEW_USER, workspaceInvitedTo.getName());
         Map<String, String> params = getInviteToWorkspaceEmailParams(
                 workspaceInvitedTo, invitingUser, inviteUrl, assignedPermissionGroup.getName(), isNewUser);
-        return this.enrichParams(params).flatMap(enrichedParams -> this.enrichWithBrandParams(
-                        enrichedParams, originHeader)
+        return emailServiceHelper
+                .enrichWithBrandParams(params, originHeader)
                 .flatMap(updatedParams -> emailSender.sendMail(
-                        invitedUser.getEmail(), emailSubject, getWorkspaceInviteTemplate(isNewUser), updatedParams)));
+                        invitedUser.getEmail(),
+                        emailSubject,
+                        emailServiceHelper.getWorkspaceInviteTemplate(isNewUser),
+                        updatedParams));
     }
 
     @Override
     public Mono<Boolean> sendEmailVerificationEmail(User user, String verificationURL, String originHeader) {
         Map<String, String> params = new HashMap<>();
         params.put(EMAIL_VERIFICATION_URL, verificationURL);
-        return this.enrichParams(params)
-                .flatMap(enrichedParams -> this.enrichWithBrandParams(enrichedParams, originHeader)
-                        .flatMap(updatedParams -> emailSender.sendMail(
-                                user.getEmail(),
-                                EMAIL_VERIFICATION_EMAIL_SUBJECT,
-                                getEmailVerificationTemplate(),
-                                updatedParams)));
+        return emailServiceHelper
+                .enrichWithBrandParams(params, originHeader)
+                .flatMap(updatedParams -> emailSender.sendMail(
+                        user.getEmail(),
+                        EMAIL_VERIFICATION_EMAIL_SUBJECT,
+                        emailServiceHelper.getEmailVerificationTemplate(),
+                        updatedParams));
     }
 
     @Override
@@ -93,45 +98,15 @@ public class EmailServiceCEImpl implements EmailServiceCE {
         if (invitingUser != null) {
             params.put(INVITER_FIRST_NAME, StringUtils.defaultIfEmpty(invitingUser.getName(), invitingUser.getEmail()));
         }
-        return this.enrichParams(params)
-                .flatMap(enrichedParams -> this.enrichWithBrandParams(enrichedParams, originHeader))
+        return emailServiceHelper
+                .enrichWithBrandParams(params, originHeader)
                 .flatMap(updatedParams -> emailSender.sendMail(
                         invitedUser.getEmail(),
                         String.format(INSTANCE_ADMIN_INVITE_EMAIL_SUBJECT),
-                        getAdminInstanceInviteTemplate(),
+                        emailServiceHelper.getAdminInstanceInviteTemplate(),
                         updatedParams));
     }
 
-    protected Mono<Map<String, String>> enrichParams(Map<String, String> params) {
-        return tenantService.getDefaultTenant().map(tenant -> {
-            final TenantConfiguration tenantConfiguration = tenant.getTenantConfiguration();
-            params.put(INSTANCE_NAME, StringUtils.defaultIfEmpty(tenantConfiguration.getInstanceName(), "Appsmith"));
-            return params;
-        });
-    }
-
-    protected Mono<Map<String, String>> enrichWithBrandParams(Map<String, String> params, String origin) {
-        return Mono.just(params);
-    }
-
-    protected String getForgotPasswordTemplate() {
-        return FORGOT_PASSWORD_TEMPLATE_CE;
-    }
-
-    protected String getWorkspaceInviteTemplate(boolean isNewUser) {
-        if (isNewUser) return INVITE_WORKSPACE_TEMPLATE_NEW_USER_CE;
-
-        return INVITE_WORKSPACE_TEMPLATE_EXISTING_USER_CE;
-    }
-
-    protected String getEmailVerificationTemplate() {
-        return EMAIL_VERIFICATION_EMAIL_TEMPLATE_CE;
-    }
-
-    protected String getAdminInstanceInviteTemplate() {
-        return INSTANCE_ADMIN_INVITE_EMAIL_TEMPLATE;
-    }
-
     private Map<String, String> getInviteToWorkspaceEmailParams(
             Workspace workspace, User inviter, String inviteUrl, String roleType, boolean isNewUser) {
         Map<String, String> params = new HashMap<>();
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/FeatureFlagServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/FeatureFlagServiceCEImpl.java
index 9f4a8076d9..6c761ce537 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/FeatureFlagServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/FeatureFlagServiceCEImpl.java
@@ -18,6 +18,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.ff4j.FF4j;
 import org.ff4j.core.FlippingExecutionContext;
+import org.ff4j.exception.FeatureNotFoundException;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.util.function.Tuple2;
@@ -92,7 +93,18 @@ public class FeatureFlagServiceCEImpl implements FeatureFlagServiceCE {
 
     @Override
     public Boolean check(String featureName, User user) {
-        return ff4j.check(featureName, new FlippingExecutionContext(Map.of(FieldName.USER, user)));
+        try {
+            return ff4j.check(featureName, new FlippingExecutionContext(Map.of(FieldName.USER, user)));
+        } catch (Exception e) {
+            // FF4J is configured not to auto-generate a flag if it's not present in init-flags.xml
+            // (see FeatureFlagConfig.java).
+            // Consequently, we anticipate that the flag may not exist in the FF4J context and need to handle any
+            // related exceptions silently.
+            if (!(e instanceof FeatureNotFoundException)) {
+                log.error("Error checking feature flag: {}", featureName, e);
+            }
+        }
+        return false;
     }
 
     /**
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java
index 0e1f7e428a..0acc3b86b6 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java
@@ -11,6 +11,7 @@ import com.appsmith.external.models.Datasource;
 import com.appsmith.external.models.DatasourceStorage;
 import com.appsmith.git.service.GitExecutorImpl;
 import com.appsmith.server.acl.AclPermission;
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.configurations.EmailConfig;
 import com.appsmith.server.constants.Assets;
 import com.appsmith.server.constants.Entity;
@@ -37,6 +38,7 @@ import com.appsmith.server.dtos.GitMergeDTO;
 import com.appsmith.server.dtos.GitPullDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.export.internal.ImportExportApplicationService;
 import com.appsmith.server.helpers.CollectionUtils;
 import com.appsmith.server.helpers.GitDeployKeyGenerator;
 import com.appsmith.server.helpers.GitFileUtils;
@@ -46,20 +48,18 @@ import com.appsmith.server.helpers.RedisUtils;
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.migrations.JsonSchemaVersions;
 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.GitDeployKeysRepository;
-import com.appsmith.server.services.ActionCollectionService;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.ApplicationService;
-import com.appsmith.server.services.NewPageService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.services.UserDataService;
 import com.appsmith.server.services.UserService;
 import com.appsmith.server.services.WorkspaceService;
 import com.appsmith.server.solutions.ApplicationPermission;
 import com.appsmith.server.solutions.DatasourcePermission;
-import com.appsmith.server.solutions.ImportExportApplicationService;
 import io.micrometer.observation.ObservationRegistry;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ItemServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ItemServiceCEImpl.java
index 3a68f77c9b..c077ad3ace 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ItemServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ItemServiceCEImpl.java
@@ -11,10 +11,10 @@ import com.appsmith.server.dtos.ItemType;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.services.ApiTemplateService;
 import com.appsmith.server.services.LayoutActionService;
 import com.appsmith.server.services.MarketplaceService;
-import com.appsmith.server.services.PluginService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.MultiValueMap;
 import reactor.core.publisher.Flux;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCEImpl.java
index d50f55c2af..d2c17b5172 100644
--- 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
@@ -14,6 +14,7 @@ import com.appsmith.external.models.DefaultResources;
 import com.appsmith.external.models.Executable;
 import com.appsmith.external.models.PluginType;
 import com.appsmith.server.acl.AclPermission;
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.datasources.base.DatasourceService;
 import com.appsmith.server.domains.ExecutableDependencyEdge;
@@ -32,12 +33,11 @@ import com.appsmith.server.helpers.DefaultResourcesUtils;
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.helpers.WidgetSpecificUtils;
 import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.onpageload.internal.PageLoadExecutablesUtil;
-import com.appsmith.server.services.ActionCollectionService;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.CollectionService;
-import com.appsmith.server.services.NewPageService;
 import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.solutions.ActionPermission;
 import com.appsmith.server.solutions.PagePermission;
@@ -47,6 +47,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.minidev.json.JSONObject;
 import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -73,6 +74,7 @@ import static java.util.stream.Collectors.toSet;
 
 @Slf4j
 @RequiredArgsConstructor
+@Service
 public class LayoutActionServiceCEImpl implements LayoutActionServiceCE {
 
     private final ObjectMapper objectMapper;
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 49d2100092..585734acee 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
@@ -3,6 +3,7 @@ package com.appsmith.server.services.ce;
 import com.appsmith.external.helpers.AppsmithBeanUtils;
 import com.appsmith.external.models.ActionDTO;
 import com.appsmith.external.models.DefaultResources;
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.domains.ActionCollection;
 import com.appsmith.server.domains.Layout;
@@ -20,11 +21,10 @@ import com.appsmith.server.helpers.CollectionUtils;
 import com.appsmith.server.helpers.DefaultResourcesUtils;
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.repositories.ActionCollectionRepository;
-import com.appsmith.server.services.ActionCollectionService;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.LayoutActionService;
-import com.appsmith.server.services.NewPageService;
 import com.appsmith.server.solutions.ActionPermission;
 import com.appsmith.server.solutions.PagePermission;
 import com.appsmith.server.solutions.RefactoringSolution;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutServiceCEImpl.java
index 9cb365b038..fef8e84e97 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutServiceCEImpl.java
@@ -6,7 +6,7 @@ import com.appsmith.server.dtos.PageDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.ResponseUtils;
-import com.appsmith.server.services.NewPageService;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.solutions.PagePermission;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PermissionGroupServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PermissionGroupServiceCEImpl.java
index cbf5d237e3..30933db3af 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PermissionGroupServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PermissionGroupServiceCEImpl.java
@@ -21,6 +21,7 @@ import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.services.TenantService;
 import com.appsmith.server.solutions.PermissionGroupPermission;
 import com.appsmith.server.solutions.PolicySolution;
+import com.mongodb.client.result.UpdateResult;
 import jakarta.validation.Validator;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
@@ -172,9 +173,11 @@ public class PermissionGroupServiceCEImpl extends BaseService<PermissionGroupRep
                 .updateById(pg.getId(), pg, permissionGroupPermission.getAssignPermission())
                 .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND)));
 
-        return Mono.zip(
-                        permissionGroupUpdateMono,
-                        cleanPermissionGroupCacheForUsers(userIds).thenReturn(TRUE))
+        Mono<Boolean> clearCacheForUsersMono =
+                cleanPermissionGroupCacheForUsers(userIds).thenReturn(TRUE);
+
+        return permissionGroupUpdateMono
+                .zipWhen(updatedPermissionGroup -> clearCacheForUsersMono)
                 .map(tuple -> tuple.getT1());
     }
 
@@ -203,9 +206,12 @@ public class PermissionGroupServiceCEImpl extends BaseService<PermissionGroupRep
         ensureAssignedToUserIds(pg);
         List<String> userIds = users.stream().map(User::getId).collect(Collectors.toList());
         pg.getAssignedToUserIds().removeAll(userIds);
-        return Mono.zip(
-                        repository.updateById(pg.getId(), pg, permissionGroupPermission.getUnAssignPermission()),
-                        cleanPermissionGroupCacheForUsers(userIds).thenReturn(TRUE))
+        Mono<PermissionGroup> updatePermissionGroupMono =
+                repository.updateById(pg.getId(), pg, permissionGroupPermission.getUnAssignPermission());
+        Mono<Boolean> clearCacheForUsersMono =
+                cleanPermissionGroupCacheForUsers(userIds).thenReturn(TRUE);
+        return updatePermissionGroupMono
+                .zipWhen(updatedPermissionGroup -> clearCacheForUsersMono)
                 .map(tuple -> tuple.getT1());
     }
 
@@ -219,9 +225,12 @@ public class PermissionGroupServiceCEImpl extends BaseService<PermissionGroupRep
     Mono<PermissionGroup> bulkUnassignFromUserIds(PermissionGroup pg, List<String> userIds) {
         ensureAssignedToUserIds(pg);
         pg.getAssignedToUserIds().removeAll(userIds);
-        return Mono.zip(
-                        repository.updateById(pg.getId(), pg, permissionGroupPermission.getUnAssignPermission()),
-                        cleanPermissionGroupCacheForUsers(userIds).thenReturn(TRUE))
+        Mono<PermissionGroup> updatePermissionGroupMono =
+                repository.updateById(pg.getId(), pg, permissionGroupPermission.getUnAssignPermission());
+        Mono<Boolean> clearCacheForUsersMono =
+                cleanPermissionGroupCacheForUsers(userIds).thenReturn(TRUE);
+        return updatePermissionGroupMono
+                .zipWhen(updatedPermissionGroup -> clearCacheForUsersMono)
                 .map(tuple -> tuple.getT1());
     }
 
@@ -239,9 +248,11 @@ public class PermissionGroupServiceCEImpl extends BaseService<PermissionGroupRep
 
                     updateObj.set(path, assignedToUserIds);
 
-                    return Mono.zip(
-                                    repository.updateById(pg.getId(), updateObj),
-                                    cleanPermissionGroupCacheForUsers(List.copyOf(userIds)))
+                    Mono<UpdateResult> updatePermissionGroupResultMono = repository.updateById(pg.getId(), updateObj);
+                    Mono<Void> clearCacheForUsersMono = cleanPermissionGroupCacheForUsers(List.copyOf(userIds));
+
+                    return updatePermissionGroupResultMono
+                            .zipWhen(updatedPermissionGroupResult -> clearCacheForUsersMono)
                             .map(tuple -> tuple.getT1());
                 })
                 .then(Mono.just(TRUE));
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PostmanImporterServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PostmanImporterServiceCEImpl.java
index 2375c9c6fd..eca4fd13c3 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PostmanImporterServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PostmanImporterServiceCEImpl.java
@@ -8,8 +8,8 @@ import com.appsmith.external.models.DatasourceConfiguration;
 import com.appsmith.external.models.Property;
 import com.appsmith.external.models.TemplateCollection;
 import com.appsmith.server.helpers.ResponseUtils;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.services.BaseApiImporter;
-import com.appsmith.server.services.NewPageService;
 import com.appsmith.server.solutions.PagePermission;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpMethod;
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 f412879c08..cef13ad126 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,24 +1,20 @@
 package com.appsmith.server.services.ce;
 
 import com.appsmith.external.helpers.AppsmithBeanUtils;
-import com.appsmith.external.models.Policy;
 import com.appsmith.external.services.EncryptionService;
 import com.appsmith.server.acl.AclPermission;
 import com.appsmith.server.configurations.CommonConfig;
-import com.appsmith.server.configurations.EmailConfig;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.constants.RateLimitConstants;
 import com.appsmith.server.domains.EmailVerificationToken;
 import com.appsmith.server.domains.LoginSource;
 import com.appsmith.server.domains.PasswordResetToken;
-import com.appsmith.server.domains.PermissionGroup;
 import com.appsmith.server.domains.QUser;
 import com.appsmith.server.domains.User;
 import com.appsmith.server.domains.UserData;
 import com.appsmith.server.domains.Workspace;
 import com.appsmith.server.dtos.EmailTokenDTO;
 import com.appsmith.server.dtos.InviteUsersDTO;
-import com.appsmith.server.dtos.Permission;
 import com.appsmith.server.dtos.ResendEmailVerificationDTO;
 import com.appsmith.server.dtos.ResetUserPasswordDTO;
 import com.appsmith.server.dtos.UserProfileDTO;
@@ -26,11 +22,10 @@ import com.appsmith.server.dtos.UserSignupDTO;
 import com.appsmith.server.dtos.UserUpdateDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.helpers.UserServiceHelper;
 import com.appsmith.server.helpers.UserUtils;
 import com.appsmith.server.helpers.ValidationUtils;
-import com.appsmith.server.notifications.EmailSender;
 import com.appsmith.server.ratelimiting.RateLimitService;
-import com.appsmith.server.repositories.ApplicationRepository;
 import com.appsmith.server.repositories.EmailVerificationTokenRepository;
 import com.appsmith.server.repositories.PasswordResetTokenRepository;
 import com.appsmith.server.repositories.UserRepository;
@@ -38,12 +33,10 @@ import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.BaseService;
 import com.appsmith.server.services.EmailService;
 import com.appsmith.server.services.PACConfigurationService;
-import com.appsmith.server.services.PermissionGroupService;
 import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.services.TenantService;
 import com.appsmith.server.services.UserDataService;
 import com.appsmith.server.services.WorkspaceService;
-import com.appsmith.server.solutions.PolicySolution;
 import com.appsmith.server.solutions.UserChangedHandler;
 import jakarta.validation.Validator;
 import lombok.extern.slf4j.Slf4j;
@@ -106,18 +99,18 @@ public class UserServiceCEImpl extends BaseService<UserRepository, User, String>
 
     private final PasswordEncoder passwordEncoder;
 
-    private final PolicySolution policySolution;
     private final CommonConfig commonConfig;
     private final UserChangedHandler userChangedHandler;
     private final EncryptionService encryptionService;
     private final UserDataService userDataService;
     private final TenantService tenantService;
-    private final PermissionGroupService permissionGroupService;
     private final UserUtils userUtils;
     private final EmailService emailService;
     private final RateLimitService rateLimitService;
     private final PACConfigurationService pacConfigurationService;
 
+    private final UserServiceHelper userPoliciesComputeHelper;
+
     private static final WebFilterChain EMPTY_WEB_FILTER_CHAIN = serverWebExchange -> Mono.empty();
     private static final String FORGOT_PASSWORD_CLIENT_URL_FORMAT = "%s/user/resetPassword?token=%s";
     private static final Pattern ALLOWED_ACCENTED_CHARACTERS_PATTERN = Pattern.compile("^[\\p{L} 0-9 .\'\\-]+$");
@@ -142,38 +135,33 @@ public class UserServiceCEImpl extends BaseService<UserRepository, User, String>
             SessionUserService sessionUserService,
             PasswordResetTokenRepository passwordResetTokenRepository,
             PasswordEncoder passwordEncoder,
-            EmailSender emailSender,
-            ApplicationRepository applicationRepository,
-            PolicySolution policySolution,
             CommonConfig commonConfig,
-            EmailConfig emailConfig,
             UserChangedHandler userChangedHandler,
             EncryptionService encryptionService,
             UserDataService userDataService,
             TenantService tenantService,
-            PermissionGroupService permissionGroupService,
             UserUtils userUtils,
             EmailVerificationTokenRepository emailVerificationTokenRepository,
             EmailService emailService,
             RateLimitService rateLimitService,
-            PACConfigurationService pacConfigurationService) {
+            PACConfigurationService pacConfigurationService,
+            UserServiceHelper userServiceHelper) {
 
         super(scheduler, validator, mongoConverter, reactiveMongoTemplate, repository, analyticsService);
         this.workspaceService = workspaceService;
         this.sessionUserService = sessionUserService;
         this.passwordResetTokenRepository = passwordResetTokenRepository;
         this.passwordEncoder = passwordEncoder;
-        this.policySolution = policySolution;
         this.commonConfig = commonConfig;
         this.userChangedHandler = userChangedHandler;
         this.encryptionService = encryptionService;
         this.userDataService = userDataService;
         this.tenantService = tenantService;
-        this.permissionGroupService = permissionGroupService;
         this.userUtils = userUtils;
         this.rateLimitService = rateLimitService;
         this.emailVerificationTokenRepository = emailVerificationTokenRepository;
         this.emailService = emailService;
+        this.userPoliciesComputeHelper = userServiceHelper;
         this.pacConfigurationService = pacConfigurationService;
     }
 
@@ -423,8 +411,12 @@ public class UserServiceCEImpl extends BaseService<UserRepository, User, String>
                                                 .subscribe();
 
                                         // we reset the counter for user's login attempts once password is reset
-                                        rateLimitService.resetCounter(
-                                                RateLimitConstants.BUCKET_KEY_FOR_LOGIN_API, userFromDb.getEmail());
+                                        rateLimitService
+                                                .resetCounter(
+                                                        RateLimitConstants.BUCKET_KEY_FOR_LOGIN_API,
+                                                        userFromDb.getEmail())
+                                                .subscribeOn(Schedulers.boundedElastic())
+                                                .subscribe();
                                     })
                                     .thenReturn(true);
                         }));
@@ -471,31 +463,8 @@ public class UserServiceCEImpl extends BaseService<UserRepository, User, String>
                 .flatMap(tuple -> analyticsService.identifyUser(tuple.getT1(), tuple.getT2()));
     }
 
-    protected Mono<User> addUserPolicies(User savedUser) {
-
-        // Create user management permission group
-        PermissionGroup userManagementPermissionGroup = new PermissionGroup();
-        userManagementPermissionGroup.setName(savedUser.getUsername() + FieldName.SUFFIX_USER_MANAGEMENT_ROLE);
-        // Add CRUD permissions for user to the group
-        userManagementPermissionGroup.setPermissions(Set.of(new Permission(savedUser.getId(), MANAGE_USERS)));
-        userManagementPermissionGroup.setDefaultDomainType(User.class.getSimpleName());
-        userManagementPermissionGroup.setDefaultDomainId(savedUser.getId());
-
-        // Assign the permission group to the user
-        userManagementPermissionGroup.setAssignedToUserIds(Set.of(savedUser.getId()));
-
-        return permissionGroupService.save(userManagementPermissionGroup).map(savedPermissionGroup -> {
-            Map<String, Policy> crudUserPolicies =
-                    policySolution.generatePolicyFromPermissionGroupForObject(savedPermissionGroup, savedUser.getId());
-
-            User updatedWithPolicies = policySolution.addPoliciesToExistingObject(crudUserPolicies, savedUser);
-
-            return updatedWithPolicies;
-        });
-    }
-
     private Mono<User> addUserPoliciesAndSaveToRepo(User user) {
-        return addUserPolicies(user).flatMap(repository::save);
+        return userPoliciesComputeHelper.addPoliciesToUser(user).flatMap(repository::save);
     }
 
     @Override
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserWorkspaceServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserWorkspaceServiceCEImpl.java
index ae717c2071..01ec083329 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserWorkspaceServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserWorkspaceServiceCEImpl.java
@@ -25,6 +25,7 @@ import com.appsmith.server.solutions.WorkspacePermission;
 import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 import reactor.core.publisher.Flux;
@@ -43,6 +44,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Slf4j
+@Service
 public class UserWorkspaceServiceCEImpl implements UserWorkspaceServiceCE {
     private final SessionUserService sessionUserService;
     private final WorkspaceRepository workspaceRepository;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCE.java
index 90f8f640a3..438144a97a 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCE.java
@@ -43,7 +43,5 @@ public interface WorkspaceServiceCE extends CrudService<Workspace, String> {
 
     Mono<Workspace> archiveById(String s);
 
-    Mono<Boolean> isCreateWorkspaceAllowed(Boolean isDefaultWorkspace);
-
     Mono<String> getDefaultEnvironmentId(String workspaceId, AclPermission aclPermission);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java
index 622acd1a82..1daa46f183 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java
@@ -18,6 +18,7 @@ import com.appsmith.server.dtos.WorkspacePluginStatus;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.TextUtils;
+import com.appsmith.server.helpers.WorkspaceServiceHelper;
 import com.appsmith.server.repositories.ApplicationRepository;
 import com.appsmith.server.repositories.AssetRepository;
 import com.appsmith.server.repositories.PluginRepository;
@@ -42,6 +43,7 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.http.codec.multipart.Part;
+import org.springframework.stereotype.Service;
 import org.springframework.util.MultiValueMap;
 import org.springframework.util.StringUtils;
 import reactor.core.publisher.Flux;
@@ -74,6 +76,7 @@ import static com.appsmith.server.repositories.ce.BaseAppsmithRepositoryCEImpl.f
 import static java.lang.Boolean.TRUE;
 
 @Slf4j
+@Service
 public class WorkspaceServiceCEImpl extends BaseService<WorkspaceRepository, Workspace, String>
         implements WorkspaceServiceCE {
 
@@ -87,6 +90,7 @@ public class WorkspaceServiceCEImpl extends BaseService<WorkspaceRepository, Wor
     private final ModelMapper modelMapper;
     private final WorkspacePermission workspacePermission;
     private final PermissionGroupPermission permissionGroupPermission;
+    private final WorkspaceServiceHelper workspaceServiceHelper;
 
     @Autowired
     public WorkspaceServiceCEImpl(
@@ -105,7 +109,8 @@ public class WorkspaceServiceCEImpl extends BaseService<WorkspaceRepository, Wor
             PolicySolution policySolution,
             ModelMapper modelMapper,
             WorkspacePermission workspacePermission,
-            PermissionGroupPermission permissionGroupPermission) {
+            PermissionGroupPermission permissionGroupPermission,
+            WorkspaceServiceHelper workspaceServiceHelper) {
 
         super(scheduler, validator, mongoConverter, reactiveMongoTemplate, repository, analyticsService);
         this.pluginRepository = pluginRepository;
@@ -118,6 +123,7 @@ public class WorkspaceServiceCEImpl extends BaseService<WorkspaceRepository, Wor
         this.modelMapper = modelMapper;
         this.workspacePermission = workspacePermission;
         this.permissionGroupPermission = permissionGroupPermission;
+        this.workspaceServiceHelper = workspaceServiceHelper;
     }
 
     @Override
@@ -168,7 +174,7 @@ public class WorkspaceServiceCEImpl extends BaseService<WorkspaceRepository, Wor
         }
 
         // Does the user have permissions to create a workspace?
-        Mono<Boolean> createWorkspaceAllowedMono = isCreateWorkspaceAllowed(isDefault);
+        Mono<Boolean> createWorkspaceAllowedMono = workspaceServiceHelper.isCreateWorkspaceAllowed(isDefault);
 
         // Populate all the required fields for a valid workspace
         prepareWorkspaceToCreate(workspace, user);
@@ -233,11 +239,6 @@ public class WorkspaceServiceCEImpl extends BaseService<WorkspaceRepository, Wor
         return repository.save(createdWorkspace);
     }
 
-    @Override
-    public Mono<Boolean> isCreateWorkspaceAllowed(Boolean isDefaultWorkspace) {
-        return Mono.just(TRUE);
-    }
-
     @Override
     public Mono<String> getDefaultEnvironmentId(String workspaceId, AclPermission aclPermission) {
         return Mono.just(FieldName.UNUSED_ENVIRONMENT_ID);
@@ -387,8 +388,8 @@ public class WorkspaceServiceCEImpl extends BaseService<WorkspaceRepository, Wor
                 .cleanPermissionGroupCacheForUsers(List.of(user.getId()))
                 .thenReturn(TRUE);
 
-        return Mono.zip(savedPermissionGroupsMono, cleanPermissionGroupCacheForCurrentUser)
-                .map(tuple -> tuple.getT1());
+        return savedPermissionGroupsMono.flatMap(
+                savedPermissionGroups -> cleanPermissionGroupCacheForCurrentUser.thenReturn(savedPermissionGroups));
     }
 
     protected Mono<Set<PermissionGroup>> generateDefaultPermissionGroups(Workspace workspace, User user) {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce_compatible/ApplicationServiceCECompatible.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce_compatible/ApplicationServiceCECompatible.java
new file mode 100644
index 0000000000..c5cfbcfefe
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce_compatible/ApplicationServiceCECompatible.java
@@ -0,0 +1,5 @@
+package com.appsmith.server.services.ce_compatible;
+
+import com.appsmith.server.services.ce.ApplicationServiceCE;
+
+public interface ApplicationServiceCECompatible extends ApplicationServiceCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce_compatible/ApplicationServiceCECompatibleImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce_compatible/ApplicationServiceCECompatibleImpl.java
new file mode 100644
index 0000000000..37c281d86b
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce_compatible/ApplicationServiceCECompatibleImpl.java
@@ -0,0 +1,54 @@
+package com.appsmith.server.services.ce_compatible;
+
+import com.appsmith.server.helpers.ResponseUtils;
+import com.appsmith.server.repositories.ApplicationRepository;
+import com.appsmith.server.repositories.NewActionRepository;
+import com.appsmith.server.services.AnalyticsService;
+import com.appsmith.server.services.AssetService;
+import com.appsmith.server.services.ConfigService;
+import com.appsmith.server.services.PermissionGroupService;
+import com.appsmith.server.services.ce.ApplicationServiceCEImpl;
+import com.appsmith.server.solutions.ApplicationPermission;
+import com.appsmith.server.solutions.DatasourcePermission;
+import com.appsmith.server.solutions.PolicySolution;
+import jakarta.validation.Validator;
+import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.stereotype.Service;
+import reactor.core.scheduler.Scheduler;
+
+@Service
+public class ApplicationServiceCECompatibleImpl extends ApplicationServiceCEImpl
+        implements ApplicationServiceCECompatible {
+    public ApplicationServiceCECompatibleImpl(
+            Scheduler scheduler,
+            Validator validator,
+            MongoConverter mongoConverter,
+            ReactiveMongoTemplate reactiveMongoTemplate,
+            ApplicationRepository repository,
+            AnalyticsService analyticsService,
+            PolicySolution policySolution,
+            ConfigService configService,
+            ResponseUtils responseUtils,
+            PermissionGroupService permissionGroupService,
+            NewActionRepository newActionRepository,
+            AssetService assetService,
+            DatasourcePermission datasourcePermission,
+            ApplicationPermission applicationPermission) {
+        super(
+                scheduler,
+                validator,
+                mongoConverter,
+                reactiveMongoTemplate,
+                repository,
+                analyticsService,
+                policySolution,
+                configService,
+                responseUtils,
+                permissionGroupService,
+                newActionRepository,
+                assetService,
+                datasourcePermission,
+                applicationPermission);
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce_compatible/PermissionGroupServiceCECompatible.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce_compatible/PermissionGroupServiceCECompatible.java
new file mode 100644
index 0000000000..2089b1a4da
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce_compatible/PermissionGroupServiceCECompatible.java
@@ -0,0 +1,5 @@
+package com.appsmith.server.services.ce_compatible;
+
+import com.appsmith.server.services.ce.PermissionGroupServiceCE;
+
+public interface PermissionGroupServiceCECompatible extends PermissionGroupServiceCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce_compatible/PermissionGroupServiceCECompatibleImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce_compatible/PermissionGroupServiceCECompatibleImpl.java
new file mode 100644
index 0000000000..7e0bd5ff6f
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce_compatible/PermissionGroupServiceCECompatibleImpl.java
@@ -0,0 +1,48 @@
+package com.appsmith.server.services.ce_compatible;
+
+import com.appsmith.server.repositories.ConfigRepository;
+import com.appsmith.server.repositories.PermissionGroupRepository;
+import com.appsmith.server.repositories.UserRepository;
+import com.appsmith.server.services.AnalyticsService;
+import com.appsmith.server.services.SessionUserService;
+import com.appsmith.server.services.TenantService;
+import com.appsmith.server.services.ce.PermissionGroupServiceCEImpl;
+import com.appsmith.server.solutions.PermissionGroupPermission;
+import com.appsmith.server.solutions.PolicySolution;
+import jakarta.validation.Validator;
+import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.stereotype.Service;
+import reactor.core.scheduler.Scheduler;
+
+@Service
+public class PermissionGroupServiceCECompatibleImpl extends PermissionGroupServiceCEImpl
+        implements PermissionGroupServiceCECompatible {
+    public PermissionGroupServiceCECompatibleImpl(
+            Scheduler scheduler,
+            Validator validator,
+            MongoConverter mongoConverter,
+            ReactiveMongoTemplate reactiveMongoTemplate,
+            PermissionGroupRepository repository,
+            AnalyticsService analyticsService,
+            SessionUserService sessionUserService,
+            TenantService tenantService,
+            UserRepository userRepository,
+            PolicySolution policySolution,
+            ConfigRepository configRepository,
+            PermissionGroupPermission permissionGroupPermission) {
+        super(
+                scheduler,
+                validator,
+                mongoConverter,
+                reactiveMongoTemplate,
+                repository,
+                analyticsService,
+                sessionUserService,
+                tenantService,
+                userRepository,
+                policySolution,
+                configRepository,
+                permissionGroupPermission);
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce_compatible/UserServiceCECompatibleImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce_compatible/UserServiceCECompatibleImpl.java
index 79c8d40398..506695dfcb 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce_compatible/UserServiceCECompatibleImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce_compatible/UserServiceCECompatibleImpl.java
@@ -2,24 +2,20 @@ package com.appsmith.server.services.ce_compatible;
 
 import com.appsmith.external.services.EncryptionService;
 import com.appsmith.server.configurations.CommonConfig;
-import com.appsmith.server.configurations.EmailConfig;
+import com.appsmith.server.helpers.UserServiceHelper;
 import com.appsmith.server.helpers.UserUtils;
-import com.appsmith.server.notifications.EmailSender;
 import com.appsmith.server.ratelimiting.RateLimitService;
-import com.appsmith.server.repositories.ApplicationRepository;
 import com.appsmith.server.repositories.EmailVerificationTokenRepository;
 import com.appsmith.server.repositories.PasswordResetTokenRepository;
 import com.appsmith.server.repositories.UserRepository;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.EmailService;
 import com.appsmith.server.services.PACConfigurationService;
-import com.appsmith.server.services.PermissionGroupService;
 import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.services.TenantService;
 import com.appsmith.server.services.UserDataService;
 import com.appsmith.server.services.WorkspaceService;
 import com.appsmith.server.services.ce.UserServiceCEImpl;
-import com.appsmith.server.solutions.PolicySolution;
 import com.appsmith.server.solutions.UserChangedHandler;
 import jakarta.validation.Validator;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
@@ -41,21 +37,17 @@ public class UserServiceCECompatibleImpl extends UserServiceCEImpl implements Us
             SessionUserService sessionUserService,
             PasswordResetTokenRepository passwordResetTokenRepository,
             PasswordEncoder passwordEncoder,
-            EmailSender emailSender,
-            ApplicationRepository applicationRepository,
-            PolicySolution policySolution,
             CommonConfig commonConfig,
-            EmailConfig emailConfig,
             UserChangedHandler userChangedHandler,
             EncryptionService encryptionService,
             UserDataService userDataService,
             TenantService tenantService,
-            PermissionGroupService permissionGroupService,
             UserUtils userUtils,
             EmailVerificationTokenRepository emailVerificationTokenRepository,
             EmailService emailService,
             RateLimitService rateLimitService,
-            PACConfigurationService pacConfigurationService) {
+            PACConfigurationService pacConfigurationService,
+            UserServiceHelper userServiceHelper) {
         super(
                 scheduler,
                 validator,
@@ -67,20 +59,16 @@ public class UserServiceCECompatibleImpl extends UserServiceCEImpl implements Us
                 sessionUserService,
                 passwordResetTokenRepository,
                 passwordEncoder,
-                emailSender,
-                applicationRepository,
-                policySolution,
                 commonConfig,
-                emailConfig,
                 userChangedHandler,
                 encryptionService,
                 userDataService,
                 tenantService,
-                permissionGroupService,
                 userUtils,
                 emailVerificationTokenRepository,
                 emailService,
                 rateLimitService,
-                pacConfigurationService);
+                pacConfigurationService,
+                userServiceHelper);
     }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ActionExecutionSolutionImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ActionExecutionSolutionImpl.java
index a4c8876edd..64b55ff0d4 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ActionExecutionSolutionImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ActionExecutionSolutionImpl.java
@@ -4,13 +4,13 @@ import com.appsmith.server.datasources.base.DatasourceService;
 import com.appsmith.server.datasourcestorages.base.DatasourceStorageService;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 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.NewActionRepository;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.AuthenticationValidator;
 import com.appsmith.server.services.DatasourceContextService;
-import com.appsmith.server.services.NewPageService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.solutions.ce.ActionExecutionSolutionCEImpl;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ApplicationFetcherImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ApplicationFetcherImpl.java
index bc795e32a1..a7826a65ee 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ApplicationFetcherImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ApplicationFetcherImpl.java
@@ -1,8 +1,8 @@
 package com.appsmith.server.solutions;
 
 import com.appsmith.server.helpers.ResponseUtils;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.repositories.ApplicationRepository;
-import com.appsmith.server.services.NewPageService;
 import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.services.UserDataService;
 import com.appsmith.server.services.UserService;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/AuthenticationServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/AuthenticationServiceImpl.java
index 023eedb5d3..9de93ee229 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/AuthenticationServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/AuthenticationServiceImpl.java
@@ -5,9 +5,9 @@ import com.appsmith.server.datasources.base.DatasourceService;
 import com.appsmith.server.datasourcestorages.base.DatasourceStorageService;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.helpers.RedirectHelper;
+import com.appsmith.server.newpages.base.NewPageService;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.services.ConfigService;
-import com.appsmith.server.services.NewPageService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.solutions.ce.AuthenticationServiceCEImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/CreateDBTablePageSolutionImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/CreateDBTablePageSolutionImpl.java
index c1f1fa33de..affe2229da 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/CreateDBTablePageSolutionImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/CreateDBTablePageSolutionImpl.java
@@ -4,12 +4,12 @@ import com.appsmith.server.datasources.base.DatasourceService;
 import com.appsmith.server.datasourcestorages.base.DatasourceStorageService;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.helpers.ResponseUtils;
+import com.appsmith.server.newpages.base.NewPageService;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.LayoutActionService;
-import com.appsmith.server.services.NewPageService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.solutions.ce.CreateDBTablePageSolutionCEImpl;
 import lombok.extern.slf4j.Slf4j;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/DatasourceStructureSolutionImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/DatasourceStructureSolutionImpl.java
index cc2121d184..882e1c7f1c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/DatasourceStructureSolutionImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/DatasourceStructureSolutionImpl.java
@@ -3,11 +3,11 @@ package com.appsmith.server.solutions;
 import com.appsmith.server.datasources.base.DatasourceService;
 import com.appsmith.server.datasourcestorages.base.DatasourceStorageService;
 import com.appsmith.server.helpers.PluginExecutorHelper;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.DatasourceContextService;
 import com.appsmith.server.services.DatasourceStructureService;
 import com.appsmith.server.services.FeatureFlagService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.solutions.ce.DatasourceStructureSolutionCEImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/DatasourceTriggerSolutionImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/DatasourceTriggerSolutionImpl.java
index 041b86f2a3..ede655e464 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/DatasourceTriggerSolutionImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/DatasourceTriggerSolutionImpl.java
@@ -3,9 +3,9 @@ package com.appsmith.server.solutions;
 import com.appsmith.server.datasources.base.DatasourceService;
 import com.appsmith.server.datasourcestorages.base.DatasourceStorageService;
 import com.appsmith.server.helpers.PluginExecutorHelper;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.services.AuthenticationValidator;
 import com.appsmith.server.services.DatasourceContextService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.solutions.ce.DatasourceTriggerSolutionCEImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ImportExportApplicationService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ImportExportApplicationService.java
deleted file mode 100644
index a245cb3493..0000000000
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ImportExportApplicationService.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.appsmith.server.solutions;
-
-import com.appsmith.server.solutions.ce.ImportExportApplicationServiceCE;
-
-public interface ImportExportApplicationService extends ImportExportApplicationServiceCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/RefactoringSolutionImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/RefactoringSolutionImpl.java
index 6ba1fc9b02..7f7d7ffc8f 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/RefactoringSolutionImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/RefactoringSolutionImpl.java
@@ -1,14 +1,14 @@
 package com.appsmith.server.solutions;
 
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.configurations.InstanceConfig;
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.newactions.base.NewActionService;
-import com.appsmith.server.services.ActionCollectionService;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.AstService;
 import com.appsmith.server.services.LayoutActionService;
-import com.appsmith.server.services.NewPageService;
 import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.solutions.ce.RefactoringSolutionCEImpl;
 import com.fasterxml.jackson.databind.ObjectMapper;
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 d6b45e02ba..ad787b104f 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
@@ -32,13 +32,13 @@ import com.appsmith.server.helpers.DatasourceAnalyticsUtils;
 import com.appsmith.server.helpers.DateUtils;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 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.NewActionRepository;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.AuthenticationValidator;
 import com.appsmith.server.services.DatasourceContextService;
-import com.appsmith.server.services.NewPageService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.solutions.ActionPermission;
 import com.appsmith.server.solutions.DatasourcePermission;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ActionPermissionCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ActionPermissionCEImpl.java
index 27913ee091..aeb1b9900f 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ActionPermissionCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ActionPermissionCEImpl.java
@@ -1,7 +1,11 @@
 package com.appsmith.server.solutions.ce;
 
 import com.appsmith.server.acl.AclPermission;
+import org.springframework.stereotype.Component;
 
+import static java.lang.Boolean.TRUE;
+
+@Component
 public class ActionPermissionCEImpl implements ActionPermissionCE, DomainPermissionCE {
     @Override
     public AclPermission getEditPermission() {
@@ -13,6 +17,11 @@ public class ActionPermissionCEImpl implements ActionPermissionCE, DomainPermiss
         return AclPermission.READ_ACTIONS;
     }
 
+    @Override
+    public AclPermission getExportPermission(boolean isGitSync, boolean exportWithConfiguration) {
+        return isGitSync ? null : TRUE.equals(exportWithConfiguration) ? getReadPermission() : getEditPermission();
+    }
+
     @Override
     public AclPermission getExecutePermission() {
         return AclPermission.EXECUTE_ACTIONS;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ApplicationFetcherCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ApplicationFetcherCEImpl.java
index 5fb05a5092..23bcfe57a9 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ApplicationFetcherCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ApplicationFetcherCEImpl.java
@@ -16,8 +16,8 @@ import com.appsmith.server.dtos.WorkspaceApplicationsDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.ResponseUtils;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.repositories.ApplicationRepository;
-import com.appsmith.server.services.NewPageService;
 import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.services.UserDataService;
 import com.appsmith.server.services.UserService;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ApplicationPermissionCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ApplicationPermissionCEImpl.java
index 5860a43814..f022038f6a 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ApplicationPermissionCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ApplicationPermissionCEImpl.java
@@ -1,7 +1,9 @@
 package com.appsmith.server.solutions.ce;
 
 import com.appsmith.server.acl.AclPermission;
+import org.springframework.stereotype.Component;
 
+@Component
 public class ApplicationPermissionCEImpl implements ApplicationPermissionCE, DomainPermissionCE {
     @Override
     public AclPermission getEditPermission() {
@@ -13,6 +15,17 @@ public class ApplicationPermissionCEImpl implements ApplicationPermissionCE, Dom
         return AclPermission.READ_APPLICATIONS;
     }
 
+    @Override
+    public AclPermission getExportPermission(boolean isGitSync, boolean exportWithConfiguration) {
+        // Check permissions depending upon the serialization objective:
+        // Git-sync => Edit permission
+        // Share application
+        //      : Normal apps => Export permission
+        //      : Sample apps where datasource config needs to be shared => Read permission
+        // If Git-sync, then use edit permissions, else use EXPORT_APPLICATION permission to fetch application
+        return isGitSync ? getEditPermission() : getExportPermission();
+    }
+
     @Override
     public AclPermission getExportPermission() {
         return AclPermission.EXPORT_APPLICATIONS;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/AuthenticationServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/AuthenticationServiceCEImpl.java
index 0046d4d074..48d87dd24f 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/AuthenticationServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/AuthenticationServiceCEImpl.java
@@ -28,9 +28,9 @@ import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.helpers.RedirectHelper;
+import com.appsmith.server.newpages.base.NewPageService;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.services.ConfigService;
-import com.appsmith.server.services.NewPageService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.solutions.DatasourcePermission;
 import com.appsmith.server.solutions.PagePermission;
 import com.appsmith.util.WebClientUtils;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/CreateDBTablePageSolutionCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/CreateDBTablePageSolutionCEImpl.java
index 1ff63f71b5..375b053d69 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/CreateDBTablePageSolutionCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/CreateDBTablePageSolutionCEImpl.java
@@ -32,12 +32,12 @@ import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.migrations.JsonSchemaMigration;
+import com.appsmith.server.newpages.base.NewPageService;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.LayoutActionService;
-import com.appsmith.server.services.NewPageService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.solutions.ApplicationPermission;
 import com.appsmith.server.solutions.DatasourcePermission;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DatasourcePermissionCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DatasourcePermissionCEImpl.java
index 5b2d64516c..519ca8029a 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DatasourcePermissionCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DatasourcePermissionCEImpl.java
@@ -1,13 +1,22 @@
 package com.appsmith.server.solutions.ce;
 
 import com.appsmith.server.acl.AclPermission;
+import org.springframework.stereotype.Component;
 
+import static java.lang.Boolean.TRUE;
+
+@Component
 public class DatasourcePermissionCEImpl implements DatasourcePermissionCE, DomainPermissionCE {
     @Override
     public AclPermission getReadPermission() {
         return AclPermission.READ_DATASOURCES;
     }
 
+    @Override
+    public AclPermission getExportPermission(boolean isGitSync, boolean exportWithConfiguration) {
+        return isGitSync ? null : TRUE.equals(exportWithConfiguration) ? getReadPermission() : getEditPermission();
+    }
+
     @Override
     public AclPermission getDeletePermission() {
         return AclPermission.MANAGE_DATASOURCES;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DatasourceStructureSolutionCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DatasourceStructureSolutionCEImpl.java
index 9a8e7bf21f..21ddb8035b 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DatasourceStructureSolutionCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DatasourceStructureSolutionCEImpl.java
@@ -19,11 +19,11 @@ import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.featureflags.FeatureFlagEnum;
 import com.appsmith.server.helpers.PluginExecutorHelper;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.DatasourceContextService;
 import com.appsmith.server.services.DatasourceStructureService;
 import com.appsmith.server.services.FeatureFlagService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.solutions.DatasourcePermission;
 import com.appsmith.server.solutions.EnvironmentPermission;
 import lombok.RequiredArgsConstructor;
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 949e5f1582..bda949b81a 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
@@ -13,9 +13,9 @@ import com.appsmith.server.domains.Plugin;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.PluginExecutorHelper;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.services.AuthenticationValidator;
 import com.appsmith.server.services.DatasourceContextService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.solutions.DatasourcePermission;
 import com.appsmith.server.solutions.DatasourceStructureSolution;
 import com.appsmith.server.solutions.EnvironmentPermission;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DomainPermissionCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DomainPermissionCE.java
index 083e8fbe2a..71e4d70125 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DomainPermissionCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DomainPermissionCE.java
@@ -16,4 +16,6 @@ public interface DomainPermissionCE {
      * @return The permission required to read the domain.
      */
     AclPermission getReadPermission();
+
+    AclPermission getExportPermission(boolean isGitSync, boolean exportWithConfiguration);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvironmentPermissionCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvironmentPermissionCEImpl.java
index 34fb084ae4..a1aca01bc1 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvironmentPermissionCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvironmentPermissionCEImpl.java
@@ -1,7 +1,9 @@
 package com.appsmith.server.solutions.ce;
 
 import com.appsmith.server.acl.AclPermission;
+import org.springframework.stereotype.Component;
 
+@Component
 public class EnvironmentPermissionCEImpl implements EnvironmentPermissionCE {
 
     @Override
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PagePermissionCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PagePermissionCEImpl.java
index 5dc48bed2f..51d26f72c7 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PagePermissionCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PagePermissionCEImpl.java
@@ -1,7 +1,11 @@
 package com.appsmith.server.solutions.ce;
 
 import com.appsmith.server.acl.AclPermission;
+import org.springframework.stereotype.Component;
 
+import static java.lang.Boolean.TRUE;
+
+@Component
 public class PagePermissionCEImpl implements PagePermissionCE, DomainPermissionCE {
     @Override
     public AclPermission getEditPermission() {
@@ -13,6 +17,11 @@ public class PagePermissionCEImpl implements PagePermissionCE, DomainPermissionC
         return AclPermission.READ_PAGES;
     }
 
+    @Override
+    public AclPermission getExportPermission(boolean isGitSync, boolean exportWithConfiguration) {
+        return isGitSync ? null : TRUE.equals(exportWithConfiguration) ? getReadPermission() : getEditPermission();
+    }
+
     @Override
     public AclPermission getDeletePermission() {
         return AclPermission.MANAGE_PAGES;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PermissionGroupPermissionCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PermissionGroupPermissionCEImpl.java
index c82b6cd20f..27ef368c85 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PermissionGroupPermissionCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PermissionGroupPermissionCEImpl.java
@@ -27,4 +27,9 @@ public class PermissionGroupPermissionCEImpl implements PermissionGroupPermissio
     public AclPermission getReadPermission() {
         return AclPermission.READ_PERMISSION_GROUPS;
     }
+
+    @Override
+    public AclPermission getExportPermission(boolean isGitSync, boolean exportWithConfiguration) {
+        return null;
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/RefactoringSolutionCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/RefactoringSolutionCEImpl.java
index 7485392504..995ffbc0a6 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/RefactoringSolutionCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/RefactoringSolutionCEImpl.java
@@ -5,6 +5,7 @@ import com.appsmith.external.models.ActionConfiguration;
 import com.appsmith.external.models.ActionDTO;
 import com.appsmith.external.models.MustacheBindingToken;
 import com.appsmith.external.models.PluginType;
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.configurations.InstanceConfig;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.domains.Layout;
@@ -19,12 +20,11 @@ import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.DslUtils;
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.newactions.base.NewActionService;
-import com.appsmith.server.services.ActionCollectionService;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.AstService;
 import com.appsmith.server.services.LayoutActionService;
-import com.appsmith.server.services.NewPageService;
 import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.solutions.ActionPermission;
 import com.appsmith.server.solutions.PagePermission;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/WorkspacePermissionCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/WorkspacePermissionCEImpl.java
index 78b25c9baf..9c09aa0986 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/WorkspacePermissionCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/WorkspacePermissionCEImpl.java
@@ -1,7 +1,9 @@
 package com.appsmith.server.solutions.ce;
 
 import com.appsmith.server.acl.AclPermission;
+import org.springframework.stereotype.Component;
 
+@Component
 public class WorkspacePermissionCEImpl implements WorkspacePermissionCE, DomainPermissionCE {
     @Override
     public AclPermission getEditPermission() {
@@ -13,6 +15,11 @@ public class WorkspacePermissionCEImpl implements WorkspacePermissionCE, DomainP
         return AclPermission.READ_WORKSPACES;
     }
 
+    @Override
+    public AclPermission getExportPermission(boolean isGitSync, boolean exportWithConfiguration) {
+        return null;
+    }
+
     @Override
     public AclPermission getDeletePermission() {
         return AclPermission.MANAGE_WORKSPACES;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/themes/base/ThemeService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/themes/base/ThemeService.java
new file mode 100644
index 0000000000..370fff5b51
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/themes/base/ThemeService.java
@@ -0,0 +1,3 @@
+package com.appsmith.server.themes.base;
+
+public interface ThemeService extends ThemeServiceCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ThemeServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/themes/base/ThemeServiceCE.java
similarity index 98%
rename from app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ThemeServiceCE.java
rename to app/server/appsmith-server/src/main/java/com/appsmith/server/themes/base/ThemeServiceCE.java
index e53a1d7f2f..d89858c114 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ThemeServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/themes/base/ThemeServiceCE.java
@@ -1,4 +1,4 @@
-package com.appsmith.server.services.ce;
+package com.appsmith.server.themes.base;
 
 import com.appsmith.server.acl.AclPermission;
 import com.appsmith.server.domains.Application;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ThemeServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/themes/base/ThemeServiceCEImpl.java
similarity index 99%
rename from app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ThemeServiceCEImpl.java
rename to app/server/appsmith-server/src/main/java/com/appsmith/server/themes/base/ThemeServiceCEImpl.java
index f8aef08ad5..d2b3f5c279 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ThemeServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/themes/base/ThemeServiceCEImpl.java
@@ -1,4 +1,4 @@
-package com.appsmith.server.services.ce;
+package com.appsmith.server.themes.base;
 
 import com.appsmith.external.constants.AnalyticsEvents;
 import com.appsmith.server.acl.AclPermission;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ThemeServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/themes/base/ThemeServiceImpl.java
similarity index 90%
rename from app/server/appsmith-server/src/main/java/com/appsmith/server/services/ThemeServiceImpl.java
rename to app/server/appsmith-server/src/main/java/com/appsmith/server/themes/base/ThemeServiceImpl.java
index 18713b9224..c0614d7ab1 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ThemeServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/themes/base/ThemeServiceImpl.java
@@ -1,9 +1,10 @@
-package com.appsmith.server.services;
+package com.appsmith.server.themes.base;
 
 import com.appsmith.server.acl.PolicyGenerator;
 import com.appsmith.server.repositories.ApplicationRepository;
 import com.appsmith.server.repositories.ThemeRepository;
-import com.appsmith.server.services.ce.ThemeServiceCEImpl;
+import com.appsmith.server.services.AnalyticsService;
+import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.solutions.ApplicationPermission;
 import jakarta.validation.Validator;
 import lombok.extern.slf4j.Slf4j;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/themes/export/ThemeExportableServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/themes/export/ThemeExportableServiceCEImpl.java
new file mode 100644
index 0000000000..b552f30a35
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/themes/export/ThemeExportableServiceCEImpl.java
@@ -0,0 +1,60 @@
+package com.appsmith.server.themes.export;
+
+import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.Theme;
+import com.appsmith.server.dtos.ApplicationJson;
+import com.appsmith.server.dtos.ExportingMetaDTO;
+import com.appsmith.server.dtos.MappedExportableResourcesDTO;
+import com.appsmith.server.export.exportable.ExportableServiceCE;
+import com.appsmith.server.themes.base.ThemeService;
+import lombok.extern.slf4j.Slf4j;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+
+import static com.appsmith.server.acl.AclPermission.READ_THEMES;
+
+@Slf4j
+public class ThemeExportableServiceCEImpl implements ExportableServiceCE<Theme> {
+
+    private final ThemeService themeService;
+
+    public ThemeExportableServiceCEImpl(ThemeService themeService) {
+        this.themeService = themeService;
+    }
+
+    @Override
+    public Mono<List<Theme>> getExportableEntities(
+            ExportingMetaDTO exportingMetaDTO,
+            MappedExportableResourcesDTO mappedExportableResourcesDTO,
+            Mono<Application> applicationMono,
+            ApplicationJson applicationJson) {
+
+        Mono<Theme> defaultThemeMono = themeService
+                .getSystemTheme(Theme.DEFAULT_THEME_NAME)
+                .map(theme -> {
+                    log.debug("Default theme found: {}", theme.getName());
+                    return theme;
+                })
+                .cache();
+
+        return applicationMono.flatMap(application -> themeService
+                .getThemeById(application.getEditModeThemeId(), READ_THEMES)
+                .switchIfEmpty(Mono.defer(() -> defaultThemeMono)) // setting default theme if theme is missing
+                .zipWith(
+                        themeService
+                                .getThemeById(application.getPublishedModeThemeId(), READ_THEMES)
+                                .switchIfEmpty(
+                                        Mono.defer(() -> defaultThemeMono)) // setting default theme if theme is missing
+                        )
+                .map(themesTuple -> {
+                    Theme editModeTheme = themesTuple.getT1();
+                    Theme publishedModeTheme = themesTuple.getT2();
+                    editModeTheme.sanitiseToExportDBObject();
+                    publishedModeTheme.sanitiseToExportDBObject();
+                    applicationJson.setEditModeTheme(editModeTheme);
+                    applicationJson.setPublishedTheme(publishedModeTheme);
+                    return List.of(themesTuple.getT1(), themesTuple.getT2());
+                }));
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/themes/export/ThemeExportableServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/themes/export/ThemeExportableServiceImpl.java
new file mode 100644
index 0000000000..cf080dfee3
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/themes/export/ThemeExportableServiceImpl.java
@@ -0,0 +1,13 @@
+package com.appsmith.server.themes.export;
+
+import com.appsmith.server.domains.Theme;
+import com.appsmith.server.export.exportable.ExportableService;
+import com.appsmith.server.themes.base.ThemeService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ThemeExportableServiceImpl extends ThemeExportableServiceCEImpl implements ExportableService<Theme> {
+    public ThemeExportableServiceImpl(ThemeService themeService) {
+        super(themeService);
+    }
+}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/SeedMongoData.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/SeedMongoData.java
index 396b432be5..2ab04137d1 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/SeedMongoData.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/configurations/SeedMongoData.java
@@ -212,10 +212,10 @@ public class SeedMongoData {
         };
         Object[][] pageData = {{"validPageName", Set.of(managePagePolicy, readPagePolicy)}};
         Object[][] pluginData = {
-            {"Installed Plugin Name", PluginType.API, "installed-plugin"},
-            {"Installed DB Plugin Name", PluginType.DB, "installed-db-plugin"},
-            {"Installed JS Plugin Name", PluginType.JS, "installed-js-plugin"},
-            {"Not Installed Plugin Name", PluginType.API, "not-installed-plugin"}
+            {"Installed Plugin Name", PluginType.API, "installed-plugin", true},
+            {"Installed DB Plugin Name", PluginType.DB, "installed-db-plugin", true},
+            {"Installed JS Plugin Name", PluginType.JS, "installed-js-plugin", true},
+            {"Not Installed Plugin Name", PluginType.API, "not-installed-plugin", false}
         };
 
         // Seed the plugin data into the DB
@@ -223,9 +223,11 @@ public class SeedMongoData {
                 .map(array -> {
                     log.debug("Creating the plugins");
                     Plugin plugin = new Plugin();
+
                     plugin.setName((String) array[0]);
                     plugin.setType((PluginType) array[1]);
                     plugin.setPackageName((String) array[2]);
+                    plugin.setDefaultInstall((Boolean) array[3]);
                     log.debug("Create plugin: {}", plugin);
                     return plugin;
                 })
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/connectionpoolconfig/configurations/ConnectionPoolConfigCETest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/connectionpoolconfig/configurations/ConnectionPoolConfigCETest.java
new file mode 100644
index 0000000000..f9570cead6
--- /dev/null
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/connectionpoolconfig/configurations/ConnectionPoolConfigCETest.java
@@ -0,0 +1,31 @@
+package com.appsmith.server.connectionpoolconfig.configurations;
+
+import com.appsmith.external.connectionpoolconfig.configurations.ConnectionPoolConfig;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringBootTest
+@ExtendWith(SpringExtension.class)
+public class ConnectionPoolConfigCETest {
+
+    @Autowired
+    ConnectionPoolConfig connectionPoolConfig;
+
+    @Test
+    public void verifyGetMaxConnectionPoolSizeProvidesDefaultValue() {
+        // this is same as default
+        Integer connectionPoolMaxSize = 5;
+
+        Mono<Integer> connectionPoolMaxSizeMono = connectionPoolConfig.getMaxConnectionPoolSize();
+        StepVerifier.create(connectionPoolMaxSizeMono).assertNext(poolSize -> {
+            assertThat(poolSize).isEqualTo(connectionPoolMaxSize);
+        });
+    }
+}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/controllers/ApplicationControllerTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/controllers/ApplicationControllerTest.java
index c3895f2406..aa040eee54 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/controllers/ApplicationControllerTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/controllers/ApplicationControllerTest.java
@@ -5,6 +5,7 @@ import com.appsmith.server.configurations.SecurityTestConfig;
 import com.appsmith.server.constants.Url;
 import com.appsmith.server.dtos.ApplicationImportDTO;
 import com.appsmith.server.exceptions.AppsmithErrorCode;
+import com.appsmith.server.export.internal.ImportExportApplicationService;
 import com.appsmith.server.fork.internal.ApplicationForkingService;
 import com.appsmith.server.helpers.GitFileUtils;
 import com.appsmith.server.helpers.RedisUtils;
@@ -13,10 +14,9 @@ import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.ApplicationSnapshotService;
 import com.appsmith.server.services.SessionUserService;
-import com.appsmith.server.services.ThemeService;
 import com.appsmith.server.services.UserDataService;
 import com.appsmith.server.solutions.ApplicationFetcher;
-import com.appsmith.server.solutions.ImportExportApplicationService;
+import com.appsmith.server.themes.base.ThemeService;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/FeatureFlagMigrationHelperTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/FeatureFlagMigrationHelperTest.java
index c39f5cd35b..c1ca84100e 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/FeatureFlagMigrationHelperTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/FeatureFlagMigrationHelperTest.java
@@ -226,4 +226,50 @@ class FeatureFlagMigrationHelperTest {
                 })
                 .verifyComplete();
     }
+
+    @Test
+    void
+            getUpdatedFlagsWithPendingMigration_diffForExistingAndLatestFlag_sameFlagIsFlippedAsPerDBState_flagGetsRemovedFromPendingMigrationList() {
+
+        // Mock DB state to have the feature flag in pending migration list with DISABLE status which means the feature
+        // flag flipped from true to false
+        Tenant defaultTenant = new Tenant();
+        defaultTenant.setId(UUID.randomUUID().toString());
+        TenantConfiguration tenantConfiguration = new TenantConfiguration();
+        tenantConfiguration.setFeaturesWithPendingMigration(Map.of(TENANT_TEST_FEATURE, DISABLE));
+        defaultTenant.setTenantConfiguration(tenantConfiguration);
+
+        // Mock CS calls to fetch the feature flags to have the feature flag in pending migration list with ENABLE
+        // status
+        // This means the feature flag flipped from false to true again with latest check
+        CachedFeatures existingCachedFeatures = new CachedFeatures();
+        Map<String, Boolean> featureMap = new HashMap<>();
+        featureMap.put(TENANT_TEST_FEATURE.name(), false);
+        existingCachedFeatures.setFeatures(featureMap);
+        existingCachedFeatures.setRefreshedAt(Instant.now().minus(1, ChronoUnit.DAYS));
+
+        CachedFeatures latestCachedFeatures = new CachedFeatures();
+        Map<String, Boolean> latestFeatureMap = new HashMap<>();
+        latestFeatureMap.put(TENANT_TEST_FEATURE.name(), true);
+        latestCachedFeatures.setFeatures(latestFeatureMap);
+        latestCachedFeatures.setRefreshedAt(Instant.now());
+
+        Mockito.when(cacheableFeatureFlagHelper.fetchCachedTenantFeatures(any()))
+                .thenReturn(Mono.just(existingCachedFeatures))
+                .thenReturn(Mono.just(latestCachedFeatures));
+
+        Mockito.when(cacheableFeatureFlagHelper.evictCachedTenantFeatures(any()))
+                .thenReturn(Mono.empty());
+
+        Mono<Map<FeatureFlagEnum, FeatureMigrationType>> getUpdatedFlagsWithPendingMigration =
+                featureFlagMigrationHelper.getUpdatedFlagsWithPendingMigration(defaultTenant);
+
+        StepVerifier.create(getUpdatedFlagsWithPendingMigration)
+                .assertNext(featureFlagEnumFeatureMigrationTypeMap -> {
+                    // As the feature flag is flipped back to true, the feature flag should be removed from the pending
+                    // migration entries as the migration is no longer required
+                    assertThat(featureFlagEnumFeatureMigrationTypeMap).isEmpty();
+                })
+                .verifyComplete();
+    }
 }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/ce/EmailServiceHelperCETest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/ce/EmailServiceHelperCETest.java
new file mode 100644
index 0000000000..16e857736e
--- /dev/null
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/ce/EmailServiceHelperCETest.java
@@ -0,0 +1,73 @@
+package com.appsmith.server.helpers.ce;
+
+import com.appsmith.server.domains.Tenant;
+import com.appsmith.server.services.TenantService;
+import org.apache.commons.lang3.StringUtils;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.security.test.context.support.WithUserDetails;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import reactor.test.StepVerifier;
+
+import java.util.HashMap;
+
+import static com.appsmith.server.constants.ce.EmailConstantsCE.EMAIL_VERIFICATION_EMAIL_TEMPLATE_CE;
+import static com.appsmith.server.constants.ce.EmailConstantsCE.FORGOT_PASSWORD_TEMPLATE_CE;
+import static com.appsmith.server.constants.ce.EmailConstantsCE.INSTANCE_ADMIN_INVITE_EMAIL_TEMPLATE;
+import static com.appsmith.server.constants.ce.EmailConstantsCE.INSTANCE_NAME;
+import static com.appsmith.server.constants.ce.EmailConstantsCE.INVITE_WORKSPACE_TEMPLATE_EXISTING_USER_CE;
+import static com.appsmith.server.constants.ce.EmailConstantsCE.INVITE_WORKSPACE_TEMPLATE_NEW_USER_CE;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.*;
+
+@SpringBootTest
+@ExtendWith(SpringExtension.class)
+class EmailServiceHelperCETest {
+
+    @Autowired
+    @Qualifier("emailServiceHelperCEImpl") private EmailServiceHelperCE emailServiceHelperCE;
+
+    @Autowired
+    TenantService tenantService;
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    public void testEnrichWithBrandParams() {
+        Tenant defautTenant = tenantService.getTenantConfiguration().block();
+        String instanceName =
+                StringUtils.defaultIfEmpty(defautTenant.getTenantConfiguration().getInstanceName(), "Appsmith");
+        StepVerifier.create(emailServiceHelperCE.enrichWithBrandParams(new HashMap<>(), "www.test.com"))
+                .assertNext(map -> {
+                    assertThat(map.containsKey(INSTANCE_NAME)).isTrue();
+                    assertThat(map.get(INSTANCE_NAME)).isEqualTo(instanceName);
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    void testGetForgotPasswordTemplate() {
+        assertThat(emailServiceHelperCE.getForgotPasswordTemplate()).isEqualTo(FORGOT_PASSWORD_TEMPLATE_CE);
+    }
+
+    @Test
+    void testGetWorkspaceInviteTemplate() {
+        assertThat(emailServiceHelperCE.getWorkspaceInviteTemplate(Boolean.TRUE))
+                .isEqualTo(INVITE_WORKSPACE_TEMPLATE_NEW_USER_CE);
+        assertThat(emailServiceHelperCE.getWorkspaceInviteTemplate(Boolean.FALSE))
+                .isEqualTo(INVITE_WORKSPACE_TEMPLATE_EXISTING_USER_CE);
+    }
+
+    @Test
+    void testGetEmailVerificationTemplate() {
+        assertThat(emailServiceHelperCE.getEmailVerificationTemplate()).isEqualTo(EMAIL_VERIFICATION_EMAIL_TEMPLATE_CE);
+    }
+
+    @Test
+    void testGetAdminInstanceInviteTemplate() {
+        assertThat(emailServiceHelperCE.getAdminInstanceInviteTemplate())
+                .isEqualTo(INSTANCE_ADMIN_INVITE_EMAIL_TEMPLATE);
+    }
+}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/ce/ImportApplicationPermissionProviderTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/ce/ImportApplicationPermissionProviderTest.java
index 91d45d8923..1930362aaa 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/ce/ImportApplicationPermissionProviderTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/ce/ImportApplicationPermissionProviderTest.java
@@ -10,17 +10,14 @@ import com.appsmith.server.domains.NewAction;
 import com.appsmith.server.domains.NewPage;
 import com.appsmith.server.domains.Workspace;
 import com.appsmith.server.solutions.ActionPermission;
-import com.appsmith.server.solutions.ActionPermissionImpl;
 import com.appsmith.server.solutions.ApplicationPermission;
-import com.appsmith.server.solutions.ApplicationPermissionImpl;
 import com.appsmith.server.solutions.DatasourcePermission;
-import com.appsmith.server.solutions.DatasourcePermissionImpl;
 import com.appsmith.server.solutions.DomainPermission;
 import com.appsmith.server.solutions.PagePermission;
-import com.appsmith.server.solutions.PagePermissionImpl;
 import com.appsmith.server.solutions.WorkspacePermission;
-import com.appsmith.server.solutions.WorkspacePermissionImpl;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
 import reactor.util.function.Tuple2;
 import reactor.util.function.Tuples;
 
@@ -32,12 +29,22 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+@SpringBootTest
 class ImportApplicationPermissionProviderTest {
-    ApplicationPermission applicationPermission = new ApplicationPermissionImpl();
-    PagePermission pagePermission = new PagePermissionImpl();
-    ActionPermission actionPermission = new ActionPermissionImpl();
-    DatasourcePermission datasourcePermission = new DatasourcePermissionImpl();
-    WorkspacePermission workspacePermission = new WorkspacePermissionImpl();
+    @Autowired
+    ApplicationPermission applicationPermission;
+
+    @Autowired
+    PagePermission pagePermission;
+
+    @Autowired
+    ActionPermission actionPermission;
+
+    @Autowired
+    DatasourcePermission datasourcePermission;
+
+    @Autowired
+    WorkspacePermission workspacePermission;
 
     @Test
     public void testCheckPermissionMethods_WhenNoPermissionProvided_ReturnsTrue() {
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/CacheableRepositoryTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/CacheableRepositoryTest.java
index c6f8fc4bc1..c7742032ba 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/CacheableRepositoryTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/CacheableRepositoryTest.java
@@ -3,7 +3,9 @@ package com.appsmith.server.repositories;
 import com.appsmith.server.domains.PermissionGroup;
 import com.appsmith.server.domains.User;
 import com.appsmith.server.domains.Workspace;
+import com.appsmith.server.helpers.UserUtils;
 import com.appsmith.server.services.WorkspaceService;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +37,15 @@ public class CacheableRepositoryTest {
     @Autowired
     UserRepository userRepository;
 
+    @Autowired
+    UserUtils userUtils;
+
+    @BeforeEach()
+    public void setup() {
+        User api_user = userRepository.findByEmail("api_user").block();
+        userUtils.makeSuperUser(List.of(api_user)).block();
+    }
+
     @Test
     @WithUserDetails(value = "api_user")
     public void getUserPermissionsTest_onPermissionGroupDelete_valid() {
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 617398ea2d..88b3a93912 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
@@ -6,6 +6,8 @@ import com.appsmith.external.models.PluginType;
 import com.appsmith.external.views.Views;
 import com.appsmith.server.acl.AclPermission;
 import com.appsmith.server.acl.PolicyGenerator;
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
+import com.appsmith.server.actioncollections.base.ActionCollectionServiceImpl;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.domains.ActionCollection;
 import com.appsmith.server.domains.Layout;
@@ -21,6 +23,7 @@ import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.ObjectMapperUtils;
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.repositories.ActionCollectionRepository;
 import com.appsmith.server.solutions.ActionPermission;
 import com.appsmith.server.solutions.ActionPermissionImpl;
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceTest.java
index 202f7630f8..c397d6a8cb 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ActionCollectionServiceTest.java
@@ -7,6 +7,7 @@ import com.appsmith.external.models.JSValue;
 import com.appsmith.external.models.PluginType;
 import com.appsmith.external.models.Policy;
 import com.appsmith.external.plugins.PluginExecutor;
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.domains.ActionCollection;
 import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.Layout;
@@ -25,10 +26,13 @@ import com.appsmith.server.dtos.WorkspacePluginStatus;
 import com.appsmith.server.helpers.MockPluginExecutor;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 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.ActionCollectionRepository;
 import com.appsmith.server.repositories.PermissionGroupRepository;
 import com.appsmith.server.repositories.PluginRepository;
 import com.appsmith.server.repositories.WorkspaceRepository;
+import com.appsmith.server.solutions.ApplicationPermission;
 import com.appsmith.server.solutions.RefactoringSolution;
 import lombok.extern.slf4j.Slf4j;
 import net.minidev.json.JSONArray;
@@ -118,6 +122,12 @@ public class ActionCollectionServiceTest {
     @Autowired
     PermissionGroupRepository permissionGroupRepository;
 
+    @Autowired
+    ApplicationPermission applicationPermission;
+
+    @Autowired
+    ApplicationService applicationService;
+
     @MockBean
     PluginExecutorHelper pluginExecutorHelper;
 
@@ -140,48 +150,44 @@ public class ActionCollectionServiceTest {
         Workspace toCreate = new Workspace();
         toCreate.setName("ActionCollectionServiceTest");
 
-        if (workspaceId == null) {
-            Workspace workspace =
-                    workspaceService.create(toCreate, apiUser, Boolean.FALSE).block();
-            workspaceId = workspace.getId();
-        }
+        Workspace workspace =
+                workspaceService.create(toCreate, apiUser, Boolean.FALSE).block();
+        workspaceId = workspace.getId();
 
-        if (testApp == null && testPage == null) {
-            // Create application and page which will be used by the tests to create actions for.
-            Application application = new Application();
-            application.setName(UUID.randomUUID().toString());
+        // Create application and page which will be used by the tests to create actions for.
+        Application application = new Application();
+        application.setName(UUID.randomUUID().toString());
 
-            testApp = applicationPageService
-                    .createApplication(application, workspaceId)
-                    .block();
+        testApp = applicationPageService
+                .createApplication(application, workspaceId)
+                .block();
 
-            assert testApp != null;
-            final String pageId = testApp.getPages().get(0).getId();
+        assert testApp != null;
+        final String pageId = testApp.getPages().get(0).getId();
 
-            testPage = newPageService.findPageById(pageId, READ_PAGES, false).block();
+        testPage = newPageService.findPageById(pageId, READ_PAGES, false).block();
 
-            assert testPage != null;
-            Layout layout = testPage.getLayouts().get(0);
-            JSONObject dsl = new JSONObject(Map.of("text", "{{ query1.data }}"));
+        assert testPage != null;
+        Layout layout = testPage.getLayouts().get(0);
+        JSONObject dsl = new JSONObject(Map.of("text", "{{ query1.data }}"));
 
-            JSONObject dsl2 = new JSONObject();
-            dsl2.put("widgetName", "Table1");
-            dsl2.put("type", "TABLE_WIDGET");
-            Map<String, Object> primaryColumns = new HashMap<>();
-            JSONObject jsonObject = new JSONObject(Map.of("key", "value"));
-            primaryColumns.put("_id", "{{ query1.data }}");
-            primaryColumns.put("_class", jsonObject);
-            dsl2.put("primaryColumns", primaryColumns);
-            final ArrayList<Object> objects = new ArrayList<>();
-            JSONArray temp2 = new JSONArray();
-            temp2.add(new JSONObject(Map.of("key", "primaryColumns._id")));
-            dsl2.put("dynamicBindingPathList", temp2);
-            objects.add(dsl2);
-            dsl.put("children", objects);
+        JSONObject dsl2 = new JSONObject();
+        dsl2.put("widgetName", "Table1");
+        dsl2.put("type", "TABLE_WIDGET");
+        Map<String, Object> primaryColumns = new HashMap<>();
+        JSONObject jsonObject = new JSONObject(Map.of("key", "value"));
+        primaryColumns.put("_id", "{{ query1.data }}");
+        primaryColumns.put("_class", jsonObject);
+        dsl2.put("primaryColumns", primaryColumns);
+        final ArrayList<Object> objects = new ArrayList<>();
+        JSONArray temp2 = new JSONArray();
+        temp2.add(new JSONObject(Map.of("key", "primaryColumns._id")));
+        dsl2.put("dynamicBindingPathList", temp2);
+        objects.add(dsl2);
+        dsl.put("children", objects);
 
-            layout.setDsl(dsl);
-            layout.setPublishedDsl(dsl);
-        }
+        layout.setDsl(dsl);
+        layout.setPublishedDsl(dsl);
 
         Plugin installedJsPlugin =
                 pluginRepository.findByPackageName("installed-js-plugin").block();
@@ -199,9 +205,12 @@ public class ActionCollectionServiceTest {
     @AfterEach
     @WithUserDetails(value = "api_user")
     public void cleanup() {
-        applicationPageService.deleteApplication(testApp.getId()).block();
-        testApp = null;
-        testPage = null;
+        List<Application> deletedApplications = applicationService
+                .findByWorkspaceId(workspaceId, applicationPermission.getDeletePermission())
+                .flatMap(remainingApplication -> applicationPageService.deleteApplication(remainingApplication.getId()))
+                .collectList()
+                .block();
+        Workspace deletedWorkspace = workspaceService.archiveById(workspaceId).block();
     }
 
     @Test
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 9ac0f5063b..2ccaca6aa7 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
@@ -7,13 +7,17 @@ import com.appsmith.server.domains.Layout;
 import com.appsmith.server.domains.NewPage;
 import com.appsmith.server.domains.Workspace;
 import com.appsmith.server.dtos.PageDTO;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.repositories.ApplicationRepository;
 import com.appsmith.server.repositories.UserRepository;
+import com.appsmith.server.solutions.ApplicationPermission;
 import lombok.extern.slf4j.Slf4j;
 import net.minidev.json.JSONObject;
 import net.minidev.json.parser.JSONParser;
 import net.minidev.json.parser.ParseException;
 import org.apache.commons.io.FileUtils;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +32,7 @@ import java.io.File;
 import java.io.IOException;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
+import java.util.List;
 import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -52,6 +57,32 @@ public class ApplicationPageServiceTest {
     @Autowired
     NewPageService newPageService;
 
+    @Autowired
+    ApplicationService applicationService;
+
+    @Autowired
+    ApplicationPermission applicationPermission;
+
+    Workspace workspace;
+
+    @BeforeEach
+    public void setup() {
+        Workspace unsavedWorkspace = new Workspace();
+        unsavedWorkspace.setName("ApplicationPageServiceTest Workspace");
+        workspace = workspaceService.create(unsavedWorkspace).block();
+    }
+
+    @AfterEach
+    public void cleanup() {
+        List<Application> deletedApplications = applicationService
+                .findByWorkspaceId(workspace.getId(), applicationPermission.getDeletePermission())
+                .flatMap(remainingApplication -> applicationPageService.deleteApplication(remainingApplication.getId()))
+                .collectList()
+                .block();
+        Workspace deletedWorkspace =
+                workspaceService.archiveById(workspace.getId()).block();
+    }
+
     /**
      * Creates an workspace, an application and a page under that application
      *
@@ -59,19 +90,14 @@ public class ApplicationPageServiceTest {
      * @return publisher of PageDTO
      */
     private Mono<PageDTO> createPageMono(String uniquePrefix) {
-        Workspace unsavedWorkspace = new Workspace();
-        unsavedWorkspace.setName(uniquePrefix + "_org");
-        return workspaceService
-                .create(unsavedWorkspace)
-                .flatMap(workspace -> {
-                    Application application = new Application();
-                    application.setName(uniquePrefix + "_app");
-                    return applicationPageService.createApplication(application, workspace.getId());
-                })
-                .flatMap(application -> {
+        Application application = new Application();
+        application.setName(uniquePrefix + "_app");
+        return applicationPageService
+                .createApplication(application, workspace.getId())
+                .flatMap(application1 -> {
                     PageDTO page = new PageDTO();
                     page.setName("Test page");
-                    page.setApplicationId(application.getId());
+                    page.setApplicationId(application1.getId());
                     return applicationPageService.createPage(page);
                 });
     }
@@ -113,13 +139,9 @@ public class ApplicationPageServiceTest {
     }
 
     Mono<Application> createApplication(String uniquePrefix) {
-        Workspace unsavedWorkspace = new Workspace();
-        unsavedWorkspace.setName(uniquePrefix + "_org");
-        return workspaceService.create(unsavedWorkspace).flatMap(workspace -> {
-            Application application = new Application();
-            application.setName(uniquePrefix + "_app");
-            return applicationPageService.createApplication(application, workspace.getId());
-        });
+        Application application = new Application();
+        application.setName(uniquePrefix + "_app");
+        return applicationPageService.createApplication(application, workspace.getId());
     }
 
     JSONObject getOlderDSL() {
@@ -179,7 +201,7 @@ public class ApplicationPageServiceTest {
     @Test
     @WithUserDetails("api_user")
     public void getPageEditMode_DSLMigrated_MigratedRealTileSuccessfully() {
-        NewPage newPage = createApplication("getPageEditMode_DSLNotMigrated_MigratedRealTileSuccessfully")
+        NewPage newPage = createApplication("getPageEditMode_DSLMigrated_MigratedRealTileSuccessfully")
                 .flatMap(application ->
                         newPageService.getById(application.getPages().get(0).getId()))
                 .flatMap(pageDTO -> {
@@ -211,7 +233,7 @@ public class ApplicationPageServiceTest {
     @Test
     @WithUserDetails("api_user")
     public void getPagePublishedMode_DSLNotMigrated_MigratedRealTileSuccessfully() {
-        NewPage newPage = createApplication("getPageEditMode_DSLNotMigrated_MigratedRealTileSuccessfully")
+        NewPage newPage = createApplication("getPagePublishedMode_DSLNotMigrated_MigratedRealTileSuccessfully")
                 .flatMap(application ->
                         newPageService.getById(application.getPages().get(0).getId()))
                 .flatMap(pageDTO -> {
@@ -240,7 +262,7 @@ public class ApplicationPageServiceTest {
     @Test
     @WithUserDetails("api_user")
     public void getPagePublishedMode_DSLMigrated_MigratedRealTileSuccessfully() {
-        NewPage newPage = createApplication("getPageEditMode_DSLNotMigrated_MigratedRealTileSuccessfully")
+        NewPage newPage = createApplication("getPagePublishedMode_DSLMigrated_MigratedRealTileSuccessfully")
                 .flatMap(application ->
                         newPageService.getById(application.getPages().get(0).getId()))
                 .flatMap(pageDTO -> {
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationSnapshotServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationSnapshotServiceTest.java
index 1517f6c750..98fa08b5df 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationSnapshotServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationSnapshotServiceTest.java
@@ -4,10 +4,15 @@ import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.ApplicationMode;
 import com.appsmith.server.domains.ApplicationSnapshot;
 import com.appsmith.server.domains.GitApplicationMetadata;
+import com.appsmith.server.domains.User;
 import com.appsmith.server.domains.Workspace;
 import com.appsmith.server.dtos.ApplicationPagesDTO;
 import com.appsmith.server.dtos.PageDTO;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.repositories.ApplicationSnapshotRepository;
+import com.appsmith.server.solutions.ApplicationPermission;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -40,21 +45,53 @@ public class ApplicationSnapshotServiceTest {
     @Autowired
     private ApplicationSnapshotRepository applicationSnapshotRepository;
 
+    @Autowired
+    private ApplicationService applicationService;
+
+    @Autowired
+    private ApplicationPermission applicationPermission;
+
+    @Autowired
+    SessionUserService sessionUserService;
+
+    Workspace workspace;
+
+    @BeforeEach
+    public void setup() {
+        User user = sessionUserService.getCurrentUser().block();
+        if (null == user) {
+            // Don't do any setup.
+            return;
+        }
+        Workspace workspace1 = new Workspace();
+        workspace1.setName("ApplicationSnapshotServiceTest");
+        workspace = workspaceService.create(workspace1).block();
+    }
+
+    @AfterEach
+    public void cleanup() {
+        User user = sessionUserService.getCurrentUser().block();
+        if (null == user) {
+            // Since no setup is done, hence no cleanup should happen.
+            return;
+        }
+        List<Application> deletedApplications = applicationService
+                .findByWorkspaceId(workspace.getId(), applicationPermission.getDeletePermission())
+                .flatMap(remainingApplication -> applicationPageService.deleteApplication(remainingApplication.getId()))
+                .collectList()
+                .block();
+        Workspace deletedWorkspace =
+                workspaceService.archiveById(workspace.getId()).block();
+    }
+
     @Test
     @WithUserDetails("api_user")
     public void createApplicationSnapshot_WhenNoPreviousSnapshotExists_NewCreated() {
-        // create a new workspace
-        Workspace workspace = new Workspace();
-        workspace.setName("Test workspace " + UUID.randomUUID());
-
-        Mono<ApplicationSnapshot> snapshotMono = workspaceService
-                .create(workspace)
-                .flatMap(createdWorkspace -> {
-                    Application testApplication = new Application();
-                    testApplication.setName("Test app for snapshot");
-                    testApplication.setWorkspaceId(createdWorkspace.getId());
-                    return applicationPageService.createApplication(testApplication);
-                })
+        Application testApplication = new Application();
+        testApplication.setName("Test app for snapshot");
+        testApplication.setWorkspaceId(workspace.getId());
+        Mono<ApplicationSnapshot> snapshotMono = applicationPageService
+                .createApplication(testApplication)
                 .flatMap(application -> {
                     assert application.getId() != null;
                     return applicationSnapshotService
@@ -75,18 +112,11 @@ public class ApplicationSnapshotServiceTest {
     @Test
     @WithUserDetails("api_user")
     public void createApplicationSnapshot_WhenSnapshotExists_ExistingSnapshotUpdated() {
-        // create a new workspace
-        Workspace workspace = new Workspace();
-        workspace.setName("Test workspace " + UUID.randomUUID());
-
-        Mono<ApplicationSnapshot> snapshotMono = workspaceService
-                .create(workspace)
-                .flatMap(createdWorkspace -> {
-                    Application testApplication = new Application();
-                    testApplication.setName("Test app for snapshot");
-                    testApplication.setWorkspaceId(createdWorkspace.getId());
-                    return applicationPageService.createApplication(testApplication);
-                })
+        Application testApplication = new Application();
+        testApplication.setName("Test app for snapshot");
+        testApplication.setWorkspaceId(workspace.getId());
+        Mono<ApplicationSnapshot> snapshotMono = applicationPageService
+                .createApplication(testApplication)
                 .flatMap(application -> {
                     assert application.getId() != null;
                     // create snapshot twice
@@ -112,25 +142,17 @@ public class ApplicationSnapshotServiceTest {
         String uniqueString = UUID.randomUUID().toString();
         String testDefaultAppId = "default-app-" + uniqueString;
         String testBranchName = "hello/world";
-        // create a new workspace
-        Workspace workspace = new Workspace();
-        workspace.setName("Test workspace " + uniqueString);
+        Application testApplication = new Application();
+        testApplication.setName("Test app for snapshot");
+        testApplication.setWorkspaceId(workspace.getId());
 
-        Mono<Tuple2<ApplicationSnapshot, Application>> tuple2Mono = workspaceService
-                .create(workspace)
-                .flatMap(createdWorkspace -> {
-                    Application testApplication = new Application();
-                    testApplication.setName("Test app for snapshot");
-                    testApplication.setWorkspaceId(createdWorkspace.getId());
-
-                    // this app will have default app id=testDefaultAppId and branch name=test branch name
-                    GitApplicationMetadata gitApplicationMetadata = new GitApplicationMetadata();
-                    gitApplicationMetadata.setDefaultApplicationId(testDefaultAppId);
-                    gitApplicationMetadata.setBranchName(testBranchName);
-                    testApplication.setGitApplicationMetadata(gitApplicationMetadata);
-
-                    return applicationPageService.createApplication(testApplication);
-                })
+        // this app will have default app id=testDefaultAppId and branch name=test branch name
+        GitApplicationMetadata gitApplicationMetadata = new GitApplicationMetadata();
+        gitApplicationMetadata.setDefaultApplicationId(testDefaultAppId);
+        gitApplicationMetadata.setBranchName(testBranchName);
+        testApplication.setGitApplicationMetadata(gitApplicationMetadata);
+        Mono<Tuple2<ApplicationSnapshot, Application>> tuple2Mono = applicationPageService
+                .createApplication(testApplication)
                 .flatMap(application -> applicationSnapshotService
                         .createApplicationSnapshot(testDefaultAppId, testBranchName)
                         .then(applicationSnapshotService.getWithoutDataByApplicationId(
@@ -154,17 +176,12 @@ public class ApplicationSnapshotServiceTest {
         String testDefaultAppId = "default-app-" + uniqueString;
         String testBranchName = null;
         // create a new workspace
-        Workspace workspace = new Workspace();
-        workspace.setName("Test workspace " + uniqueString);
 
-        Flux<ApplicationSnapshot> applicationSnapshotFlux = workspaceService
-                .create(workspace)
-                .flatMap(createdWorkspace -> {
-                    Application testApplication = new Application();
-                    testApplication.setName("Test app for snapshot");
-                    testApplication.setWorkspaceId(createdWorkspace.getId());
-                    return applicationPageService.createApplication(testApplication);
-                })
+        Application testApplication = new Application();
+        testApplication.setName("Test app for snapshot");
+        testApplication.setWorkspaceId(workspace.getId());
+        Flux<ApplicationSnapshot> applicationSnapshotFlux = applicationPageService
+                .createApplication(testApplication)
                 .flatMap(application -> {
                     ApplicationSnapshot applicationSnapshot = new ApplicationSnapshot();
                     applicationSnapshot.setApplicationId(application.getId());
@@ -192,17 +209,10 @@ public class ApplicationSnapshotServiceTest {
         String testDefaultAppId = "default-app-" + uniqueString;
         String testBranchName = "hello/world";
 
-        // create a new workspace
-        Workspace workspace = new Workspace();
-        workspace.setName("Test workspace " + uniqueString);
-
-        Mono<Application> applicationMono = workspaceService
-                .create(workspace)
-                .flatMap(createdWorkspace -> {
-                    Application testApplication = new Application();
-                    testApplication.setName("App before snapshot");
-                    return applicationPageService.createApplication(testApplication, workspace.getId());
-                })
+        Application testApplication = new Application();
+        testApplication.setName("App before snapshot");
+        Mono<Application> applicationMono = applicationPageService
+                .createApplication(testApplication, workspace.getId())
                 .cache();
 
         Mono<ApplicationPagesDTO> pagesBeforeSnapshot = applicationMono.flatMap(createdApp -> {
@@ -251,19 +261,10 @@ public class ApplicationSnapshotServiceTest {
     @Test
     @WithUserDetails("api_user")
     public void restoreSnapshot_WhenSuccessfullyRestored_SnapshotDeleted() {
-        String uniqueString = UUID.randomUUID().toString();
-
-        // create a new workspace
-        Workspace workspace = new Workspace();
-        workspace.setName("Test workspace " + uniqueString);
-
-        Flux<ApplicationSnapshot> snapshotFlux = workspaceService
-                .create(workspace)
-                .flatMap(createdWorkspace -> {
-                    Application testApplication = new Application();
-                    testApplication.setName("App before snapshot");
-                    return applicationPageService.createApplication(testApplication, workspace.getId());
-                })
+        Application testApplication = new Application();
+        testApplication.setName("App before snapshot");
+        Flux<ApplicationSnapshot> snapshotFlux = applicationPageService
+                .createApplication(testApplication, workspace.getId())
                 .flatMap(
                         application -> { // create a snapshot
                             return applicationSnapshotService
@@ -298,19 +299,12 @@ public class ApplicationSnapshotServiceTest {
 
     @WithUserDetails("api_user")
     @Test
-    public void getWithoutDataByApplicationId_WhenSnanshotNotFound_ReturnsEmptySnapshot() {
-        String uniqueString = UUID.randomUUID().toString();
-        Workspace workspace = new Workspace();
-        workspace.setName("Test workspace " + uniqueString);
-
-        Mono<ApplicationSnapshot> applicationSnapshotMono = workspaceService
-                .create(workspace)
-                .flatMap(createdWorkspace -> {
-                    Application testApplication = new Application();
-                    testApplication.setName("Test app for snapshot");
-                    testApplication.setWorkspaceId(createdWorkspace.getId());
-                    return applicationPageService.createApplication(testApplication);
-                })
+    public void getWithoutDataByApplicationId_WhenSnapshotNotFound_ReturnsEmptySnapshot() {
+        Application testApplication = new Application();
+        testApplication.setName("Test app for snapshot");
+        testApplication.setWorkspaceId(workspace.getId());
+        Mono<ApplicationSnapshot> applicationSnapshotMono = applicationPageService
+                .createApplication(testApplication)
                 .flatMap(application1 -> {
                     return applicationSnapshotService.getWithoutDataByApplicationId(application1.getId(), null);
                 });
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationTemplateServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationTemplateServiceTest.java
index 07091f6738..6401a19b41 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationTemplateServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationTemplateServiceTest.java
@@ -54,14 +54,10 @@ public class ApplicationTemplateServiceTest {
         mockCloudServices.shutdown();
     }
 
-    private Application setUpTestApplication() {
-        Workspace workspace = new Workspace();
-        workspace.setName("Import-Export-Test-Workspace");
-        Workspace savedWorkspace = workspaceService.create(workspace).block();
-
+    private Application setUpTestApplicationForWorkspace(String workspaceId) {
         Application testApplication = new Application();
         testApplication.setName("Export-Application-Test-Application");
-        testApplication.setWorkspaceId(savedWorkspace.getId());
+        testApplication.setWorkspaceId(workspaceId);
         testApplication.setUpdatedAt(Instant.now());
         testApplication.setLastDeployedAt(Instant.now());
         testApplication.setModifiedBy("some-user");
@@ -72,14 +68,19 @@ public class ApplicationTemplateServiceTest {
                 new MockResponse().setBody("{\"status\": 1}").addHeader("Content-Type", "application/json"));
 
         return applicationPageService
-                .createApplication(testApplication, savedWorkspace.getId())
+                .createApplication(testApplication, workspaceId)
                 .block();
     }
 
     @Test
     @WithUserDetails(value = "api_user")
     public void test_application_published_as_community_template() {
-        Application testApp = setUpTestApplication();
+        // Create Workspace
+        Workspace workspace = new Workspace();
+        workspace.setName("Import-Export-Test-Workspace");
+        Workspace savedWorkspace = workspaceService.create(workspace).block();
+
+        Application testApp = setUpTestApplicationForWorkspace(savedWorkspace.getId());
         CommunityTemplateDTO communityTemplateDTO = new CommunityTemplateDTO();
         communityTemplateDTO.setApplicationId(testApp.getId());
         communityTemplateDTO.setWorkspaceId(testApp.getWorkspaceId());
@@ -96,5 +97,9 @@ public class ApplicationTemplateServiceTest {
                     assertThat(updatedApplication.getIsPublic()).isTrue();
                 })
                 .verifyComplete();
+
+        // Test cleanup
+        applicationPageService.deleteApplication(testApp.getId()).block();
+        workspaceService.archiveById(savedWorkspace.getId()).block();
     }
 }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationTemplateServiceUnitTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationTemplateServiceUnitTest.java
index 6d67eea51e..eccf633bf5 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationTemplateServiceUnitTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationTemplateServiceUnitTest.java
@@ -4,9 +4,9 @@ import com.appsmith.server.configurations.CloudServicesConfig;
 import com.appsmith.server.domains.UserData;
 import com.appsmith.server.dtos.ApplicationTemplate;
 import com.appsmith.server.dtos.PageNameIdDTO;
+import com.appsmith.server.export.internal.ImportExportApplicationService;
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.solutions.ApplicationPermission;
-import com.appsmith.server.solutions.ImportExportApplicationService;
 import com.appsmith.server.solutions.ReleaseNotesService;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/CurlImporterServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/CurlImporterServiceTest.java
index 5c7ceac2bb..f9b62806a0 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/CurlImporterServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/CurlImporterServiceTest.java
@@ -15,7 +15,11 @@ import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.newpages.base.NewPageService;
+import com.appsmith.server.solutions.ApplicationPermission;
 import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
@@ -71,6 +75,15 @@ public class CurlImporterServiceTest {
     @Autowired
     WorkspaceService workspaceService;
 
+    @Autowired
+    ApplicationService applicationService;
+
+    @Autowired
+    ApplicationPermission applicationPermission;
+
+    @Autowired
+    SessionUserService sessionUserService;
+
     String workspaceId;
 
     // Assertion utilities for working with Action assertions.
@@ -169,7 +182,13 @@ public class CurlImporterServiceTest {
         assertThat(action.getActionConfiguration().getBodyFormData()).containsExactly(params);
     }
 
+    @BeforeEach
     public void setup() {
+        User currentUser = sessionUserService.getCurrentUser().block();
+        if (null == currentUser) {
+            // Not doing any setup for tests, where the user context is missing.
+            return;
+        }
         Mockito.when(this.pluginManager.getExtensions(Mockito.any(), Mockito.anyString()))
                 .thenReturn(List.of(this.pluginExecutor));
 
@@ -178,11 +197,24 @@ public class CurlImporterServiceTest {
         Workspace toCreate = new Workspace();
         toCreate.setName("CurlImporterServiceTest");
 
-        if (workspaceId == null) {
-            Workspace workspace =
-                    workspaceService.create(toCreate, apiUser, Boolean.FALSE).block();
-            workspaceId = workspace.getId();
+        Workspace workspace =
+                workspaceService.create(toCreate, apiUser, Boolean.FALSE).block();
+        workspaceId = workspace.getId();
+    }
+
+    @AfterEach
+    public void cleanup() {
+        User currentUser = sessionUserService.getCurrentUser().block();
+        if (null == currentUser) {
+            // Since, no setup was done if the user context is missing. Hence, no cleanup required.
+            return;
         }
+        List<Application> deletedApplications = applicationService
+                .findByWorkspaceId(workspaceId, applicationPermission.getDeletePermission())
+                .flatMap(remainingApplication -> applicationPageService.deleteApplication(remainingApplication.getId()))
+                .collectList()
+                .block();
+        Workspace deletedWorkspace = workspaceService.archiveById(workspaceId).block();
     }
 
     @Test
@@ -282,7 +314,6 @@ public class CurlImporterServiceTest {
     @Test
     @WithUserDetails(value = "api_user")
     public void testImportActionOnInvalidInput() {
-        setup();
         // Set up the application & page for which this import curl action would be added
         Application app = new Application();
         app.setName("curlTest Incorrect Command");
@@ -306,7 +337,6 @@ public class CurlImporterServiceTest {
     @Test
     @WithUserDetails(value = "api_user")
     public void testImportActionOnNullInput() {
-        setup();
         // Set up the application & page for which this import curl action would be added
         Application app = new Application();
         app.setName("curlTest Incorrect Command");
@@ -330,7 +360,6 @@ public class CurlImporterServiceTest {
     @Test
     @WithUserDetails(value = "api_user")
     public void testImportActionOnEmptyInput() {
-        setup();
         // Set up the application & page for which this import curl action would be added
         Application app = new Application();
         app.setName("curlTest Incorrect Command");
@@ -354,7 +383,6 @@ public class CurlImporterServiceTest {
     @Test
     @WithUserDetails(value = "api_user")
     public void importValidCurlCommand() {
-        setup();
         Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any())).thenReturn(Mono.just(pluginExecutor));
         Mockito.when(pluginExecutor.getHintMessages(Mockito.any(), Mockito.any()))
                 .thenReturn(Mono.zip(Mono.just(new HashSet<>()), Mono.just(new HashSet<>())));
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceContextServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceContextServiceTest.java
index 866756d509..e5e93b5e64 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceContextServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceContextServiceTest.java
@@ -15,6 +15,7 @@ import com.appsmith.external.plugins.PluginExecutor;
 import com.appsmith.external.services.EncryptionService;
 import com.appsmith.server.datasources.base.DatasourceService;
 import com.appsmith.server.datasourcestorages.base.DatasourceStorageService;
+import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.DatasourceContext;
 import com.appsmith.server.domains.DatasourceContextIdentifier;
 import com.appsmith.server.domains.Plugin;
@@ -22,13 +23,16 @@ import com.appsmith.server.domains.User;
 import com.appsmith.server.domains.Workspace;
 import com.appsmith.server.helpers.MockPluginExecutor;
 import com.appsmith.server.helpers.PluginExecutorHelper;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.repositories.DatasourceRepository;
 import com.appsmith.server.repositories.NewActionRepository;
 import com.appsmith.server.repositories.WorkspaceRepository;
+import com.appsmith.server.solutions.ApplicationPermission;
 import com.appsmith.server.solutions.DatasourcePermission;
 import com.appsmith.server.solutions.EnvironmentPermission;
 import lombok.extern.slf4j.Slf4j;
 import org.bson.types.ObjectId;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -39,12 +43,12 @@ import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.security.test.context.support.WithUserDetails;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
-import org.springframework.util.StringUtils;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
 import java.util.HashMap;
+import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -101,25 +105,41 @@ public class DatasourceContextServiceTest {
     @Autowired
     EnvironmentPermission environmentPermission;
 
+    @Autowired
+    ApplicationService applicationService;
+
+    @Autowired
+    ApplicationPageService applicationPageService;
+
+    @Autowired
+    ApplicationPermission applicationPermission;
+
     String defaultEnvironmentId;
 
     String workspaceId;
 
     @BeforeEach
-    @WithUserDetails(value = "api_user")
     public void setup() {
         User apiUser = userService.findByEmail("api_user").block();
         Workspace toCreate = new Workspace();
         toCreate.setName("DatasourceServiceTest");
 
-        if (!StringUtils.hasLength(workspaceId)) {
-            Workspace workspace =
-                    workspaceService.create(toCreate, apiUser, Boolean.FALSE).block();
-            workspaceId = workspace.getId();
-            defaultEnvironmentId = workspaceService
-                    .getDefaultEnvironmentId(workspaceId, environmentPermission.getExecutePermission())
-                    .block();
-        }
+        Workspace workspace =
+                workspaceService.create(toCreate, apiUser, Boolean.FALSE).block();
+        workspaceId = workspace.getId();
+        defaultEnvironmentId = workspaceService
+                .getDefaultEnvironmentId(workspaceId, environmentPermission.getExecutePermission())
+                .block();
+    }
+
+    @AfterEach
+    public void cleanup() {
+        List<Application> deletedApplications = applicationService
+                .findByWorkspaceId(workspaceId, applicationPermission.getDeletePermission())
+                .flatMap(remainingApplication -> applicationPageService.deleteApplication(remainingApplication.getId()))
+                .collectList()
+                .block();
+        Workspace deletedWorkspace = workspaceService.archiveById(workspaceId).block();
     }
 
     @Test
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceServiceTest.java
index 3ac17236f2..47639fe6cc 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceServiceTest.java
@@ -31,11 +31,14 @@ import com.appsmith.server.exceptions.AppsmithErrorCode;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.MockPluginExecutor;
 import com.appsmith.server.helpers.PluginExecutorHelper;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.repositories.NewActionRepository;
 import com.appsmith.server.repositories.PermissionGroupRepository;
 import com.appsmith.server.repositories.WorkspaceRepository;
+import com.appsmith.server.solutions.ApplicationPermission;
 import com.appsmith.server.solutions.EnvironmentPermission;
 import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -119,24 +122,37 @@ public class DatasourceServiceTest {
     @Autowired
     NewActionRepository newActionRepository;
 
+    @Autowired
+    ApplicationService applicationService;
+
+    @Autowired
+    ApplicationPermission applicationPermission;
+
     String workspaceId = "";
     private String defaultEnvironmentId;
 
     @BeforeEach
-    @WithUserDetails(value = "api_user")
     public void setup() {
         User apiUser = userService.findByEmail("api_user").block();
         Workspace toCreate = new Workspace();
         toCreate.setName("DatasourceServiceTest");
 
-        if (!StringUtils.hasLength(workspaceId)) {
-            Workspace workspace =
-                    workspaceService.create(toCreate, apiUser, Boolean.FALSE).block();
-            workspaceId = workspace.getId();
-            defaultEnvironmentId = workspaceService
-                    .getDefaultEnvironmentId(workspaceId, environmentPermission.getExecutePermission())
-                    .block();
-        }
+        Workspace workspace =
+                workspaceService.create(toCreate, apiUser, Boolean.FALSE).block();
+        workspaceId = workspace.getId();
+        defaultEnvironmentId = workspaceService
+                .getDefaultEnvironmentId(workspaceId, environmentPermission.getExecutePermission())
+                .block();
+    }
+
+    @AfterEach
+    public void cleanup() {
+        List<Application> deletedApplications = applicationService
+                .findByWorkspaceId(workspaceId, applicationPermission.getDeletePermission())
+                .flatMap(remainingApplication -> applicationPageService.deleteApplication(remainingApplication.getId()))
+                .collectList()
+                .block();
+        Workspace deletedWorkspace = workspaceService.archiveById(workspaceId).block();
     }
 
     @Test
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceStorageServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceStorageServiceTest.java
index 10ee7bc134..4f8e1c24df 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceStorageServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceStorageServiceTest.java
@@ -7,6 +7,7 @@ import com.appsmith.external.models.DatasourceStorage;
 import com.appsmith.external.models.Endpoint;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.datasourcestorages.base.DatasourceStorageService;
+import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.Plugin;
 import com.appsmith.server.domains.User;
 import com.appsmith.server.domains.Workspace;
@@ -14,8 +15,11 @@ import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.MockPluginExecutor;
 import com.appsmith.server.helpers.PluginExecutorHelper;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.repositories.UserRepository;
+import com.appsmith.server.solutions.ApplicationPermission;
 import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -55,14 +59,36 @@ public class DatasourceStorageServiceTest {
     @Autowired
     PluginService pluginService;
 
+    @Autowired
+    ApplicationService applicationService;
+
+    @Autowired
+    ApplicationPageService applicationPageService;
+
+    @Autowired
+    ApplicationPermission applicationPermission;
+
+    Workspace workspace;
+
     @BeforeEach
     public void setup() {
         Mono<User> userMono = userRepository.findByEmail("api_user").cache();
-        Workspace workspace = userMono.flatMap(user -> workspaceService.createDefault(new Workspace(), user))
+        workspace = userMono.flatMap(user -> workspaceService.createDefault(new Workspace(), user))
                 .switchIfEmpty(Mono.error(new Exception("createDefault is returning empty!!")))
                 .block();
     }
 
+    @AfterEach
+    public void cleanup() {
+        List<Application> deletedApplications = applicationService
+                .findByWorkspaceId(workspace.getId(), applicationPermission.getDeletePermission())
+                .flatMap(remainingApplication -> applicationPageService.deleteApplication(remainingApplication.getId()))
+                .collectList()
+                .block();
+        Workspace deletedWorkspace =
+                workspaceService.archiveById(workspace.getId()).block();
+    }
+
     @Test
     @WithUserDetails(value = "api_user")
     public void verifyFindByDatasourceId() {
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java
index 69184631c8..038730e6d7 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java
@@ -8,6 +8,7 @@ import com.appsmith.external.models.Datasource;
 import com.appsmith.external.models.DatasourceConfiguration;
 import com.appsmith.external.models.PluginType;
 import com.appsmith.external.models.Property;
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.GitApplicationMetadata;
@@ -23,12 +24,14 @@ import com.appsmith.server.dtos.RefactorActionNameDTO;
 import com.appsmith.server.dtos.ce.UpdateMultiplePageLayoutDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.export.internal.ImportExportApplicationService;
 import com.appsmith.server.helpers.MockPluginExecutor;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.repositories.NewActionRepository;
 import com.appsmith.server.repositories.PluginRepository;
-import com.appsmith.server.solutions.ImportExportApplicationService;
+import com.appsmith.server.solutions.ApplicationPermission;
 import com.appsmith.server.solutions.RefactoringSolution;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -122,6 +125,9 @@ public class LayoutActionServiceTest {
     @Autowired
     ImportExportApplicationService importExportApplicationService;
 
+    @Autowired
+    ApplicationPermission applicationPermission;
+
     Application testApp = null;
 
     PageDTO testPage = null;
@@ -145,7 +151,6 @@ public class LayoutActionServiceTest {
     Plugin installedJsPlugin;
 
     @BeforeEach
-    @WithUserDetails(value = "api_user")
     public void setup() {
         newPageService.deleteAll();
         User apiUser = userService.findByEmail("api_user").block();
@@ -156,78 +161,73 @@ public class LayoutActionServiceTest {
                 workspaceService.create(toCreate, apiUser, Boolean.FALSE).block();
         workspaceId = workspace.getId();
 
-        if (testApp == null && testPage == null) {
-            // Create application and page which will be used by the tests to create actions for.
-            Application application = new Application();
-            application.setName(UUID.randomUUID().toString());
-            testApp = applicationPageService
-                    .createApplication(application, workspace.getId())
-                    .block();
+        // Create application and page which will be used by the tests to create actions for.
+        Application application = new Application();
+        application.setName(UUID.randomUUID().toString());
+        testApp = applicationPageService
+                .createApplication(application, workspace.getId())
+                .block();
 
-            final String pageId = testApp.getPages().get(0).getId();
+        final String pageId = testApp.getPages().get(0).getId();
 
-            testPage = newPageService.findPageById(pageId, READ_PAGES, false).block();
+        testPage = newPageService.findPageById(pageId, READ_PAGES, false).block();
 
-            Layout layout = testPage.getLayouts().get(0);
-            JSONObject dsl = new JSONObject();
-            dsl.put("widgetName", "firstWidget");
-            JSONArray temp = new JSONArray();
-            temp.addAll(
-                    List.of(new JSONObject(Map.of("key", "testField")), new JSONObject(Map.of("key", "testField2"))));
-            dsl.put("dynamicBindingPathList", temp);
-            dsl.put("testField", "{{ query1.data }}");
-            dsl.put("testField2", "{{jsObject.jsFunction.data}}");
+        Layout layout = testPage.getLayouts().get(0);
+        JSONObject dsl = new JSONObject();
+        dsl.put("widgetName", "firstWidget");
+        JSONArray temp = new JSONArray();
+        temp.addAll(List.of(new JSONObject(Map.of("key", "testField")), new JSONObject(Map.of("key", "testField2"))));
+        dsl.put("dynamicBindingPathList", temp);
+        dsl.put("testField", "{{ query1.data }}");
+        dsl.put("testField2", "{{jsObject.jsFunction.data}}");
 
-            JSONObject dsl2 = new JSONObject();
-            dsl2.put("widgetName", "Table1");
-            dsl2.put("type", "TABLE_WIDGET");
-            Map<String, Object> primaryColumns = new HashMap<>();
-            JSONObject jsonObject = new JSONObject(Map.of("key", "value"));
-            primaryColumns.put("_id", "{{ query1.data }}");
-            primaryColumns.put("_class", jsonObject);
-            dsl2.put("primaryColumns", primaryColumns);
-            final ArrayList<Object> objects = new ArrayList<>();
-            JSONArray temp2 = new JSONArray();
-            temp2.add(new JSONObject(Map.of("key", "primaryColumns._id")));
-            dsl2.put("dynamicBindingPathList", temp2);
-            objects.add(dsl2);
-            dsl.put("children", objects);
+        JSONObject dsl2 = new JSONObject();
+        dsl2.put("widgetName", "Table1");
+        dsl2.put("type", "TABLE_WIDGET");
+        Map<String, Object> primaryColumns = new HashMap<>();
+        JSONObject jsonObject = new JSONObject(Map.of("key", "value"));
+        primaryColumns.put("_id", "{{ query1.data }}");
+        primaryColumns.put("_class", jsonObject);
+        dsl2.put("primaryColumns", primaryColumns);
+        final ArrayList<Object> objects = new ArrayList<>();
+        JSONArray temp2 = new JSONArray();
+        temp2.add(new JSONObject(Map.of("key", "primaryColumns._id")));
+        dsl2.put("dynamicBindingPathList", temp2);
+        objects.add(dsl2);
+        dsl.put("children", objects);
 
-            layout.setDsl(dsl);
-            layout.setPublishedDsl(dsl);
-            layoutActionService
-                    .updateLayout(pageId, testApp.getId(), layout.getId(), layout)
-                    .block();
+        layout.setDsl(dsl);
+        layout.setPublishedDsl(dsl);
+        layoutActionService
+                .updateLayout(pageId, testApp.getId(), layout.getId(), layout)
+                .block();
 
-            testPage = newPageService.findPageById(pageId, READ_PAGES, false).block();
-        }
+        testPage = newPageService.findPageById(pageId, READ_PAGES, false).block();
 
-        if (gitConnectedApp == null) {
-            Application newApp = new Application();
-            newApp.setName(UUID.randomUUID().toString());
-            GitApplicationMetadata gitData = new GitApplicationMetadata();
-            gitData.setBranchName("actionServiceTest");
-            newApp.setGitApplicationMetadata(gitData);
-            gitConnectedApp = applicationPageService
-                    .createApplication(newApp, workspaceId)
-                    .flatMap(application -> {
-                        application.getGitApplicationMetadata().setDefaultApplicationId(application.getId());
-                        return applicationService
-                                .save(application)
-                                .zipWhen(application1 -> importExportApplicationService.exportApplicationById(
-                                        application1.getId(), gitData.getBranchName()));
-                    })
-                    // Assign the branchName to all the resources connected to the application
-                    .flatMap(tuple -> importExportApplicationService.importApplicationInWorkspaceFromGit(
-                            workspaceId, tuple.getT2(), tuple.getT1().getId(), gitData.getBranchName()))
-                    .block();
+        Application newApp = new Application();
+        newApp.setName(UUID.randomUUID().toString());
+        GitApplicationMetadata gitData = new GitApplicationMetadata();
+        gitData.setBranchName("actionServiceTest");
+        newApp.setGitApplicationMetadata(gitData);
+        gitConnectedApp = applicationPageService
+                .createApplication(newApp, workspaceId)
+                .flatMap(application1 -> {
+                    application1.getGitApplicationMetadata().setDefaultApplicationId(application1.getId());
+                    return applicationService
+                            .save(application1)
+                            .zipWhen(application11 -> importExportApplicationService.exportApplicationById(
+                                    application11.getId(), gitData.getBranchName()));
+                })
+                // Assign the branchName to all the resources connected to the application
+                .flatMap(tuple -> importExportApplicationService.importApplicationInWorkspaceFromGit(
+                        workspaceId, tuple.getT2(), tuple.getT1().getId(), gitData.getBranchName()))
+                .block();
 
-            gitConnectedPage = newPageService
-                    .findPageById(gitConnectedApp.getPages().get(0).getId(), READ_PAGES, false)
-                    .block();
+        gitConnectedPage = newPageService
+                .findPageById(gitConnectedApp.getPages().get(0).getId(), READ_PAGES, false)
+                .block();
 
-            branchName = gitConnectedApp.getGitApplicationMetadata().getBranchName();
-        }
+        branchName = gitConnectedApp.getGitApplicationMetadata().getBranchName();
 
         workspaceId = workspace.getId();
         datasource = new Datasource();
@@ -247,11 +247,13 @@ public class LayoutActionServiceTest {
     }
 
     @AfterEach
-    @WithUserDetails(value = "api_user")
     public void cleanup() {
-        applicationPageService.deleteApplication(testApp.getId()).block();
-        testApp = null;
-        testPage = null;
+        List<Application> deletedApplications = applicationService
+                .findByWorkspaceId(workspaceId, applicationPermission.getDeletePermission())
+                .flatMap(remainingApplication -> applicationPageService.deleteApplication(remainingApplication.getId()))
+                .collectList()
+                .block();
+        Workspace deletedWorkspace = workspaceService.archiveById(workspaceId).block();
     }
 
     @Test
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java
index 2b60930a5a..316732de03 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java
@@ -20,7 +20,9 @@ import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.MockPluginExecutor;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.repositories.PluginRepository;
+import com.appsmith.server.solutions.ApplicationPermission;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -86,6 +88,12 @@ public class LayoutServiceTest {
     @Autowired
     NewPageService newPageService;
 
+    @Autowired
+    ApplicationService applicationService;
+
+    @Autowired
+    ApplicationPermission applicationPermission;
+
     @MockBean
     PluginExecutorHelper pluginExecutorHelper;
 
@@ -99,7 +107,6 @@ public class LayoutServiceTest {
     AstService astService;
 
     @BeforeEach
-    @WithUserDetails(value = "api_user")
     public void setup() {
         purgeAllPages();
         User apiUser = userService.findByEmail("api_user").block();
@@ -120,6 +127,16 @@ public class LayoutServiceTest {
         datasource.setPluginId(installedPlugin.getId());
     }
 
+    @AfterEach
+    public void cleanup() {
+        List<Application> deletedApplications = applicationService
+                .findByWorkspaceId(workspaceId, applicationPermission.getDeletePermission())
+                .flatMap(remainingApplication -> applicationPageService.deleteApplication(remainingApplication.getId()))
+                .collectList()
+                .block();
+        Workspace deletedWorkspace = workspaceService.archiveById(workspaceId).block();
+    }
+
     private void purgeAllPages() {
         newPageService.deleteAll();
     }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/MockDataServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/MockDataServiceTest.java
index 0128f945cc..bc345ed761 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/MockDataServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/MockDataServiceTest.java
@@ -15,11 +15,15 @@ import com.appsmith.server.dtos.PageDTO;
 import com.appsmith.server.helpers.MockPluginExecutor;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 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.PermissionGroupRepository;
 import com.appsmith.server.repositories.PluginRepository;
 import com.appsmith.server.repositories.WorkspaceRepository;
+import com.appsmith.server.solutions.ApplicationPermission;
 import com.appsmith.server.solutions.EnvironmentPermission;
 import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -32,7 +36,6 @@ import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.security.test.context.support.WithUserDetails;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
-import org.springframework.util.StringUtils;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
@@ -95,6 +98,12 @@ public class MockDataServiceTest {
     @Autowired
     EnvironmentPermission environmentPermission;
 
+    @Autowired
+    ApplicationService applicationService;
+
+    @Autowired
+    ApplicationPermission applicationPermission;
+
     String workspaceId = "";
 
     Application testApp = null;
@@ -102,29 +111,34 @@ public class MockDataServiceTest {
     PageDTO testPage = null;
 
     @BeforeEach
-    @WithUserDetails(value = "api_user")
     public void setup() {
 
-        if (!StringUtils.hasLength(workspaceId)) {
-            User apiUser = userService.findByEmail("api_user").block();
-            Workspace toCreate = new Workspace();
-            toCreate.setName("MockDataServiceTest");
+        User apiUser = userService.findByEmail("api_user").block();
+        Workspace toCreate = new Workspace();
+        toCreate.setName("MockDataServiceTest");
 
-            Workspace workspace =
-                    workspaceService.create(toCreate, apiUser, Boolean.FALSE).block();
-            workspaceId = workspace.getId();
-        }
+        Workspace workspace =
+                workspaceService.create(toCreate, apiUser, Boolean.FALSE).block();
+        workspaceId = workspace.getId();
 
-        if (testPage == null) {
-            // Create application and page which will be used by the tests to create actions for.
-            Application application = new Application();
-            application.setName(UUID.randomUUID().toString());
-            testApp = applicationPageService
-                    .createApplication(application, workspaceId)
-                    .block();
-            final String pageId = testApp.getPages().get(0).getId();
-            testPage = newPageService.findPageById(pageId, READ_PAGES, false).block();
-        }
+        // Create application and page which will be used by the tests to create actions for.
+        Application application = new Application();
+        application.setName(UUID.randomUUID().toString());
+        testApp = applicationPageService
+                .createApplication(application, workspaceId)
+                .block();
+        final String pageId = testApp.getPages().get(0).getId();
+        testPage = newPageService.findPageById(pageId, READ_PAGES, false).block();
+    }
+
+    @AfterEach
+    public void cleanup() {
+        List<Application> deletedApplications = applicationService
+                .findByWorkspaceId(workspaceId, applicationPermission.getDeletePermission())
+                .flatMap(remainingApplication -> applicationPageService.deleteApplication(remainingApplication.getId()))
+                .collectList()
+                .block();
+        Workspace deletedWorkspace = workspaceService.archiveById(workspaceId).block();
     }
 
     @Test
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 e20e0bd6a4..06307cf586 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
@@ -12,10 +12,14 @@ import com.appsmith.server.dtos.ApplicationPagesDTO;
 import com.appsmith.server.dtos.PageDTO;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.TextUtils;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.repositories.ApplicationSnapshotRepository;
 import com.appsmith.server.repositories.NewPageRepository;
 import com.appsmith.server.repositories.PermissionGroupRepository;
+import com.appsmith.server.solutions.ApplicationPermission;
 import com.appsmith.server.solutions.PagePermission;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,6 +65,29 @@ public class NewPageServiceTest {
     @Autowired
     PagePermission pagePermission;
 
+    @Autowired
+    ApplicationPermission applicationPermission;
+
+    String workspaceId = null;
+
+    @BeforeEach
+    public void setup() {
+        String randomId = UUID.randomUUID().toString();
+        Workspace workspace = new Workspace();
+        workspace.setName("org_" + randomId);
+        workspaceId = workspaceService.create(workspace).map(Workspace::getId).block();
+    }
+
+    @AfterEach
+    public void cleanup() {
+        List<Application> deletedApplications = applicationService
+                .findByWorkspaceId(workspaceId, applicationPermission.getDeletePermission())
+                .flatMap(remainingApplication -> applicationPageService.deleteApplication(remainingApplication.getId()))
+                .collectList()
+                .block();
+        Workspace deletedWorkspace = workspaceService.archiveById(workspaceId).block();
+    }
+
     @Test
     @WithUserDetails("api_user")
     public void testCreateDefault() {
@@ -94,19 +121,14 @@ public class NewPageServiceTest {
     @WithUserDetails("api_user")
     public void findApplicationPages_WhenApplicationIdPresent_ReturnsPages() {
         String randomId = UUID.randomUUID().toString();
-        Workspace workspace = new Workspace();
-        workspace.setName("org_" + randomId);
-        Mono<ApplicationPagesDTO> applicationPagesDTOMono = workspaceService
-                .create(workspace)
-                .flatMap(createdOrg -> {
-                    Application application = new Application();
-                    application.setName("app_" + randomId);
-                    return applicationPageService.createApplication(application, createdOrg.getId());
-                })
-                .flatMap(application -> {
+        Application application = new Application();
+        application.setName("app_" + randomId);
+        Mono<ApplicationPagesDTO> applicationPagesDTOMono = applicationPageService
+                .createApplication(application, workspaceId)
+                .flatMap(application1 -> {
                     PageDTO pageDTO = new PageDTO();
                     pageDTO.setName("page_" + randomId);
-                    pageDTO.setApplicationId(application.getId());
+                    pageDTO.setApplicationId(application1.getId());
                     return applicationPageService.createPage(pageDTO);
                 })
                 .flatMap(pageDTO -> newPageService.findApplicationPages(
@@ -130,23 +152,18 @@ public class NewPageServiceTest {
     @WithUserDetails("api_user")
     public void findApplicationPagesInViewMode_WhenApplicationIdPresent_ReturnsViewMode() {
         String randomId = UUID.randomUUID().toString();
-        Workspace workspace = new Workspace();
-        workspace.setName("org_" + randomId);
-        Mono<ApplicationPagesDTO> applicationPagesDTOMono = workspaceService
-                .create(workspace)
-                .flatMap(createdOrg -> {
-                    Application application = new Application();
-                    application.setName("app_" + randomId);
-                    return applicationPageService.createApplication(application, createdOrg.getId());
-                })
-                .flatMap(application -> {
+        Application application = new Application();
+        application.setName("app_" + randomId);
+        Mono<ApplicationPagesDTO> applicationPagesDTOMono = applicationPageService
+                .createApplication(application, workspaceId)
+                .flatMap(application1 -> {
                     PageDTO pageDTO = new PageDTO();
                     pageDTO.setName("page_" + randomId);
-                    pageDTO.setApplicationId(application.getId());
+                    pageDTO.setApplicationId(application1.getId());
                     Mono<PageDTO> pageDTOMono =
                             applicationPageService.createPage(pageDTO).cache();
                     return pageDTOMono
-                            .then(applicationPageService.publish(application.getId(), true))
+                            .then(applicationPageService.publish(application1.getId(), true))
                             .then(pageDTOMono);
                 })
                 .flatMap(pageDTO -> newPageService.findApplicationPages(
@@ -170,19 +187,14 @@ public class NewPageServiceTest {
     @WithUserDetails("api_user")
     public void findApplicationPages_WhenPageIdPresent_ReturnsPages() {
         String randomId = UUID.randomUUID().toString();
-        Workspace workspace = new Workspace();
-        workspace.setName("org_" + randomId);
-        Mono<ApplicationPagesDTO> applicationPagesDTOMono = workspaceService
-                .create(workspace)
-                .flatMap(createdWorkspace -> {
-                    Application application = new Application();
-                    application.setName("app_" + randomId);
-                    return applicationPageService.createApplication(application, createdWorkspace.getId());
-                })
-                .flatMap(application -> {
+        Application application = new Application();
+        application.setName("app_" + randomId);
+        Mono<ApplicationPagesDTO> applicationPagesDTOMono = applicationPageService
+                .createApplication(application, workspaceId)
+                .flatMap(application1 -> {
                     PageDTO pageDTO = new PageDTO();
                     pageDTO.setName("page_" + randomId);
-                    pageDTO.setApplicationId(application.getId());
+                    pageDTO.setApplicationId(application1.getId());
                     return applicationPageService.createPage(pageDTO);
                 })
                 .flatMap(pageDTO ->
@@ -204,21 +216,16 @@ public class NewPageServiceTest {
     @WithUserDetails("api_user")
     public void findApplicationPagesByApplicationIdViewMode_WhenApplicationHasNoHomePage_FirstPageIsSetAsHomePage() {
         String randomId = UUID.randomUUID().toString();
-        Workspace workspace = new Workspace();
-        workspace.setName("org_" + randomId);
-        Mono<ApplicationPagesDTO> applicationPagesDTOMono = workspaceService
-                .create(workspace)
-                .flatMap(createdWorkspace -> {
-                    Application application = new Application();
-                    application.setName("app_" + randomId);
-                    return applicationPageService.createApplication(application, createdWorkspace.getId());
-                })
-                .flatMap(application -> {
+        Application application = new Application();
+        application.setName("app_" + randomId);
+        Mono<ApplicationPagesDTO> applicationPagesDTOMono = applicationPageService
+                .createApplication(application, workspaceId)
+                .flatMap(application1 -> {
                     // set isDefault=false to the default page
-                    ApplicationPage applicationPage = application.getPages().get(0);
+                    ApplicationPage applicationPage = application1.getPages().get(0);
                     applicationPage.setIsDefault(false);
                     return applicationService
-                            .save(application)
+                            .save(application1)
                             .then(newPageService.findApplicationPages(
                                     null, applicationPage.getId(), null, ApplicationMode.EDIT));
                 });
@@ -235,20 +242,15 @@ public class NewPageServiceTest {
     @WithUserDetails("api_user")
     public void findApplicationPage_CheckPageIcon_IsValid() {
         String randomId = UUID.randomUUID().toString();
-        Workspace workspace = new Workspace();
-        workspace.setName("org_" + randomId);
-        Mono<PageDTO> applicationPageDTOMono = workspaceService
-                .create(workspace)
-                .flatMap(createdWorkspace -> {
-                    Application application = new Application();
-                    application.setName("app_" + randomId);
-                    return applicationPageService.createApplication(application, createdWorkspace.getId());
-                })
-                .flatMap(application -> {
+        Application application = new Application();
+        application.setName("app_" + randomId);
+        Mono<PageDTO> applicationPageDTOMono = applicationPageService
+                .createApplication(application, workspaceId)
+                .flatMap(application1 -> {
                     PageDTO pageDTO = new PageDTO();
                     pageDTO.setName("page_" + randomId);
                     pageDTO.setIcon("flight");
-                    pageDTO.setApplicationId(application.getId());
+                    pageDTO.setApplicationId(application1.getId());
                     return applicationPageService.createPage(pageDTO);
                 })
                 .flatMap(pageDTO ->
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 b95383f080..5b4199fed7 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
@@ -9,6 +9,7 @@ import com.appsmith.external.models.PluginType;
 import com.appsmith.external.models.Policy;
 import com.appsmith.external.plugins.PluginExecutor;
 import com.appsmith.server.acl.AclPermission;
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.domains.ActionCollection;
 import com.appsmith.server.domains.Application;
@@ -28,13 +29,15 @@ import com.appsmith.server.dtos.PageDTO;
 import com.appsmith.server.dtos.PageNameIdDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.export.internal.ImportExportApplicationService;
 import com.appsmith.server.helpers.MockPluginExecutor;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.helpers.TextUtils;
 import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.repositories.PermissionGroupRepository;
 import com.appsmith.server.repositories.PluginRepository;
-import com.appsmith.server.solutions.ImportExportApplicationService;
+import com.appsmith.server.solutions.ApplicationPermission;
 import lombok.extern.slf4j.Slf4j;
 import net.minidev.json.JSONArray;
 import net.minidev.json.JSONObject;
@@ -127,30 +130,37 @@ public class PageServiceTest {
     @Autowired
     PermissionGroupRepository permissionGroupRepository;
 
+    @Autowired
+    ApplicationPermission applicationPermission;
+
     @BeforeEach
-    @WithUserDetails(value = "api_user")
     public void setup() {
         purgeAllPages();
-        if (StringUtils.isEmpty(workspaceId)) {
-            User apiUser = userService.findByEmail("api_user").block();
-            Workspace toCreate = new Workspace();
-            toCreate.setName("PageServiceTest");
+        User apiUser = userService.findByEmail("api_user").block();
+        Workspace toCreate = new Workspace();
+        toCreate.setName("PageServiceTest");
 
-            Workspace workspace =
-                    workspaceService.create(toCreate, apiUser, Boolean.FALSE).block();
-            workspaceId = workspace.getId();
-        }
+        Workspace workspace =
+                workspaceService.create(toCreate, apiUser, Boolean.FALSE).block();
+        workspaceId = workspace.getId();
+    }
+
+    @AfterEach
+    public void cleanup() {
+        List<Application> deletedApplications = applicationService
+                .findByWorkspaceId(workspaceId, applicationPermission.getDeletePermission())
+                .flatMap(remainingApplication -> applicationPageService.deleteApplication(remainingApplication.getId()))
+                .collectList()
+                .block();
+        Workspace deletedWorkspace = workspaceService.archiveById(workspaceId).block();
     }
 
     public void setupTestApplication() {
-        if (application == null) {
-            Application newApp = new Application();
-            newApp.setName(UUID.randomUUID().toString());
-            application = applicationPageService
-                    .createApplication(newApp, workspaceId)
-                    .block();
-            applicationId = application.getId();
-        }
+        Application newApp = new Application();
+        newApp.setName(UUID.randomUUID().toString());
+        application =
+                applicationPageService.createApplication(newApp, workspaceId).block();
+        applicationId = application.getId();
     }
 
     private Application setupGitConnectedTestApplication(String uniquePrefix) {
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PluginServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PluginServiceTest.java
index 9f89ca7df0..231c9109d5 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PluginServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PluginServiceTest.java
@@ -6,6 +6,7 @@ import com.appsmith.external.models.DatasourceConfiguration;
 import com.appsmith.external.plugins.PluginExecutor;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.plugins.base.PluginService;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ThemeServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ThemeServiceTest.java
index 2d4a8dc348..c01b7e47b8 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ThemeServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ThemeServiceTest.java
@@ -16,7 +16,11 @@ import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.repositories.ApplicationRepository;
 import com.appsmith.server.repositories.PermissionGroupRepository;
 import com.appsmith.server.repositories.ThemeRepository;
+import com.appsmith.server.repositories.UserRepository;
+import com.appsmith.server.solutions.ApplicationPermission;
 import com.appsmith.server.solutions.UserAndAccessManagementService;
+import com.appsmith.server.themes.base.ThemeService;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -79,8 +83,16 @@ public class ThemeServiceTest {
     @Autowired
     private UserAndAccessManagementService userAndAccessManagementService;
 
+    @Autowired
+    ApplicationPermission applicationPermission;
+
+    @Autowired
+    UserRepository userRepository;
+
+    @Autowired
+    PermissionGroupService permissionGroupService;
+
     @BeforeEach
-    @WithUserDetails(value = "api_user")
     public void setup() {
         Workspace workspace = new Workspace();
         workspace.setName("Theme Service Test workspace");
@@ -88,12 +100,18 @@ public class ThemeServiceTest {
         this.workspace = workspaceService.create(workspace).block();
     }
 
+    @AfterEach
+    public void cleanup() {
+        List<Application> deletedApplications = applicationService
+                .findByWorkspaceId(workspace.getId(), applicationPermission.getDeletePermission())
+                .flatMap(remainingApplication -> applicationPageService.deleteApplication(remainingApplication.getId()))
+                .collectList()
+                .block();
+        Workspace deletedWorkspace =
+                workspaceService.archiveById(workspace.getId()).block();
+    }
+
     private Application createApplication() {
-
-        if (this.workspace == null) {
-            setup();
-        }
-
         Application application = new Application();
         application.setName("ThemeTest_" + UUID.randomUUID());
         application.setWorkspaceId(this.workspace.getId());
@@ -128,6 +146,25 @@ public class ThemeServiceTest {
                 .block();
     }
 
+    public void addApiUserToTheWorkspaceAsAdmin() {
+        String origin = "http://random-origin.test";
+        PermissionGroup adminPermissionGroup = permissionGroupRepository
+                .findAllById(workspace.getDefaultPermissionGroups())
+                .filter(permissionGroup -> permissionGroup.getName().startsWith(ADMINISTRATOR))
+                .collectList()
+                .block()
+                .get(0);
+
+        // add api_user back to the workspace
+        User apiUser = userRepository.findByEmail("api_user").block();
+        adminPermissionGroup.getAssignedToUserIds().add(apiUser.getId());
+        permissionGroupRepository
+                .save(adminPermissionGroup)
+                .flatMap(
+                        savedRole -> permissionGroupService.cleanPermissionGroupCacheForUsers(List.of(apiUser.getId())))
+                .block();
+    }
+
     @WithUserDetails("api_user")
     @Test
     public void getApplicationTheme_WhenThemeIsSet_ThemesReturned() {
@@ -194,6 +231,8 @@ public class ThemeServiceTest {
                 .expectErrorMessage(
                         AppsmithError.NO_RESOURCE_FOUND.getMessage(FieldName.APPLICATION, savedApplication.getId()))
                 .verify();
+
+        addApiUserToTheWorkspaceAsAdmin();
     }
 
     @WithUserDetails("api_user")
@@ -281,6 +320,8 @@ public class ThemeServiceTest {
         StepVerifier.create(changeCurrentThemeMono)
                 .expectError(AppsmithException.class)
                 .verify();
+
+        addApiUserToTheWorkspaceAsAdmin();
     }
 
     @WithUserDetails("api_user")
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 4dcadd34e7..4d4e335749 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
@@ -358,6 +358,10 @@ public class UserServiceTest {
                     assertTrue(passwordEncoder.matches("123456", user.getPassword()));
                 })
                 .verifyComplete();
+
+        Workspace deletedWorkspace = workspaceMono
+                .flatMap(workspace1 -> workspaceService.archiveById(workspace1.getId()))
+                .block();
     }
 
     @Test
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserWorkspaceServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserWorkspaceServiceTest.java
index f744e5f192..d448862de4 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserWorkspaceServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserWorkspaceServiceTest.java
@@ -1,25 +1,23 @@
 package com.appsmith.server.services;
 
-import com.appsmith.external.models.Policy;
-import com.appsmith.server.acl.AclPermission;
-import com.appsmith.server.acl.AppsmithRole;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.PermissionGroup;
 import com.appsmith.server.domains.User;
-import com.appsmith.server.domains.UserRole;
 import com.appsmith.server.domains.Workspace;
+import com.appsmith.server.dtos.InviteUsersDTO;
 import com.appsmith.server.dtos.MemberInfoDTO;
 import com.appsmith.server.dtos.UpdatePermissionGroupDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.repositories.PermissionGroupRepository;
 import com.appsmith.server.repositories.UserRepository;
 import com.appsmith.server.repositories.WorkspaceRepository;
+import com.appsmith.server.solutions.ApplicationPermission;
 import com.appsmith.server.solutions.PolicySolution;
+import com.appsmith.server.solutions.UserAndAccessManagementService;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -31,7 +29,6 @@ import reactor.test.StepVerifier;
 
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -82,70 +79,14 @@ public class UserWorkspaceServiceTest {
     @Autowired
     PermissionGroupService permissionGroupService;
 
-    private Workspace workspace;
-    PermissionGroup developerPermissionGroup;
-    User api_user;
-    User developer_user;
+    @Autowired
+    ApplicationPermission applicationPermission;
 
-    @BeforeEach
-    @WithUserDetails(value = "api_user")
-    public void setup() {
-        Workspace workspace = new Workspace();
-        workspace.setName("Test org");
-        this.workspace = workspaceService.create(workspace).block();
+    @Autowired
+    ApplicationService applicationService;
 
-        // Now add api_user as a developer of the workspace
-        Set<String> permissionGroupIds = workspace.getDefaultPermissionGroups();
-
-        List<PermissionGroup> permissionGroups = permissionGroupRepository
-                .findAllById(permissionGroupIds)
-                .collectList()
-                .block();
-
-        developerPermissionGroup = permissionGroups.stream()
-                .filter(permissionGroup -> permissionGroup.getName().startsWith(DEVELOPER))
-                .findFirst()
-                .get();
-
-        PermissionGroup adminPermissionGroup = permissionGroups.stream()
-                .filter(permissionGroup -> permissionGroup.getName().startsWith(ADMINISTRATOR))
-                .findFirst()
-                .get();
-
-        api_user = userService.findByEmail("api_user").block();
-        User usertest = userService.findByEmail("usertest@usertest.com").block();
-        developer_user = userService.findByEmail("developer@solutiontest.com").block();
-
-        // Make api_user a developer and not an administrator
-        // Make user_test an administrator
-        adminPermissionGroup.setAssignedToUserIds(Set.of(usertest.getId()));
-        permissionGroupRepository.save(adminPermissionGroup).block();
-        developerPermissionGroup.setAssignedToUserIds(Set.of(api_user.getId()));
-        permissionGroupRepository.save(developerPermissionGroup).block();
-    }
-
-    private UserRole createUserRole(String username, String userId, AppsmithRole role) {
-        UserRole userRole = new UserRole();
-        userRole.setUsername(username);
-        userRole.setUserId(userId);
-        userRole.setName(username);
-        if (role != null) {
-            userRole.setRoleName(role.getName());
-            userRole.setRole(role);
-        }
-        return userRole;
-    }
-
-    private void addRolesToWorkspace(List<UserRole> roles) {
-        this.workspace.setUserRoles(roles);
-        for (UserRole userRole : roles) {
-            Set<AclPermission> rolePermissions = userRole.getRole().getPermissions();
-            Map<String, Policy> workspacePolicyMap =
-                    policySolution.generatePolicyFromPermission(rolePermissions, userRole.getUsername());
-            this.workspace = policySolution.addPoliciesToExistingObject(workspacePolicyMap, workspace);
-        }
-        this.workspace = workspaceRepository.save(workspace).block();
-    }
+    @Autowired
+    UserAndAccessManagementService userAndAccessManagementService;
 
     @Test
     @WithUserDetails(value = "api_user")
@@ -234,9 +175,29 @@ public class UserWorkspaceServiceTest {
         // Leave workspace once removes the api_user from the default workspace. The second time would reproduce the
         // test
         // case scenario.
+        Workspace workspace = new Workspace();
+        workspace.setName("Test org");
+        Workspace createdWorkspace = workspaceService.create(workspace).block();
+
+        // Invite another before we try to remove the existing administrator user.
+        List<PermissionGroup> permissionGroups = permissionGroupRepository
+                .findAllById(createdWorkspace.getDefaultPermissionGroups())
+                .collectList()
+                .block();
+
+        PermissionGroup administratorPermissionGroup = permissionGroups.stream()
+                .filter(permissionGroup -> permissionGroup.getName().startsWith(ADMINISTRATOR))
+                .findFirst()
+                .get();
+
+        InviteUsersDTO inviteUsersDTO = new InviteUsersDTO();
+        inviteUsersDTO.setPermissionGroupId(administratorPermissionGroup.getId());
+        inviteUsersDTO.setUsernames(List.of("usertest@usertest.com"));
+        userAndAccessManagementService.inviteUsers(inviteUsersDTO, "test").block();
+
         Mono<User> userMono = userWorkspaceService
-                .leaveWorkspace(workspace.getId())
-                .then(userWorkspaceService.leaveWorkspace(workspace.getId()));
+                .leaveWorkspace(createdWorkspace.getId())
+                .then(userWorkspaceService.leaveWorkspace(createdWorkspace.getId()));
 
         StepVerifier.create(userMono)
                 .expectErrorMessage(AppsmithError.NO_RESOURCE_FOUND.getMessage(FieldName.WORKSPACE, workspace.getId()))
@@ -247,8 +208,12 @@ public class UserWorkspaceServiceTest {
     @WithUserDetails(value = "api_user")
     public void updateUserGroupForMember_WhenAdminUserGroupRemovedWithNoOtherAdmin_ThrowsExceptions() {
 
+        Workspace workspace = new Workspace();
+        workspace.setName("Test org");
+        Workspace createdWorkspace = workspaceService.create(workspace).block();
+
         // Now make api_user an administrator and not a developer
-        Set<String> permissionGroupIds = workspace.getDefaultPermissionGroups();
+        Set<String> permissionGroupIds = createdWorkspace.getDefaultPermissionGroups();
 
         List<PermissionGroup> permissionGroups = permissionGroupRepository
                 .findAllById(permissionGroupIds)
@@ -280,7 +245,7 @@ public class UserWorkspaceServiceTest {
         String origin = "http://random-origin.test";
 
         Mono<MemberInfoDTO> updateUserRoleMono = userWorkspaceService.updatePermissionGroupForMember(
-                workspace.getId(), updatePermissionGroupDTO, origin);
+                createdWorkspace.getId(), updatePermissionGroupDTO, origin);
 
         StepVerifier.create(updateUserRoleMono)
                 .expectErrorMessage(AppsmithError.REMOVE_LAST_WORKSPACE_ADMIN_ERROR.getMessage());
@@ -289,9 +254,12 @@ public class UserWorkspaceServiceTest {
     @Test
     @WithUserDetails(value = "api_user")
     public void updateUserGroupForMember_WhenAdminUserGroupRemovedButOtherAdminExists_MemberRemoved() {
+        Workspace workspace = new Workspace();
+        workspace.setName("Test org");
+        Workspace createdWorkspace = workspaceService.create(workspace).block();
 
         // Now make api_user an administrator along with usertest. Remove api_user as a developer
-        Set<String> permissionGroupIds = workspace.getDefaultPermissionGroups();
+        Set<String> permissionGroupIds = createdWorkspace.getDefaultPermissionGroups();
 
         List<PermissionGroup> permissionGroups = permissionGroupRepository
                 .findAllById(permissionGroupIds)
@@ -325,7 +293,7 @@ public class UserWorkspaceServiceTest {
         String origin = "http://random-origin.test";
 
         Mono<MemberInfoDTO> updateUserRoleMono = userWorkspaceService.updatePermissionGroupForMember(
-                workspace.getId(), updatePermissionGroupDTO, origin);
+                createdWorkspace.getId(), updatePermissionGroupDTO, origin);
 
         StepVerifier.create(updateUserRoleMono)
                 .assertNext(userRole1 -> {
@@ -347,18 +315,40 @@ public class UserWorkspaceServiceTest {
     @Test
     @WithUserDetails(value = "api_user")
     public void invalid_removeAnotherDeveloperAsDeveloperInWorkspace() {
-        developerPermissionGroup.setAssignedToUserIds(Set.of(api_user.getId(), developer_user.getId()));
+        User api_user = userRepository.findByEmail("api_user").block();
+        User test_user = userRepository.findByEmail("usertest@usertest.com").block();
+        Workspace workspace = new Workspace();
+        workspace.setName("Test org");
+        Workspace createdWorkspace = workspaceService.create(workspace).block();
+        List<PermissionGroup> permissionGroups = permissionGroupRepository
+                .findAllById(createdWorkspace.getDefaultPermissionGroups())
+                .collectList()
+                .block();
+
+        PermissionGroup administratorPermissionGroup = permissionGroups.stream()
+                .filter(permissionGroup -> permissionGroup.getName().startsWith(ADMINISTRATOR))
+                .findFirst()
+                .get();
+
+        PermissionGroup developerPermissionGroup = permissionGroups.stream()
+                .filter(permissionGroup -> permissionGroup.getName().startsWith(DEVELOPER))
+                .findFirst()
+                .get();
+
+        administratorPermissionGroup.getAssignedToUserIds().remove(api_user.getId());
+        developerPermissionGroup.setAssignedToUserIds(Set.of(api_user.getId(), test_user.getId()));
+        permissionGroupRepository.save(administratorPermissionGroup).block();
         permissionGroupRepository.save(developerPermissionGroup).block();
         permissionGroupService
-                .cleanPermissionGroupCacheForUsers(List.of(api_user.getId(), developer_user.getId()))
+                .cleanPermissionGroupCacheForUsers(List.of(api_user.getId(), test_user.getId()))
                 .block();
 
         UpdatePermissionGroupDTO updatePermissionGroupDTO = new UpdatePermissionGroupDTO();
         updatePermissionGroupDTO.setNewPermissionGroupId(null);
-        updatePermissionGroupDTO.setUsername(developer_user.getUsername());
+        updatePermissionGroupDTO.setUsername(test_user.getUsername());
 
         Mono<MemberInfoDTO> removeDeveloperMono = userWorkspaceService.updatePermissionGroupForMember(
-                workspace.getId(), updatePermissionGroupDTO, "origin");
+                createdWorkspace.getId(), updatePermissionGroupDTO, "origin");
 
         StepVerifier.create(removeDeveloperMono)
                 .expectErrorMatches(throwable -> throwable instanceof AppsmithException
@@ -369,18 +359,10 @@ public class UserWorkspaceServiceTest {
                 .verify();
 
         // Cleanup the special state created for this test case
-        developerPermissionGroup.setAssignedToUserIds(Set.of(api_user.getId()));
-        permissionGroupRepository.save(developerPermissionGroup).block();
+        administratorPermissionGroup.setAssignedToUserIds(Set.of(api_user.getId()));
+        permissionGroupRepository.save(administratorPermissionGroup).block();
         permissionGroupService
-                .cleanPermissionGroupCacheForUsers(List.of(api_user.getId(), developer_user.getId()))
+                .cleanPermissionGroupCacheForUsers(List.of(api_user.getId(), test_user.getId()))
                 .block();
     }
-
-    @AfterEach
-    public void clear() {
-        User currentUser = userRepository.findByEmail("api_user").block();
-        currentUser.getWorkspaceIds().remove(workspace.getId());
-        userRepository.save(currentUser);
-        workspaceRepository.deleteById(workspace.getId()).block();
-    }
 }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserWorkspaceServiceUnitTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserWorkspaceServiceUnitTest.java
index d6ff1b1560..957691492f 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserWorkspaceServiceUnitTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserWorkspaceServiceUnitTest.java
@@ -1,14 +1,18 @@
 package com.appsmith.server.services;
 
 import com.appsmith.server.constants.FieldName;
+import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.PermissionGroup;
+import com.appsmith.server.domains.User;
 import com.appsmith.server.domains.Workspace;
 import com.appsmith.server.dtos.MemberInfoDTO;
 import com.appsmith.server.dtos.PermissionGroupInfoDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.repositories.PermissionGroupRepository;
 import com.appsmith.server.repositories.UserDataRepository;
+import com.appsmith.server.solutions.ApplicationPermission;
 import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -20,7 +24,6 @@ import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
-import reactor.util.function.Tuple2;
 
 import java.util.List;
 import java.util.Map;
@@ -51,11 +54,55 @@ public class UserWorkspaceServiceUnitTest {
     @Autowired
     UserWorkspaceService userWorkspaceService;
 
+    @Autowired
+    ApplicationService applicationService;
+
+    @Autowired
+    ApplicationPermission applicationPermission;
+
+    @Autowired
+    ApplicationPageService applicationPageService;
+
+    @Autowired
+    SessionUserService sessionUserService;
+
     ModelMapper modelMapper;
 
+    Workspace workspace;
+
     @BeforeEach
     public void setUp() {
         modelMapper = new ModelMapper();
+
+        User currentUser = sessionUserService.getCurrentUser().block();
+        if (null == currentUser) {
+            // Do not proceed with further setup, because user context doesn't exist.
+            return;
+        }
+
+        // create a workspace object
+        Workspace testWorkspace = new Workspace();
+        testWorkspace.setName("Get All Members For Workspace Test");
+        testWorkspace.setDomain("test.com");
+        testWorkspace.setWebsite("https://test.com");
+
+        workspace = workspaceService.create(testWorkspace).block();
+    }
+
+    @AfterEach
+    public void cleanup() {
+        User currentUser = sessionUserService.getCurrentUser().block();
+        if (null == currentUser) {
+            // Do not proceed with cleanup, because user context doesn't exist.
+            return;
+        }
+        List<Application> deletedApplications = applicationService
+                .findByWorkspaceId(workspace.getId(), applicationPermission.getDeletePermission())
+                .flatMap(remainingApplication -> applicationPageService.deleteApplication(remainingApplication.getId()))
+                .collectList()
+                .block();
+        Workspace deletedWorkspace =
+                workspaceService.archiveById(workspace.getId()).block();
     }
 
     @Test
@@ -73,29 +120,16 @@ public class UserWorkspaceServiceUnitTest {
     @Test
     @WithUserDetails(value = "api_user")
     public void getWorkspaceMembers_WhenRoleIsNull_ReturnsEmptyList() {
-        // create a workspace object
-        Workspace testWorkspace = new Workspace();
-        testWorkspace.setName("Get All Members For Workspace Test");
-        testWorkspace.setDomain("test.com");
-        testWorkspace.setWebsite("https://test.com");
-        testWorkspace.setId("test-org-id");
-
-        /**
-         * Removing the Default Workspace ID from auto-created permission groups
-         * so that while fetching the Users and Groups, we should get empty list.
-         */
-        Workspace createdWorkspace = workspaceService.create(testWorkspace).block();
         List<PermissionGroup> autoCreatedPermissionGroups = permissionGroupRepository
-                .findByDefaultDomainIdAndDefaultDomainType(createdWorkspace.getId(), Workspace.class.getSimpleName())
+                .findByDefaultDomainIdAndDefaultDomainType(workspace.getId(), Workspace.class.getSimpleName())
                 .flatMap(permissionGroup -> {
                     permissionGroup.setDefaultDomainId(null);
-                    permissionGroup.setDefaultDomainType(null);
                     return permissionGroupRepository.save(permissionGroup);
                 })
                 .collectList()
                 .block();
 
-        Mono<List<MemberInfoDTO>> workspaceMembers = userWorkspaceService.getWorkspaceMembers(testWorkspace.getId());
+        Mono<List<MemberInfoDTO>> workspaceMembers = userWorkspaceService.getWorkspaceMembers(workspace.getId());
         StepVerifier.create(workspaceMembers)
                 .assertNext(userAndGroupDTOs -> {
                     assertEquals(0, userAndGroupDTOs.size());
@@ -104,6 +138,7 @@ public class UserWorkspaceServiceUnitTest {
     }
 
     @Test
+    @WithUserDetails(value = "api_user")
     public void getWorkspaceMembers_WhenNoOrgFound_ThrowsException() {
         String sampleWorkspaceId = "test-org-id";
         Mono<List<MemberInfoDTO>> workspaceMembers = userWorkspaceService.getWorkspaceMembers(sampleWorkspaceId);
@@ -115,19 +150,13 @@ public class UserWorkspaceServiceUnitTest {
     @Test
     @WithUserDetails(value = "api_user")
     public void getWorkspaceMembers_WhenUserHasProfilePhotoForOneWorkspace_ProfilePhotoIncluded() {
-        // create workspace
-        Workspace workspace = new Workspace();
-        workspace.setName("workspace_" + UUID.randomUUID());
-        Mono<Workspace> workspaceMono = workspaceService.create(workspace);
-
         Mono<List<MemberInfoDTO>> listMono = userDataService
                 .getForCurrentUser()
                 .flatMap(userData -> {
                     userData.setProfilePhotoAssetId("sample-photo-id");
                     return userDataRepository.save(userData);
                 })
-                .then(workspaceMono)
-                .flatMap(createdWorkspace -> userWorkspaceService.getWorkspaceMembers(createdWorkspace.getId()));
+                .then(userWorkspaceService.getWorkspaceMembers(workspace.getId()));
 
         StepVerifier.create(listMono)
                 .assertNext(workspaceMemberInfoDTOS -> {
@@ -140,15 +169,12 @@ public class UserWorkspaceServiceUnitTest {
     @Test
     @WithUserDetails(value = "api_user")
     public void getWorkspaceMembers_WhenUserHasProfilePhotoForMultipleWorkspace_ProfilePhotoIncluded() {
-        // create workspace
-        Workspace firstWorkspace = new Workspace();
-        firstWorkspace.setName("first-workspace-" + UUID.randomUUID());
-
+        // create additional workspace
         Workspace secondWorkspace = new Workspace();
         secondWorkspace.setName("second-workspace-" + UUID.randomUUID());
 
-        Mono<Tuple2<Workspace, Workspace>> createWorkspacesMono =
-                Mono.zip(workspaceService.create(firstWorkspace), workspaceService.create(secondWorkspace));
+        Mono<Workspace> createSecondWorkspaceMono =
+                workspaceService.create(secondWorkspace).cache();
 
         Mono<Map<String, List<MemberInfoDTO>>> mapMono = userDataService
                 .getForCurrentUser()
@@ -156,11 +182,11 @@ public class UserWorkspaceServiceUnitTest {
                     userData.setProfilePhotoAssetId("sample-photo-id");
                     return userDataRepository.save(userData);
                 })
-                .then(createWorkspacesMono)
-                .flatMap(workspaces -> {
+                .then(createSecondWorkspaceMono)
+                .flatMap(createdSecondWorkspace -> {
                     Set<String> createdIds = Set.of(
-                            Objects.requireNonNull(workspaces.getT1().getId()),
-                            Objects.requireNonNull(workspaces.getT2().getId()));
+                            Objects.requireNonNull(createdSecondWorkspace.getId()),
+                            Objects.requireNonNull(workspace.getId()));
                     return userWorkspaceService.getWorkspaceMembers(createdIds);
                 });
 
@@ -176,5 +202,10 @@ public class UserWorkspaceServiceUnitTest {
                     });
                 })
                 .verifyComplete();
+
+        // delete second workspace
+        Workspace deletedSecondWorkspace = createSecondWorkspaceMono
+                .flatMap(createdSecondWorkspace -> workspaceService.archiveById(createdSecondWorkspace.getId()))
+                .block();
     }
 }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/WorkspaceServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/WorkspaceServiceTest.java
index eac969a106..4c7e148cf4 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/WorkspaceServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/WorkspaceServiceTest.java
@@ -25,6 +25,7 @@ import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.MockPluginExecutor;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.helpers.TextUtils;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.repositories.AssetRepository;
 import com.appsmith.server.repositories.DatasourceRepository;
 import com.appsmith.server.repositories.PermissionGroupRepository;
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ActionServiceCE_Test.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ActionServiceCE_Test.java
index b29c34e4ce..104c3fa512 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ActionServiceCE_Test.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ActionServiceCE_Test.java
@@ -33,9 +33,13 @@ import com.appsmith.server.dtos.LayoutDTO;
 import com.appsmith.server.dtos.PageDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.export.internal.ImportExportApplicationService;
 import com.appsmith.server.helpers.MockPluginExecutor;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.newpages.base.NewPageService;
+import com.appsmith.server.plugins.base.PluginService;
+import com.appsmith.server.repositories.ApplicationRepository;
 import com.appsmith.server.repositories.DatasourceRepository;
 import com.appsmith.server.repositories.PermissionGroupRepository;
 import com.appsmith.server.repositories.PluginRepository;
@@ -45,13 +49,12 @@ import com.appsmith.server.services.AstService;
 import com.appsmith.server.services.LayoutActionService;
 import com.appsmith.server.services.LayoutService;
 import com.appsmith.server.services.MockDataService;
-import com.appsmith.server.services.NewPageService;
 import com.appsmith.server.services.PermissionGroupService;
-import com.appsmith.server.services.PluginService;
+import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.services.UserService;
 import com.appsmith.server.services.WorkspaceService;
+import com.appsmith.server.solutions.ApplicationPermission;
 import com.appsmith.server.solutions.EnvironmentPermission;
-import com.appsmith.server.solutions.ImportExportApplicationService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import net.minidev.json.JSONArray;
@@ -166,6 +169,15 @@ public class ActionServiceCE_Test {
     @Autowired
     EnvironmentPermission environmentPermission;
 
+    @Autowired
+    ApplicationPermission applicationPermission;
+
+    @Autowired
+    ApplicationRepository applicationRepository;
+
+    @Autowired
+    SessionUserService sessionUserService;
+
     Application testApp = null;
 
     PageDTO testPage = null;
@@ -183,7 +195,6 @@ public class ActionServiceCE_Test {
     String branchName;
 
     @BeforeEach
-    @WithUserDetails(value = "api_user")
     public void setup() {
 
         User apiUser = userService.findByEmail("api_user").block();
@@ -191,76 +202,70 @@ public class ActionServiceCE_Test {
         Workspace toCreate = new Workspace();
         toCreate.setName("ActionServiceCE_Test");
 
-        if (workspaceId == null) {
-            Workspace workspace =
-                    workspaceService.create(toCreate, apiUser, Boolean.FALSE).block();
-            workspaceId = workspace.getId();
+        Workspace workspace =
+                workspaceService.create(toCreate, apiUser, Boolean.FALSE).block();
+        workspaceId = workspace.getId();
 
-            defaultEnvironmentId = workspaceService
-                    .getDefaultEnvironmentId(workspaceId, environmentPermission.getExecutePermission())
-                    .block();
-        }
+        defaultEnvironmentId = workspaceService
+                .getDefaultEnvironmentId(workspaceId, environmentPermission.getExecutePermission())
+                .block();
 
-        if (testApp == null && testPage == null) {
-            // Create application and page which will be used by the tests to create actions for.
-            Application application = new Application();
-            application.setName(UUID.randomUUID().toString());
-            testApp = applicationPageService
-                    .createApplication(application, workspaceId)
-                    .block();
+        // Create application and page which will be used by the tests to create actions for.
+        Application application = new Application();
+        application.setName(UUID.randomUUID().toString());
+        testApp = applicationPageService
+                .createApplication(application, workspaceId)
+                .block();
 
-            final String pageId = testApp.getPages().get(0).getId();
+        final String pageId = testApp.getPages().get(0).getId();
 
-            testPage = newPageService.findPageById(pageId, READ_PAGES, false).block();
+        testPage = newPageService.findPageById(pageId, READ_PAGES, false).block();
 
-            Layout layout = testPage.getLayouts().get(0);
-            JSONObject dsl = new JSONObject(Map.of("text", "{{ query1.data }}"));
+        Layout layout = testPage.getLayouts().get(0);
+        JSONObject dsl = new JSONObject(Map.of("text", "{{ query1.data }}"));
 
-            JSONObject dsl2 = new JSONObject();
-            dsl2.put("widgetName", "Table1");
-            dsl2.put("type", "TABLE_WIDGET");
-            Map<String, Object> primaryColumns = new HashMap<>();
-            JSONObject jsonObject = new JSONObject(Map.of("key", "value"));
-            primaryColumns.put("_id", "{{ query1.data }}");
-            primaryColumns.put("_class", jsonObject);
-            dsl2.put("primaryColumns", primaryColumns);
-            final ArrayList<Object> objects = new ArrayList<>();
-            JSONArray temp2 = new JSONArray();
-            temp2.add(new JSONObject(Map.of("key", "primaryColumns._id")));
-            dsl2.put("dynamicBindingPathList", temp2);
-            objects.add(dsl2);
-            dsl.put("children", objects);
+        JSONObject dsl2 = new JSONObject();
+        dsl2.put("widgetName", "Table1");
+        dsl2.put("type", "TABLE_WIDGET");
+        Map<String, Object> primaryColumns = new HashMap<>();
+        JSONObject jsonObject = new JSONObject(Map.of("key", "value"));
+        primaryColumns.put("_id", "{{ query1.data }}");
+        primaryColumns.put("_class", jsonObject);
+        dsl2.put("primaryColumns", primaryColumns);
+        final ArrayList<Object> objects = new ArrayList<>();
+        JSONArray temp2 = new JSONArray();
+        temp2.add(new JSONObject(Map.of("key", "primaryColumns._id")));
+        dsl2.put("dynamicBindingPathList", temp2);
+        objects.add(dsl2);
+        dsl.put("children", objects);
 
-            layout.setDsl(dsl);
-            layout.setPublishedDsl(dsl);
-        }
+        layout.setDsl(dsl);
+        layout.setPublishedDsl(dsl);
 
-        if (gitConnectedApp == null) {
-            Application newApp = new Application();
-            newApp.setName(UUID.randomUUID().toString());
-            GitApplicationMetadata gitData = new GitApplicationMetadata();
-            gitData.setBranchName("actionServiceTest");
-            newApp.setGitApplicationMetadata(gitData);
-            gitConnectedApp = applicationPageService
-                    .createApplication(newApp, workspaceId)
-                    .flatMap(application -> {
-                        application.getGitApplicationMetadata().setDefaultApplicationId(application.getId());
-                        return applicationService
-                                .save(application)
-                                .zipWhen(application1 -> importExportApplicationService.exportApplicationById(
-                                        application1.getId(), gitData.getBranchName()));
-                    })
-                    // Assign the branchName to all the resources connected to the application
-                    .flatMap(tuple -> importExportApplicationService.importApplicationInWorkspaceFromGit(
-                            workspaceId, tuple.getT2(), tuple.getT1().getId(), gitData.getBranchName()))
-                    .block();
+        Application newApp = new Application();
+        newApp.setName(UUID.randomUUID().toString());
+        GitApplicationMetadata gitData = new GitApplicationMetadata();
+        gitData.setBranchName("actionServiceTest");
+        newApp.setGitApplicationMetadata(gitData);
+        gitConnectedApp = applicationPageService
+                .createApplication(newApp, workspaceId)
+                .flatMap(application2 -> {
+                    application2.getGitApplicationMetadata().setDefaultApplicationId(application2.getId());
+                    return applicationService
+                            .save(application2)
+                            .zipWhen(application1 -> importExportApplicationService.exportApplicationById(
+                                    application1.getId(), gitData.getBranchName()));
+                })
+                // Assign the branchName to all the resources connected to the application
+                .flatMap(tuple -> importExportApplicationService.importApplicationInWorkspaceFromGit(
+                        workspaceId, tuple.getT2(), tuple.getT1().getId(), gitData.getBranchName()))
+                .block();
 
-            gitConnectedPage = newPageService
-                    .findPageById(gitConnectedApp.getPages().get(0).getId(), READ_PAGES, false)
-                    .block();
+        gitConnectedPage = newPageService
+                .findPageById(gitConnectedApp.getPages().get(0).getId(), READ_PAGES, false)
+                .block();
 
-            branchName = gitConnectedApp.getGitApplicationMetadata().getBranchName();
-        }
+        branchName = gitConnectedApp.getGitApplicationMetadata().getBranchName();
 
         datasource = new Datasource();
         datasource.setName("Default Database");
@@ -272,11 +277,13 @@ public class ActionServiceCE_Test {
     }
 
     @AfterEach
-    @WithUserDetails(value = "api_user")
     public void cleanup() {
-        applicationPageService.deleteApplication(testApp.getId()).block();
-        testApp = null;
-        testPage = null;
+        List<Application> deletedApplications = applicationService
+                .findByWorkspaceId(workspaceId, applicationPermission.getDeletePermission())
+                .flatMap(remainingApplication -> applicationPageService.deleteApplication(remainingApplication.getId()))
+                .collectList()
+                .block();
+        Workspace deletedWorkspace = workspaceService.archiveById(workspaceId).block();
     }
 
     @Test
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 a018d9c426..04c8da6fd4 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
@@ -12,6 +12,7 @@ import com.appsmith.external.models.PluginType;
 import com.appsmith.external.models.Policy;
 import com.appsmith.external.plugins.PluginExecutor;
 import com.appsmith.server.acl.AclPermission;
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.datasources.base.DatasourceService;
 import com.appsmith.server.domains.ActionCollection;
@@ -39,11 +40,15 @@ import com.appsmith.server.dtos.UserHomepageDTO;
 import com.appsmith.server.dtos.WorkspaceApplicationsDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.export.internal.ImportExportApplicationService;
 import com.appsmith.server.helpers.MockPluginExecutor;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.helpers.TextUtils;
+import com.appsmith.server.jslibs.base.CustomJSLibService;
 import com.appsmith.server.migrations.ApplicationVersion;
 import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.newpages.base.NewPageService;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.repositories.ApplicationRepository;
 import com.appsmith.server.repositories.AssetRepository;
 import com.appsmith.server.repositories.DatasourceRepository;
@@ -51,24 +56,20 @@ import com.appsmith.server.repositories.NewPageRepository;
 import com.appsmith.server.repositories.PermissionGroupRepository;
 import com.appsmith.server.repositories.PluginRepository;
 import com.appsmith.server.repositories.UserRepository;
-import com.appsmith.server.services.ActionCollectionService;
 import com.appsmith.server.services.ApplicationService;
-import com.appsmith.server.services.CustomJSLibService;
 import com.appsmith.server.services.LayoutActionService;
 import com.appsmith.server.services.LayoutCollectionService;
-import com.appsmith.server.services.NewPageService;
 import com.appsmith.server.services.PermissionGroupService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.services.SessionUserService;
-import com.appsmith.server.services.ThemeService;
 import com.appsmith.server.services.UserService;
 import com.appsmith.server.services.WorkspaceService;
 import com.appsmith.server.solutions.ApplicationFetcher;
+import com.appsmith.server.solutions.ApplicationPermission;
 import com.appsmith.server.solutions.DatasourcePermission;
 import com.appsmith.server.solutions.EnvironmentPermission;
-import com.appsmith.server.solutions.ImportExportApplicationService;
 import com.appsmith.server.solutions.PagePermission;
 import com.appsmith.server.solutions.ReleaseNotesService;
+import com.appsmith.server.themes.base.ThemeService;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -76,11 +77,13 @@ import lombok.extern.slf4j.Slf4j;
 import net.minidev.json.JSONArray;
 import net.minidev.json.JSONObject;
 import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.core.io.ClassPathResource;
@@ -160,7 +163,7 @@ public class ApplicationServiceCETest {
     @Autowired
     ApplicationService applicationService;
 
-    @Autowired
+    @Qualifier("applicationPageServiceCEImpl") @Autowired
     ApplicationPageServiceCE applicationPageService;
 
     @Autowired
@@ -247,6 +250,9 @@ public class ApplicationServiceCETest {
     @Autowired
     DatasourceRepository datasourceRepository;
 
+    @Autowired
+    ApplicationPermission applicationPermission;
+
     String workspaceId;
     String defaultEnvironmentId;
 
@@ -254,7 +260,6 @@ public class ApplicationServiceCETest {
     private AssetRepository assetRepository;
 
     @BeforeEach
-    @WithUserDetails(value = "api_user")
     public void setup() {
 
         User currentUser = sessionUserService.getCurrentUser().block();
@@ -270,78 +275,84 @@ public class ApplicationServiceCETest {
         Workspace toCreate = new Workspace();
         toCreate.setName("ApplicationServiceTest");
 
-        if (workspaceId == null) {
-            Workspace workspace =
-                    workspaceService.create(toCreate, apiUser, Boolean.FALSE).block();
-            workspaceId = workspace.getId();
+        Workspace workspace =
+                workspaceService.create(toCreate, apiUser, Boolean.FALSE).block();
+        workspaceId = workspace.getId();
 
-            defaultEnvironmentId = workspaceService
-                    .getDefaultEnvironmentId(workspaceId, environmentPermission.getExecutePermission())
-                    .block();
+        defaultEnvironmentId = workspaceService
+                .getDefaultEnvironmentId(workspaceId, environmentPermission.getExecutePermission())
+                .block();
 
-            if (StringUtils.hasLength(gitConnectedApp.getId())) {
-                applicationPageService
-                        .deleteApplication(gitConnectedApp.getId())
-                        .block();
-            }
+        gitConnectedApp = new Application();
+        gitConnectedApp.setWorkspaceId(workspaceId);
+        GitApplicationMetadata gitData = new GitApplicationMetadata();
+        gitData.setBranchName("testBranch");
+        gitData.setDefaultBranchName("testBranch");
+        gitData.setRepoName("testRepo");
+        gitData.setRemoteUrl("git@test.com:user/testRepo.git");
+        gitData.setRepoName("testRepo");
+        gitConnectedApp.setGitApplicationMetadata(gitData);
+        // This will be altered in update app by branch test
+        gitConnectedApp.setName("gitConnectedApp");
+        gitConnectedApp = applicationPageService
+                .createApplication(gitConnectedApp)
+                .flatMap(application -> {
+                    application.getGitApplicationMetadata().setDefaultApplicationId(application.getId());
+                    return applicationService.save(application);
+                })
+                // Assign the branchName to all the resources connected to the application
+                .flatMap(application -> importExportApplicationService.exportApplicationById(
+                        application.getId(), gitData.getBranchName()))
+                .flatMap(applicationJson -> importExportApplicationService.importApplicationInWorkspaceFromGit(
+                        workspaceId, applicationJson, gitConnectedApp.getId(), gitData.getBranchName()))
+                .block();
 
-            gitConnectedApp = new Application();
-            gitConnectedApp.setWorkspaceId(workspaceId);
-            GitApplicationMetadata gitData = new GitApplicationMetadata();
-            gitData.setBranchName("testBranch");
-            gitData.setDefaultBranchName("testBranch");
-            gitData.setRepoName("testRepo");
-            gitData.setRemoteUrl("git@test.com:user/testRepo.git");
-            gitData.setRepoName("testRepo");
-            gitConnectedApp.setGitApplicationMetadata(gitData);
-            // This will be altered in update app by branch test
-            gitConnectedApp.setName("gitConnectedApp");
-            gitConnectedApp = applicationPageService
-                    .createApplication(gitConnectedApp)
-                    .flatMap(application -> {
-                        application.getGitApplicationMetadata().setDefaultApplicationId(application.getId());
-                        return applicationService.save(application);
-                    })
-                    // Assign the branchName to all the resources connected to the application
-                    .flatMap(application -> importExportApplicationService.exportApplicationById(
-                            application.getId(), gitData.getBranchName()))
-                    .flatMap(applicationJson -> importExportApplicationService.importApplicationInWorkspaceFromGit(
-                            workspaceId, applicationJson, gitConnectedApp.getId(), gitData.getBranchName()))
-                    .block();
+        testPlugin = pluginService.findByPackageName("restapi-plugin").block();
 
-            testPlugin = pluginService.findByPackageName("restapi-plugin").block();
+        Datasource datasource = new Datasource();
+        datasource.setName("Clone App with action Test");
+        datasource.setPluginId(testPlugin.getId());
+        datasource.setWorkspaceId(workspaceId);
+        DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
+        datasourceConfiguration.setUrl("http://test.com");
 
-            Datasource datasource = new Datasource();
-            datasource.setName("Clone App with action Test");
-            datasource.setPluginId(testPlugin.getId());
-            datasource.setWorkspaceId(workspaceId);
-            DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
-            datasourceConfiguration.setUrl("http://test.com");
+        HashMap<String, DatasourceStorageDTO> storages = new HashMap<>();
+        storages.put(
+                defaultEnvironmentId, new DatasourceStorageDTO(null, defaultEnvironmentId, datasourceConfiguration));
+        datasource.setDatasourceStorages(storages);
+        testDatasource = datasourceService.create(datasource).block();
 
-            HashMap<String, DatasourceStorageDTO> storages = new HashMap<>();
-            storages.put(
-                    defaultEnvironmentId,
-                    new DatasourceStorageDTO(null, defaultEnvironmentId, datasourceConfiguration));
-            datasource.setDatasourceStorages(storages);
-            testDatasource = datasourceService.create(datasource).block();
+        String environmentId = workspaceService
+                .getDefaultEnvironmentId(workspaceId, environmentPermission.getExecutePermission())
+                .block();
 
-            String environmentId = workspaceService
-                    .getDefaultEnvironmentId(workspaceId, environmentPermission.getExecutePermission())
-                    .block();
+        Datasource datasource1 = new Datasource();
+        datasource1.setName("Clone App with action Test1");
+        datasource1.setPluginId(testPlugin.getId());
+        DatasourceConfiguration datasourceConfiguration1 = new DatasourceConfiguration();
+        datasourceConfiguration1.setUrl("http://test.com");
+        datasource1.setWorkspaceId(workspaceId);
 
-            Datasource datasource1 = new Datasource();
-            datasource1.setName("Clone App with action Test1");
-            datasource1.setPluginId(testPlugin.getId());
-            DatasourceConfiguration datasourceConfiguration1 = new DatasourceConfiguration();
-            datasourceConfiguration1.setUrl("http://test.com");
-            datasource1.setWorkspaceId(workspaceId);
+        HashMap<String, DatasourceStorageDTO> storages1 = new HashMap<>();
+        storages1.put(environmentId, new DatasourceStorageDTO(null, environmentId, datasourceConfiguration1));
+        datasource1.setDatasourceStorages(storages1);
 
-            HashMap<String, DatasourceStorageDTO> storages1 = new HashMap<>();
-            storages1.put(environmentId, new DatasourceStorageDTO(null, environmentId, datasourceConfiguration1));
-            datasource1.setDatasourceStorages(storages1);
+        testDatasource1 = datasourceService.create(datasource1).block();
+    }
 
-            testDatasource1 = datasourceService.create(datasource1).block();
+    @AfterEach
+    public void cleanup() {
+        User currentUser = sessionUserService.getCurrentUser().block();
+        if (!currentUser.getEmail().equals("api_user")) {
+            // Since no setup was done, hence no cleanup needs to happen
+            return;
         }
+        List<Application> deletedApplications = applicationService
+                .findByWorkspaceId(workspaceId, applicationPermission.getDeletePermission())
+                .flatMap(remainingApplication -> applicationPageService.deleteApplication(remainingApplication.getId()))
+                .collectList()
+                .block();
+        Workspace deletedWorkspace = workspaceService.archiveById(workspaceId).block();
     }
 
     private Mono<? extends BaseDomain> getArchivedResource(String id, Class<? extends BaseDomain> domainClass) {
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ApplicationSnapshotServiceUnitTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ApplicationSnapshotServiceUnitTest.java
index c4024e6cf0..4047f058fc 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ApplicationSnapshotServiceUnitTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ApplicationSnapshotServiceUnitTest.java
@@ -10,12 +10,11 @@ import com.appsmith.server.domains.Layout;
 import com.appsmith.server.domains.NewPage;
 import com.appsmith.server.dtos.ApplicationJson;
 import com.appsmith.server.dtos.PageDTO;
+import com.appsmith.server.export.internal.ImportExportApplicationService;
 import com.appsmith.server.repositories.ApplicationSnapshotRepository;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.ApplicationSnapshotService;
 import com.appsmith.server.solutions.ApplicationPermission;
-import com.appsmith.server.solutions.ApplicationPermissionImpl;
-import com.appsmith.server.solutions.ImportExportApplicationService;
 import com.google.gson.Gson;
 import net.minidev.json.JSONObject;
 import org.junit.jupiter.api.Test;
@@ -54,7 +53,8 @@ public class ApplicationSnapshotServiceUnitTest {
     @Autowired
     ApplicationSnapshotService applicationSnapshotService;
 
-    ApplicationPermission applicationPermission = new ApplicationPermissionImpl();
+    @Autowired
+    ApplicationPermission applicationPermission;
 
     @Autowired
     Gson gson;
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/EmailServiceCEImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/EmailServiceCEImplTest.java
index d6ccc8e0d5..e4c1c1110d 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/EmailServiceCEImplTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/EmailServiceCEImplTest.java
@@ -2,19 +2,16 @@ package com.appsmith.server.services.ce;
 
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.domains.PermissionGroup;
-import com.appsmith.server.domains.Tenant;
-import com.appsmith.server.domains.TenantConfiguration;
 import com.appsmith.server.domains.User;
 import com.appsmith.server.domains.Workspace;
 import com.appsmith.server.notifications.EmailSender;
 import com.appsmith.server.services.TenantService;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import reactor.core.publisher.Mono;
 
@@ -34,6 +31,7 @@ import static com.appsmith.server.constants.ce.EmailConstantsCE.PRIMARY_LINK_URL
 import static com.appsmith.server.constants.ce.EmailConstantsCE.RESET_URL;
 import static com.appsmith.server.constants.ce.EmailConstantsCE.WORKSPACE_EMAIL_SUBJECT_FOR_NEW_USER;
 import static graphql.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.anyMap;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -46,22 +44,11 @@ class EmailServiceCEImplTest {
     @Autowired
     TenantService tenantService;
 
-    @Mock
+    @SpyBean
     EmailSender mockEmailSender;
 
-    private EmailServiceCE emailService;
-
-    @BeforeEach
-    public void setup() {
-        MockitoAnnotations.openMocks(this);
-        TenantConfiguration tenantConfiguration = new TenantConfiguration();
-
-        Tenant tenant = tenantService.getDefaultTenant().block();
-        assert tenant != null;
-        tenant.setTenantConfiguration(tenantConfiguration);
-
-        this.emailService = new EmailServiceCEImpl(mockEmailSender, tenantService);
-    }
+    @Autowired
+    @Qualifier("emailServiceCEImpl") private EmailServiceCE emailService;
 
     @Test
     void sendForgotPasswordEmail() {
@@ -83,7 +70,10 @@ class EmailServiceCEImplTest {
                     assertEquals(
                             String.format(FORGOT_PASSWORD_EMAIL_SUBJECT, expectedParams.get(INSTANCE_NAME)), subject);
                     assertEquals(FORGOT_PASSWORD_TEMPLATE_CE, text);
-                    assertEquals(expectedParams, params);
+                    assertThat(params).containsKey(RESET_URL);
+                    assertThat(params.get(RESET_URL)).isEqualTo(resetUrl);
+                    assertThat(params).containsKey(INSTANCE_NAME);
+                    assertThat(params.get(INSTANCE_NAME)).isEqualTo("Appsmith");
 
                     return Mono.just(true);
                 })
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/GitServiceCETest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/GitServiceCETest.java
index d1b7db740c..78573e9ad2 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/GitServiceCETest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/GitServiceCETest.java
@@ -12,6 +12,7 @@ import com.appsmith.external.models.DatasourceStorageDTO;
 import com.appsmith.external.models.DefaultResources;
 import com.appsmith.external.models.JSValue;
 import com.appsmith.external.models.PluginType;
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.datasources.base.DatasourceService;
 import com.appsmith.server.domains.ActionCollection;
@@ -46,19 +47,19 @@ import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.migrations.JsonSchemaMigration;
 import com.appsmith.server.migrations.JsonSchemaVersions;
 import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.repositories.ApplicationRepository;
 import com.appsmith.server.repositories.PluginRepository;
 import com.appsmith.server.repositories.WorkspaceRepository;
-import com.appsmith.server.services.ActionCollectionService;
 import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.LayoutActionService;
 import com.appsmith.server.services.LayoutCollectionService;
-import com.appsmith.server.services.NewPageService;
-import com.appsmith.server.services.ThemeService;
 import com.appsmith.server.services.UserService;
 import com.appsmith.server.services.WorkspaceService;
+import com.appsmith.server.solutions.ApplicationPermission;
 import com.appsmith.server.solutions.EnvironmentPermission;
+import com.appsmith.server.themes.base.ThemeService;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -71,6 +72,7 @@ import org.eclipse.jgit.api.errors.EmptyCommitException;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.errors.RepositoryNotFoundException;
 import org.eclipse.jgit.lib.BranchTrackingStatus;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -201,40 +203,43 @@ public class GitServiceCETest {
     @Autowired
     EnvironmentPermission environmentPermission;
 
+    @Autowired
+    ApplicationPermission applicationPermission;
+
     @BeforeEach
     public void setup() throws IOException, GitAPIException {
 
-        if (StringUtils.isEmpty(workspaceId)) {
+        User apiUser = userService.findByEmail("api_user").block();
+        Workspace toCreate = new Workspace();
+        toCreate.setName("Git Service Test");
 
-            User apiUser = userService.findByEmail("api_user").block();
-            Workspace toCreate = new Workspace();
-            toCreate.setName("Git Service Test");
-
-            if (!org.springframework.util.StringUtils.hasLength(workspaceId)) {
-                Workspace workspace = workspaceService
-                        .create(toCreate, apiUser, Boolean.FALSE)
-                        .block();
-                workspaceId = workspace.getId();
-                defaultEnvironmentId = workspaceService
-                        .getDefaultEnvironmentId(workspaceId, environmentPermission.getExecutePermission())
-                        .block();
-            }
-        }
+        Workspace workspace =
+                workspaceService.create(toCreate, apiUser, Boolean.FALSE).block();
+        workspaceId = workspace.getId();
+        defaultEnvironmentId = workspaceService
+                .getDefaultEnvironmentId(workspaceId, environmentPermission.getExecutePermission())
+                .block();
 
         Mockito.when(gitCloudServicesUtils.getPrivateRepoLimitForOrg(eq(workspaceId), Mockito.anyBoolean()))
                 .thenReturn(Mono.just(-1));
 
         Mockito.when(pluginExecutorHelper.getPluginExecutor(any())).thenReturn(Mono.just(new MockPluginExecutor()));
 
-        if (TRUE.equals(isSetupDone)) {
-            return;
-        }
-
         gitConnectedApplication = createApplicationConnectedToGit("gitConnectedApplication", DEFAULT_BRANCH);
         // applicationPermission = new ApplicationPermissionImpl();
         testUserProfile.setAuthorEmail("test@email.com");
         testUserProfile.setAuthorName("testUser");
-        isSetupDone = true;
+    }
+
+    @AfterEach
+    public void cleanup() {
+        Mockito.when(gitFileUtils.deleteLocalRepo(any(Path.class))).thenReturn(Mono.just(true));
+        List<Application> deletedApplications = applicationService
+                .findByWorkspaceId(workspaceId, applicationPermission.getDeletePermission())
+                .flatMap(remainingApplication -> applicationPageService.deleteApplication(remainingApplication.getId()))
+                .collectList()
+                .block();
+        Workspace deletedWorkspace = workspaceService.archiveById(workspaceId).block();
     }
 
     private Mono<ApplicationJson> createAppJson(String filePath) {
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/NewActionServiceUnitTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/NewActionServiceUnitTest.java
index 3a70e67def..3f4f12d8f7 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/NewActionServiceUnitTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/NewActionServiceUnitTest.java
@@ -10,14 +10,14 @@ import com.appsmith.server.domains.Plugin;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.newactions.base.NewActionServiceCEImpl;
+import com.appsmith.server.newpages.base.NewPageService;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.repositories.NewActionRepository;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.ConfigService;
 import com.appsmith.server.services.MarketplaceService;
-import com.appsmith.server.services.NewPageService;
 import com.appsmith.server.services.PermissionGroupService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.solutions.ActionPermission;
 import com.appsmith.server.solutions.ActionPermissionImpl;
 import com.appsmith.server.solutions.ApplicationPermission;
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/PluginServiceCEImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/PluginServiceCEImplTest.java
index d2c5ea9769..4fdb382981 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/PluginServiceCEImplTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/PluginServiceCEImplTest.java
@@ -1,6 +1,8 @@
 package com.appsmith.server.services.ce;
 
 import com.appsmith.server.domains.Plugin;
+import com.appsmith.server.plugins.base.PluginServiceCE;
+import com.appsmith.server.plugins.base.PluginServiceCEImpl;
 import com.appsmith.server.repositories.PluginRepository;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.WorkspaceService;
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/TenantServiceCETest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/TenantServiceCETest.java
index 7780b0da59..3102690ad6 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/TenantServiceCETest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/TenantServiceCETest.java
@@ -13,6 +13,7 @@ import com.appsmith.server.helpers.UserUtils;
 import com.appsmith.server.repositories.UserRepository;
 import com.appsmith.server.services.TenantService;
 import com.appsmith.server.solutions.EnvManager;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -68,10 +69,13 @@ class TenantServiceCETest {
     @MockBean
     FeatureFlagMigrationHelper featureFlagMigrationHelper;
 
+    TenantConfiguration originalTenantConfiguration;
+
     @BeforeEach
     public void setup() throws IOException {
         final Tenant tenant = tenantService.getDefaultTenant().block();
         assert tenant != null;
+        originalTenantConfiguration = tenant.getTenantConfiguration();
         mongoOperations.updateFirst(
                 Query.query(Criteria.where(FieldName.ID).is(tenant.getId())),
                 Update.update(fieldName(QTenant.tenant.tenantConfiguration), null),
@@ -85,6 +89,15 @@ class TenantServiceCETest {
                 .block();
     }
 
+    @AfterEach
+    public void cleanup() {
+        final Tenant tenant = tenantService.getDefaultTenant().block();
+        mongoOperations.updateFirst(
+                Query.query(Criteria.where(FieldName.ID).is(tenant.getId())),
+                Update.update(fieldName(QTenant.tenant.tenantConfiguration), originalTenantConfiguration),
+                Tenant.class);
+    }
+
     @Test
     void ensureMapsKey() {
         StepVerifier.create(tenantService.getTenantConfiguration())
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationFetcherTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationFetcherTest.java
index aa3d9cc0be..49d811b47b 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationFetcherTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationFetcherTest.java
@@ -7,6 +7,8 @@ import com.appsmith.server.dtos.UserHomepageDTO;
 import com.appsmith.server.dtos.WorkspaceApplicationsDTO;
 import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.WorkspaceService;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,24 +35,34 @@ public class ApplicationFetcherTest {
     @Autowired
     private ApplicationFetcher applicationFetcher;
 
+    Workspace workspace;
+
+    @BeforeEach
+    public void setup() {
+        Workspace newWorkspace = new Workspace();
+        newWorkspace.setName("ApplicationFetcherTest");
+        workspace = workspaceService.create(newWorkspace).block();
+    }
+
+    @AfterEach
+    public void cleanup() {
+        Workspace deletedWorkspace =
+                workspaceService.archiveById(workspace.getId()).block();
+    }
+
     @Test
     @WithUserDetails("api_user")
     public void getAllApplications_WhenUnpublishedPageExists_ReturnsApplications() {
         String randomUUID = UUID.randomUUID().toString();
-        Workspace newWorkspace = new Workspace();
-        newWorkspace.setName("org_" + randomUUID);
 
-        Mono<UserHomepageDTO> homepageDTOMono = workspaceService
-                .create(newWorkspace)
-                .flatMap(workspace -> {
-                    Application application = new Application();
-                    application.setName("app_" + randomUUID);
-                    return applicationPageService.createApplication(application, workspace.getId());
-                })
-                .flatMap(application -> {
+        Application application = new Application();
+        application.setName("app_" + randomUUID);
+        Mono<UserHomepageDTO> homepageDTOMono = applicationPageService
+                .createApplication(application, workspace.getId())
+                .flatMap(application1 -> {
                     PageDTO pageDTO = new PageDTO();
                     pageDTO.setName("New page");
-                    return applicationPageService.createPage(pageDTO).thenReturn(application);
+                    return applicationPageService.createPage(pageDTO).thenReturn(application1);
                 })
                 .then(applicationFetcher.getAllApplications());
 
@@ -58,7 +70,7 @@ public class ApplicationFetcherTest {
             assertThat(userHomepageDTO.getWorkspaceApplications()).isNotNull();
 
             WorkspaceApplicationsDTO orgApps = userHomepageDTO.getWorkspaceApplications().stream()
-                    .filter(x -> x.getWorkspace().getName().equals(newWorkspace.getName()))
+                    .filter(x -> x.getWorkspace().getName().equals(workspace.getName()))
                     .findFirst()
                     .orElse(new WorkspaceApplicationsDTO());
 
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationFetcherUnitTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationFetcherUnitTest.java
index d5c67fd5ad..d708b73dff 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationFetcherUnitTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationFetcherUnitTest.java
@@ -12,9 +12,9 @@ import com.appsmith.server.dtos.PageDTO;
 import com.appsmith.server.dtos.UserHomepageDTO;
 import com.appsmith.server.dtos.WorkspaceApplicationsDTO;
 import com.appsmith.server.helpers.ResponseUtils;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.repositories.ApplicationRepository;
 import com.appsmith.server.services.ApplicationService;
-import com.appsmith.server.services.NewPageService;
 import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.services.UserDataService;
 import com.appsmith.server.services.UserService;
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationForkingServiceTests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationForkingServiceTests.java
index 67eb4feff2..02bcea5c95 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationForkingServiceTests.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ApplicationForkingServiceTests.java
@@ -18,6 +18,7 @@ import com.appsmith.external.models.Property;
 import com.appsmith.external.models.SSLDetails;
 import com.appsmith.external.models.UploadedFile;
 import com.appsmith.server.acl.AclPermission;
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.datasources.base.DatasourceService;
 import com.appsmith.server.domains.ActionCollection;
@@ -39,24 +40,24 @@ import com.appsmith.server.dtos.InviteUsersDTO;
 import com.appsmith.server.dtos.PageDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.export.internal.ImportExportApplicationService;
 import com.appsmith.server.fork.internal.ApplicationForkingService;
 import com.appsmith.server.helpers.MockPluginExecutor;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.repositories.ApplicationRepository;
 import com.appsmith.server.repositories.NewPageRepository;
 import com.appsmith.server.repositories.PluginRepository;
 import com.appsmith.server.repositories.WorkspaceRepository;
-import com.appsmith.server.services.ActionCollectionService;
 import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.LayoutActionService;
 import com.appsmith.server.services.LayoutCollectionService;
-import com.appsmith.server.services.NewPageService;
 import com.appsmith.server.services.PermissionGroupService;
 import com.appsmith.server.services.SessionUserService;
-import com.appsmith.server.services.ThemeService;
 import com.appsmith.server.services.WorkspaceService;
+import com.appsmith.server.themes.base.ThemeService;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.SneakyThrows;
@@ -492,7 +493,8 @@ public class ApplicationForkingServiceTests {
         // Trigger the fork application flow
         applicationForkingService
                 .forkApplicationToWorkspaceWithEnvironment(sourceAppId, targetWorkspace.getId(), sourceEnvironmentId)
-                .timeout(Duration.ofMillis(10))
+                // Increase the timer because feature flags are taking some tiem to be computed.
+                .timeout(Duration.ofMillis(50))
                 .subscribe();
 
         // Wait for fork to complete
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/AuthenticationServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/AuthenticationServiceTest.java
index 71b75842e5..065d8994d9 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/AuthenticationServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/AuthenticationServiceTest.java
@@ -18,11 +18,14 @@ import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.MockPluginExecutor;
 import com.appsmith.server.helpers.PluginExecutorHelper;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.repositories.WorkspaceRepository;
 import com.appsmith.server.services.ApplicationPageService;
-import com.appsmith.server.services.PluginService;
+import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.UserService;
 import com.appsmith.server.services.WorkspaceService;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
@@ -38,6 +41,7 @@ import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 import java.util.regex.Pattern;
@@ -75,6 +79,32 @@ public class AuthenticationServiceTest {
     @Autowired
     EnvironmentPermission environmentPermission;
 
+    @Autowired
+    ApplicationPermission applicationPermission;
+
+    @Autowired
+    ApplicationService applicationService;
+
+    Workspace workspace;
+
+    @BeforeEach
+    public void setup() {
+        Workspace newWorkspace = new Workspace();
+        newWorkspace.setName("ApplicationFetcherTest");
+        workspace = workspaceService.create(newWorkspace).block();
+    }
+
+    @AfterEach
+    public void cleanup() {
+        List<Application> deletedApplications = applicationService
+                .findByWorkspaceId(workspace.getId(), applicationPermission.getDeletePermission())
+                .flatMap(remainingApplication -> applicationPageService.deleteApplication(remainingApplication.getId()))
+                .collectList()
+                .block();
+        Workspace deletedWorkspace =
+                workspaceService.archiveById(workspace.getId()).block();
+    }
+
     @Test
     @WithUserDetails(value = "api_user")
     public void testGetAuthorizationCodeURL_missingDatasource() {
@@ -91,14 +121,8 @@ public class AuthenticationServiceTest {
     @Test
     @WithUserDetails(value = "api_user")
     public void testGetAuthorizationCodeURL_invalidDatasourceWithNullAuthentication() {
-        Workspace testWorkspace = new Workspace();
-        testWorkspace.setName("Another Test Workspace");
-        testWorkspace = workspaceService.create(testWorkspace).block();
-        assert testWorkspace != null;
-        String workspaceId = testWorkspace.getId();
-
         String defaultEnvironmentId = workspaceService
-                .getDefaultEnvironmentId(workspaceId, environmentPermission.getExecutePermission())
+                .getDefaultEnvironmentId(workspace.getId(), environmentPermission.getExecutePermission())
                 .block();
 
         Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any()))
@@ -107,7 +131,7 @@ public class AuthenticationServiceTest {
         Mono<Plugin> pluginMono = pluginService.findByName("Installed Plugin Name");
         Datasource datasource = new Datasource();
         datasource.setName("Missing OAuth2 datasource");
-        datasource.setWorkspaceId(workspaceId);
+        datasource.setWorkspaceId(workspace.getId());
         DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
         datasourceConfiguration.setUrl("http://test.com");
 
@@ -144,13 +168,8 @@ public class AuthenticationServiceTest {
         MockServerHttpRequest httpRequest =
                 MockServerHttpRequest.get("").headers(mockHeaders).build();
 
-        Workspace testWorkspace = new Workspace();
-        testWorkspace.setName("Another Test Workspace");
-        testWorkspace = workspaceService.create(testWorkspace).block();
-        assert testWorkspace != null;
-        String workspaceId = testWorkspace.getId();
         String defaultEnvironmentId = workspaceService
-                .getDefaultEnvironmentId(workspaceId, environmentPermission.getExecutePermission())
+                .getDefaultEnvironmentId(workspace.getId(), environmentPermission.getExecutePermission())
                 .block();
 
         Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any()))
@@ -161,8 +180,9 @@ public class AuthenticationServiceTest {
 
         Application newApp = new Application();
         newApp.setName(UUID.randomUUID().toString());
-        Application application =
-                applicationPageService.createApplication(newApp, workspaceId).block();
+        Application application = applicationPageService
+                .createApplication(newApp, workspace.getId())
+                .block();
 
         testPage.setApplicationId(application.getId());
 
@@ -174,14 +194,14 @@ public class AuthenticationServiceTest {
                 .flatMap(plugin -> {
                     return pluginService.installPlugin(PluginWorkspaceDTO.builder()
                             .pluginId(plugin.getId())
-                            .workspaceId(workspaceId)
+                            .workspaceId(workspace.getId())
                             .status(WorkspacePluginStatus.FREE)
                             .build());
                 })
                 .block();
         Datasource datasource = new Datasource();
         datasource.setName("Valid datasource for OAuth2");
-        datasource.setWorkspaceId(workspaceId);
+        datasource.setWorkspaceId(workspace.getId());
         DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
         datasourceConfiguration.setUrl("http://test.com");
         OAuth2 authenticationDTO = new OAuth2();
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 89decfeff9..21ba8008e1 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
@@ -28,17 +28,19 @@ import com.appsmith.server.dtos.CRUDPageResponseDTO;
 import com.appsmith.server.dtos.PageDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.export.internal.ImportExportApplicationService;
 import com.appsmith.server.helpers.MockPluginExecutor;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.repositories.PluginRepository;
 import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.DatasourceStructureService;
-import com.appsmith.server.services.NewPageService;
 import com.appsmith.server.services.WorkspaceService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -74,7 +76,7 @@ public class CreateDBTablePageSolutionTests {
     // Regex to break string in separate words
     static final String specialCharactersRegex = "[^a-zA-Z0-9,;(){}*_]+";
     private static final String DATA = "data";
-    private static final Datasource testDatasource = new Datasource();
+    private static Datasource testDatasource = new Datasource();
     private static final DatasourceStorageStructure testDatasourceStructure = new DatasourceStorageStructure();
     private static Workspace testWorkspace;
     private static String testDefaultEnvironmentId;
@@ -157,6 +159,9 @@ public class CreateDBTablePageSolutionTests {
     @Autowired
     EnvironmentPermission environmentPermission;
 
+    @Autowired
+    ApplicationPermission applicationPermission;
+
     DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration();
 
     @MockBean
@@ -167,7 +172,6 @@ public class CreateDBTablePageSolutionTests {
     private final CRUDPageResourceDTO resource = new CRUDPageResourceDTO();
 
     @BeforeEach
-    @WithUserDetails(value = "api_user")
     public void setup() {
 
         Mockito.when(pluginExecutorHelper.getPluginExecutor(any())).thenReturn(Mono.just(spyMockPluginExecutor));
@@ -175,68 +179,73 @@ public class CreateDBTablePageSolutionTests {
                 .thenReturn(Mono.just(spyMockPluginExecutor))
                 .thenReturn(Mono.just(spyMockPluginExecutor));
 
-        if (testWorkspace == null) {
-            Workspace workspace = new Workspace();
-            workspace.setName("Create-DB-Table-Page-Org");
-            testWorkspace = workspaceService.create(workspace).block();
-            testDefaultEnvironmentId = workspaceService
-                    .getDefaultEnvironmentId(testWorkspace.getId(), environmentPermission.getExecutePermission())
-                    .block();
-        }
+        Workspace workspace = new Workspace();
+        workspace.setName("Create-DB-Table-Page-Org");
+        testWorkspace = workspaceService.create(workspace).block();
+        testDefaultEnvironmentId = workspaceService
+                .getDefaultEnvironmentId(testWorkspace.getId(), environmentPermission.getExecutePermission())
+                .block();
 
-        if (testApp == null) {
-            Application testApplication = new Application();
-            testApplication.setName("DB-Table-Page-Test-Application");
-            testApplication.setWorkspaceId(testWorkspace.getId());
-            testApp = applicationPageService
-                    .createApplication(testApplication, testWorkspace.getId())
-                    .block();
-        }
+        Application testApplication = new Application();
+        testApplication.setName("DB-Table-Page-Test-Application");
+        testApplication.setWorkspaceId(testWorkspace.getId());
+        testApp = applicationPageService
+                .createApplication(testApplication, testWorkspace.getId())
+                .block();
 
-        if (StringUtils.isEmpty(testDatasource.getId())) {
-            postgreSQLPlugin = pluginRepository.findByName("PostgreSQL").block();
-            // This datasource structure includes only 1 table with 2 columns. This is to test the scenario where
-            // template table
-            // have more number of columns than the user provided table which leads to deleting the column names from
-            // action configuration
+        postgreSQLPlugin = pluginRepository.findByName("PostgreSQL").block();
+        // This datasource structure includes only 1 table with 2 columns. This is to test the scenario where
+        // template table
+        // have more number of columns than the user provided table which leads to deleting the column names from
+        // action configuration
 
-            List<Column> limitedColumns = List.of(
-                    new Column("id", "type1", null, true), new Column("field1.something", "VARCHAR(23)", null, false));
-            List<Key> keys = List.of(new DatasourceStructure.PrimaryKey("pKey", List.of("id")));
-            List<Column> columns = List.of(
-                    new Column("id", "type1", null, true),
-                    new Column("field1.something", "VARCHAR(23)", null, false),
-                    new Column("field2", "type3", null, false),
-                    new Column("field3", "type4", null, false),
-                    new Column("field4", "type5", null, false));
-            List<Table> tables = List.of(
-                    new Table(TableType.TABLE, "", "sampleTable", columns, keys, new ArrayList<>()),
-                    new Table(TableType.TABLE, "", "limitedColumnTable", limitedColumns, keys, new ArrayList<>()));
-            structure.setTables(tables);
-            testDatasource.setPluginId(postgreSQLPlugin.getId());
-            testDatasource.setWorkspaceId(testWorkspace.getId());
-            testDatasource.setName("CRUD-Page-Table-DS");
+        List<Column> limitedColumns = List.of(
+                new Column("id", "type1", null, true), new Column("field1.something", "VARCHAR(23)", null, false));
+        List<Key> keys = List.of(new DatasourceStructure.PrimaryKey("pKey", List.of("id")));
+        List<Column> columns = List.of(
+                new Column("id", "type1", null, true),
+                new Column("field1.something", "VARCHAR(23)", null, false),
+                new Column("field2", "type3", null, false),
+                new Column("field3", "type4", null, false),
+                new Column("field4", "type5", null, false));
+        List<Table> tables = List.of(
+                new Table(TableType.TABLE, "", "sampleTable", columns, keys, new ArrayList<>()),
+                new Table(TableType.TABLE, "", "limitedColumnTable", limitedColumns, keys, new ArrayList<>()));
+        structure.setTables(tables);
+        Datasource datasource = new Datasource();
+        datasource.setPluginId(postgreSQLPlugin.getId());
+        datasource.setWorkspaceId(testWorkspace.getId());
+        datasource.setName("CRUD-Page-Table-DS");
 
-            datasourceConfiguration.setUrl("http://test.com");
+        datasourceConfiguration.setUrl("http://test.com");
 
-            HashMap<String, DatasourceStorageDTO> storages = new HashMap<>();
-            storages.put(
-                    testDefaultEnvironmentId,
-                    new DatasourceStorageDTO(
-                            testDatasource.getId(), testDefaultEnvironmentId, datasourceConfiguration));
-            testDatasource.setDatasourceStorages(storages);
+        HashMap<String, DatasourceStorageDTO> storages = new HashMap<>();
+        storages.put(
+                testDefaultEnvironmentId,
+                new DatasourceStorageDTO(datasource.getId(), testDefaultEnvironmentId, datasourceConfiguration));
+        datasource.setDatasourceStorages(storages);
 
-            Datasource datasource = datasourceService.create(testDatasource).block();
+        testDatasource = datasourceService.create(datasource).block();
 
-            testDatasourceStructure.setDatasourceId(datasource.getId());
-            testDatasourceStructure.setEnvironmentId(testDefaultEnvironmentId);
-            testDatasourceStructure.setStructure(structure);
-            datasourceStructureService.save(testDatasourceStructure).block();
-        }
+        testDatasourceStructure.setDatasourceId(testDatasource.getId());
+        testDatasourceStructure.setEnvironmentId(testDefaultEnvironmentId);
+        testDatasourceStructure.setStructure(structure);
+        datasourceStructureService.save(testDatasourceStructure).block();
         resource.setTableName(structure.getTables().get(0).getName());
         resource.setDatasourceId(testDatasource.getId());
     }
 
+    @AfterEach
+    public void cleanup() {
+        List<Application> deletedApplications = applicationService
+                .findByWorkspaceId(testWorkspace.getId(), applicationPermission.getDeletePermission())
+                .flatMap(remainingApplication -> applicationPageService.deleteApplication(remainingApplication.getId()))
+                .collectList()
+                .block();
+        Workspace deletedWorkspace =
+                workspaceService.archiveById(testWorkspace.getId()).block();
+    }
+
     Mono<List<NewAction>> getActions(String pageId) {
         return newActionService.findByPageId(pageId).collectList();
     }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/DatasourceStructureSolutionTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/DatasourceStructureSolutionTest.java
index 4077626609..e68323be58 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/DatasourceStructureSolutionTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/DatasourceStructureSolutionTest.java
@@ -12,17 +12,21 @@ import com.appsmith.external.models.OAuth2;
 import com.appsmith.external.plugins.PluginExecutor;
 import com.appsmith.server.datasources.base.DatasourceService;
 import com.appsmith.server.datasourcestorages.base.DatasourceStorageService;
+import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.Plugin;
 import com.appsmith.server.domains.User;
 import com.appsmith.server.domains.Workspace;
 import com.appsmith.server.helpers.MockPluginExecutor;
 import com.appsmith.server.helpers.PluginExecutorHelper;
+import com.appsmith.server.plugins.base.PluginService;
+import com.appsmith.server.services.ApplicationPageService;
+import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.DatasourceContextService;
 import com.appsmith.server.services.DatasourceStructureService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.services.UserService;
 import com.appsmith.server.services.WorkspaceService;
 import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -34,7 +38,6 @@ import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.security.test.context.support.WithUserDetails;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
-import org.springframework.util.StringUtils;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
@@ -87,6 +90,15 @@ public class DatasourceStructureSolutionTest {
     @Autowired
     EnvironmentPermission environmentPermission;
 
+    @Autowired
+    ApplicationPageService applicationPageService;
+
+    @Autowired
+    ApplicationService applicationService;
+
+    @Autowired
+    ApplicationPermission applicationPermission;
+
     String workspaceId;
 
     String defaultEnvironmentId;
@@ -94,20 +106,17 @@ public class DatasourceStructureSolutionTest {
     String datasourceId;
 
     @BeforeEach
-    @WithUserDetails(value = "api_user")
     public void setup() {
         User apiUser = userService.findByEmail("api_user").block();
         Workspace toCreate = new Workspace();
         toCreate.setName("DatasourceServiceTest");
 
-        if (!StringUtils.hasLength(workspaceId)) {
-            Workspace workspace =
-                    workspaceService.create(toCreate, apiUser, Boolean.FALSE).block();
-            workspaceId = workspace.getId();
-            defaultEnvironmentId = workspaceService
-                    .getDefaultEnvironmentId(workspaceId, environmentPermission.getExecutePermission())
-                    .block();
-        }
+        Workspace workspace =
+                workspaceService.create(toCreate, apiUser, Boolean.FALSE).block();
+        workspaceId = workspace.getId();
+        defaultEnvironmentId = workspaceService
+                .getDefaultEnvironmentId(workspaceId, environmentPermission.getExecutePermission())
+                .block();
 
         Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any()))
                 .thenReturn(Mono.just(new MockPluginExecutor()));
@@ -118,6 +127,16 @@ public class DatasourceStructureSolutionTest {
         datasourceId = createdDatasource.getId();
     }
 
+    @AfterEach
+    public void cleanup() {
+        List<Application> deletedApplications = applicationService
+                .findByWorkspaceId(workspaceId, applicationPermission.getDeletePermission())
+                .flatMap(remainingApplication -> applicationPageService.deleteApplication(remainingApplication.getId()))
+                .collectList()
+                .block();
+        Workspace deletedWorkspace = workspaceService.archiveById(workspaceId).block();
+    }
+
     private Datasource createDatasourceObject(String name, String workspaceId, String pluginName) {
         Datasource datasource = new Datasource();
         datasource.setName(name);
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 aa4d09b49d..c22ff8e753 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
@@ -9,14 +9,18 @@ import com.appsmith.external.models.TriggerRequestDTO;
 import com.appsmith.external.models.TriggerResultDTO;
 import com.appsmith.external.plugins.PluginExecutor;
 import com.appsmith.server.datasources.base.DatasourceService;
+import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.Plugin;
 import com.appsmith.server.domains.Workspace;
 import com.appsmith.server.helpers.MockPluginExecutor;
 import com.appsmith.server.helpers.PluginExecutorHelper;
+import com.appsmith.server.plugins.base.PluginService;
+import com.appsmith.server.services.ApplicationPageService;
+import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.FeatureFlagService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.services.UserService;
 import com.appsmith.server.services.WorkspaceService;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -74,13 +78,21 @@ public class DatasourceTriggerSolutionTest {
     @Autowired
     EnvironmentPermission environmentPermission;
 
+    @Autowired
+    ApplicationPageService applicationPageService;
+
+    @Autowired
+    ApplicationService applicationService;
+
+    @Autowired
+    ApplicationPermission applicationPermission;
+
     String workspaceId;
     String defaultEnvironmentId;
 
     String datasourceId;
 
     @BeforeEach
-    @WithUserDetails(value = "api_user")
     public void setup() {
         Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any()))
                 .thenReturn(Mono.just(new MockPluginExecutor()));
@@ -109,6 +121,16 @@ public class DatasourceTriggerSolutionTest {
         datasourceId = datasource.getId();
     }
 
+    @AfterEach
+    public void cleanup() {
+        List<Application> deletedApplications = applicationService
+                .findByWorkspaceId(workspaceId, applicationPermission.getDeletePermission())
+                .flatMap(remainingApplication -> applicationPageService.deleteApplication(remainingApplication.getId()))
+                .collectList()
+                .block();
+        Workspace deletedWorkspace = workspaceService.archiveById(workspaceId).block();
+    }
+
     @Test
     @WithUserDetails(value = "api_user")
     public void datasourceTriggerTest() {
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ExampleApplicationsAreMarked.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ExampleApplicationsAreMarked.java
deleted file mode 100644
index ccf7d654f5..0000000000
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ExampleApplicationsAreMarked.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.appsmith.server.solutions;
-
-import com.appsmith.server.domains.Application;
-import com.appsmith.server.domains.Workspace;
-import com.appsmith.server.services.ApplicationPageService;
-import com.appsmith.server.services.ApplicationService;
-import com.appsmith.server.services.SessionUserService;
-import com.appsmith.server.services.UserService;
-import com.appsmith.server.services.WorkspaceService;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.security.test.context.support.WithUserDetails;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-import reactor.core.publisher.Mono;
-import reactor.test.StepVerifier;
-
-import java.util.List;
-
-import static com.appsmith.server.acl.AclPermission.READ_APPLICATIONS;
-import static org.assertj.core.api.Assertions.assertThat;
-
-@Slf4j
-@ExtendWith(SpringExtension.class)
-@SpringBootTest
-@DirtiesContext
-public class ExampleApplicationsAreMarked {
-
-    @Autowired
-    UserService userService;
-
-    @Autowired
-    private ApplicationService applicationService;
-
-    @Autowired
-    private WorkspaceService workspaceService;
-
-    @Autowired
-    private ApplicationPageService applicationPageService;
-
-    @Autowired
-    private SessionUserService sessionUserService;
-
-    @Test
-    @WithUserDetails(value = "api_user")
-    public void exampleApplicationsAreMarked() {
-        Workspace newWorkspace = new Workspace();
-        newWorkspace.setName("Template Workspace 3");
-        final Mono<List<Application>> resultMono = Mono.zip(
-                        workspaceService.create(newWorkspace), sessionUserService.getCurrentUser())
-                .flatMap(tuple -> {
-                    final Workspace workspace = tuple.getT1();
-
-                    assert workspace.getId() != null;
-
-                    // Create 4 applications inside the example workspace but only mark three applications as example
-                    final Application app1 = new Application();
-                    app1.setName("first application");
-                    app1.setWorkspaceId(workspace.getId());
-                    app1.setIsPublic(true);
-
-                    final Application app2 = new Application();
-                    app2.setName("second application");
-                    app2.setWorkspaceId(workspace.getId());
-                    app2.setIsPublic(true);
-
-                    final Application app3 = new Application();
-                    app3.setName("third application");
-                    app3.setWorkspaceId(workspace.getId());
-                    app3.setIsPublic(false);
-
-                    final Application app4 = new Application();
-                    app4.setName("fourth application");
-                    app4.setWorkspaceId(workspace.getId());
-                    app4.setIsPublic(false);
-
-                    return Mono.when(
-                                    applicationPageService.createApplication(app1),
-                                    applicationPageService.createApplication(app2),
-                                    applicationPageService.createApplication(app3),
-                                    applicationPageService.createApplication(app4))
-                            .thenReturn(workspace.getId());
-                })
-                .flatMapMany(workspaceId -> applicationService.findByWorkspaceId(workspaceId, READ_APPLICATIONS))
-                .collectList();
-
-        StepVerifier.create(resultMono)
-                .assertNext(applications -> {
-                    assertThat(applications).hasSize(4);
-                    assertThat(applications.stream().filter(Application::isAppIsExample))
-                            .hasSize(3);
-                })
-                .verifyComplete();
-    }
-}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceTests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceTests.java
index 0f09a9dfbf..6cd6105aef 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceTests.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceTests.java
@@ -16,6 +16,7 @@ import com.appsmith.external.models.PluginType;
 import com.appsmith.external.models.Policy;
 import com.appsmith.external.models.Property;
 import com.appsmith.external.models.SSLDetails;
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.constants.SerialiseApplicationObjective;
 import com.appsmith.server.datasources.base.DatasourceService;
@@ -42,23 +43,24 @@ import com.appsmith.server.dtos.PageDTO;
 import com.appsmith.server.dtos.PageNameIdDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.export.internal.ImportExportApplicationService;
 import com.appsmith.server.helpers.MockPluginExecutor;
 import com.appsmith.server.helpers.PluginExecutorHelper;
+import com.appsmith.server.jslibs.base.CustomJSLibService;
 import com.appsmith.server.migrations.ApplicationVersion;
 import com.appsmith.server.migrations.JsonSchemaMigration;
 import com.appsmith.server.migrations.JsonSchemaVersions;
 import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.newpages.base.NewPageService;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.repositories.ApplicationRepository;
 import com.appsmith.server.repositories.PermissionGroupRepository;
 import com.appsmith.server.repositories.PluginRepository;
 import com.appsmith.server.repositories.ThemeRepository;
-import com.appsmith.server.services.ActionCollectionService;
 import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.ApplicationService;
-import com.appsmith.server.services.CustomJSLibService;
 import com.appsmith.server.services.LayoutActionService;
 import com.appsmith.server.services.LayoutCollectionService;
-import com.appsmith.server.services.NewPageService;
 import com.appsmith.server.services.PermissionGroupService;
 import com.appsmith.server.services.WorkspaceService;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -78,6 +80,7 @@ import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferUtils;
@@ -198,8 +201,14 @@ public class ImportExportApplicationServiceTests {
     @Autowired
     EnvironmentPermission environmentPermission;
 
-    PagePermission pagePermission = new PagePermissionImpl();
-    ApplicationPermission applicationPermission = new ApplicationPermissionImpl();
+    @Autowired
+    PagePermission pagePermission;
+
+    @Autowired
+    ApplicationPermission applicationPermission;
+
+    @SpyBean
+    PluginService pluginService;
 
     @BeforeEach
     public void setup() {
@@ -270,6 +279,9 @@ public class ImportExportApplicationServiceTests {
         datasourceMap.put("DS1", ds1);
         datasourceMap.put("DS2", ds2);
         isSetupDone = true;
+
+        Mockito.when(pluginService.findAllByIdsWithoutPermission(Mockito.any(), Mockito.anyList()))
+                .thenReturn(Flux.fromIterable(List.of(installedPlugin, installedJsPlugin)));
     }
 
     private Flux<ActionDTO> getActionsInApplication(Application application) {
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ShareWorkspacePermissionTests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ShareWorkspacePermissionTests.java
index fea4b4204b..6a6ba16007 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ShareWorkspacePermissionTests.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ShareWorkspacePermissionTests.java
@@ -11,14 +11,14 @@ import com.appsmith.server.domains.Workspace;
 import com.appsmith.server.dtos.PermissionGroupInfoDTO;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.newpages.base.NewPageService;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.repositories.ApplicationRepository;
 import com.appsmith.server.repositories.PermissionGroupRepository;
 import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.LayoutActionService;
-import com.appsmith.server.services.NewPageService;
 import com.appsmith.server.services.PermissionGroupService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.services.UserService;
 import com.appsmith.server.services.UserWorkspaceService;
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImplTest.java
index 91f85d6e8f..f1192d00a5 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImplTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImplTest.java
@@ -15,13 +15,13 @@ import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 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.NewActionRepository;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.AuthenticationValidator;
 import com.appsmith.server.services.DatasourceContextService;
-import com.appsmith.server.services.NewPageService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.solutions.ActionPermission;
 import com.appsmith.server.solutions.DatasourcePermission;
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCETest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCETest.java
index 00ee51e465..c78dfe1b8c 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCETest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCETest.java
@@ -29,9 +29,12 @@ import com.appsmith.server.domains.Workspace;
 import com.appsmith.server.dtos.MockDataSource;
 import com.appsmith.server.dtos.PageDTO;
 import com.appsmith.server.exceptions.AppsmithError;
+import com.appsmith.server.export.internal.ImportExportApplicationService;
 import com.appsmith.server.helpers.MockPluginExecutor;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.helpers.WidgetSuggestionHelper;
+import com.appsmith.server.newpages.base.NewPageService;
+import com.appsmith.server.plugins.base.PluginService;
 import com.appsmith.server.repositories.DatasourceRepository;
 import com.appsmith.server.repositories.PermissionGroupRepository;
 import com.appsmith.server.repositories.PluginRepository;
@@ -41,14 +44,12 @@ import com.appsmith.server.services.AstService;
 import com.appsmith.server.services.LayoutActionService;
 import com.appsmith.server.services.LayoutService;
 import com.appsmith.server.services.MockDataService;
-import com.appsmith.server.services.NewPageService;
 import com.appsmith.server.services.PermissionGroupService;
-import com.appsmith.server.services.PluginService;
 import com.appsmith.server.services.UserService;
 import com.appsmith.server.services.WorkspaceService;
 import com.appsmith.server.solutions.ActionExecutionSolution;
+import com.appsmith.server.solutions.ApplicationPermission;
 import com.appsmith.server.solutions.EnvironmentPermission;
-import com.appsmith.server.solutions.ImportExportApplicationService;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -152,6 +153,9 @@ public class ActionExecutionSolutionCETest {
     @Autowired
     EnvironmentPermission environmentPermission;
 
+    @Autowired
+    ApplicationPermission applicationPermission;
+
     Application testApp = null;
 
     PageDTO testPage = null;
@@ -177,76 +181,70 @@ public class ActionExecutionSolutionCETest {
         Workspace toCreate = new Workspace();
         toCreate.setName("ActionServiceCE_Test");
 
-        if (workspaceId == null) {
-            Workspace workspace =
-                    workspaceService.create(toCreate, apiUser, Boolean.FALSE).block();
-            workspaceId = workspace.getId();
+        Workspace workspace =
+                workspaceService.create(toCreate, apiUser, Boolean.FALSE).block();
+        workspaceId = workspace.getId();
 
-            defaultEnvironmentId = workspaceService
-                    .getDefaultEnvironmentId(workspaceId, environmentPermission.getExecutePermission())
-                    .block();
-        }
+        defaultEnvironmentId = workspaceService
+                .getDefaultEnvironmentId(workspaceId, environmentPermission.getExecutePermission())
+                .block();
 
-        if (testApp == null && testPage == null) {
-            // Create application and page which will be used by the tests to create actions for.
-            Application application = new Application();
-            application.setName(UUID.randomUUID().toString());
-            testApp = applicationPageService
-                    .createApplication(application, workspaceId)
-                    .block();
+        // Create application and page which will be used by the tests to create actions for.
+        Application application = new Application();
+        application.setName(UUID.randomUUID().toString());
+        testApp = applicationPageService
+                .createApplication(application, workspaceId)
+                .block();
 
-            final String pageId = testApp.getPages().get(0).getId();
+        final String pageId = testApp.getPages().get(0).getId();
 
-            testPage = newPageService.findPageById(pageId, READ_PAGES, false).block();
+        testPage = newPageService.findPageById(pageId, READ_PAGES, false).block();
 
-            Layout layout = testPage.getLayouts().get(0);
-            JSONObject dsl = new JSONObject(Map.of("text", "{{ query1.data }}"));
+        Layout layout = testPage.getLayouts().get(0);
+        JSONObject dsl = new JSONObject(Map.of("text", "{{ query1.data }}"));
 
-            JSONObject dsl2 = new JSONObject();
-            dsl2.put("widgetName", "Table1");
-            dsl2.put("type", "TABLE_WIDGET");
-            Map<String, Object> primaryColumns = new HashMap<>();
-            JSONObject jsonObject = new JSONObject(Map.of("key", "value"));
-            primaryColumns.put("_id", "{{ query1.data }}");
-            primaryColumns.put("_class", jsonObject);
-            dsl2.put("primaryColumns", primaryColumns);
-            final ArrayList<Object> objects = new ArrayList<>();
-            JSONArray temp2 = new JSONArray();
-            temp2.add(new JSONObject(Map.of("key", "primaryColumns._id")));
-            dsl2.put("dynamicBindingPathList", temp2);
-            objects.add(dsl2);
-            dsl.put("children", objects);
+        JSONObject dsl2 = new JSONObject();
+        dsl2.put("widgetName", "Table1");
+        dsl2.put("type", "TABLE_WIDGET");
+        Map<String, Object> primaryColumns = new HashMap<>();
+        JSONObject jsonObject = new JSONObject(Map.of("key", "value"));
+        primaryColumns.put("_id", "{{ query1.data }}");
+        primaryColumns.put("_class", jsonObject);
+        dsl2.put("primaryColumns", primaryColumns);
+        final ArrayList<Object> objects = new ArrayList<>();
+        JSONArray temp2 = new JSONArray();
+        temp2.add(new JSONObject(Map.of("key", "primaryColumns._id")));
+        dsl2.put("dynamicBindingPathList", temp2);
+        objects.add(dsl2);
+        dsl.put("children", objects);
 
-            layout.setDsl(dsl);
-            layout.setPublishedDsl(dsl);
-        }
+        layout.setDsl(dsl);
+        layout.setPublishedDsl(dsl);
 
-        if (gitConnectedApp == null) {
-            Application newApp = new Application();
-            newApp.setName(UUID.randomUUID().toString());
-            GitApplicationMetadata gitData = new GitApplicationMetadata();
-            gitData.setBranchName("actionServiceTest");
-            newApp.setGitApplicationMetadata(gitData);
-            gitConnectedApp = applicationPageService
-                    .createApplication(newApp, workspaceId)
-                    .flatMap(application -> {
-                        application.getGitApplicationMetadata().setDefaultApplicationId(application.getId());
-                        return applicationService
-                                .save(application)
-                                .zipWhen(application1 -> importExportApplicationService.exportApplicationById(
-                                        application1.getId(), gitData.getBranchName()));
-                    })
-                    // Assign the branchName to all the resources connected to the application
-                    .flatMap(tuple -> importExportApplicationService.importApplicationInWorkspaceFromGit(
-                            workspaceId, tuple.getT2(), tuple.getT1().getId(), gitData.getBranchName()))
-                    .block();
+        Application newApp = new Application();
+        newApp.setName(UUID.randomUUID().toString());
+        GitApplicationMetadata gitData = new GitApplicationMetadata();
+        gitData.setBranchName("actionServiceTest");
+        newApp.setGitApplicationMetadata(gitData);
+        gitConnectedApp = applicationPageService
+                .createApplication(newApp, workspaceId)
+                .flatMap(application1 -> {
+                    application1.getGitApplicationMetadata().setDefaultApplicationId(application1.getId());
+                    return applicationService
+                            .save(application1)
+                            .zipWhen(application11 -> importExportApplicationService.exportApplicationById(
+                                    application11.getId(), gitData.getBranchName()));
+                })
+                // Assign the branchName to all the resources connected to the application
+                .flatMap(tuple -> importExportApplicationService.importApplicationInWorkspaceFromGit(
+                        workspaceId, tuple.getT2(), tuple.getT1().getId(), gitData.getBranchName()))
+                .block();
 
-            gitConnectedPage = newPageService
-                    .findPageById(gitConnectedApp.getPages().get(0).getId(), READ_PAGES, false)
-                    .block();
+        gitConnectedPage = newPageService
+                .findPageById(gitConnectedApp.getPages().get(0).getId(), READ_PAGES, false)
+                .block();
 
-            branchName = gitConnectedApp.getGitApplicationMetadata().getBranchName();
-        }
+        branchName = gitConnectedApp.getGitApplicationMetadata().getBranchName();
 
         datasource = new Datasource();
         datasource.setName("Default Database");
@@ -266,9 +264,12 @@ public class ActionExecutionSolutionCETest {
     @AfterEach
     @WithUserDetails(value = "api_user")
     public void cleanup() {
-        applicationPageService.deleteApplication(testApp.getId()).block();
-        testApp = null;
-        testPage = null;
+        List<Application> deletedApplications = applicationService
+                .findByWorkspaceId(workspaceId, applicationPermission.getDeletePermission())
+                .flatMap(remainingApplication -> applicationPageService.deleteApplication(remainingApplication.getId()))
+                .collectList()
+                .block();
+        Workspace deletedWorkspace = workspaceService.archiveById(workspaceId).block();
     }
 
     private void executeAndAssertAction(
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/RefactoringSolutionCEImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/RefactoringSolutionCEImplTest.java
index 1b3ddb41c2..7bbb1cf55b 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/RefactoringSolutionCEImplTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/RefactoringSolutionCEImplTest.java
@@ -1,19 +1,17 @@
 package com.appsmith.server.solutions.ce;
 
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.configurations.InstanceConfig;
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.newactions.base.NewActionService;
-import com.appsmith.server.services.ActionCollectionService;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.AstService;
 import com.appsmith.server.services.LayoutActionService;
-import com.appsmith.server.services.NewPageService;
 import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.solutions.ActionPermission;
-import com.appsmith.server.solutions.ActionPermissionImpl;
 import com.appsmith.server.solutions.PagePermission;
-import com.appsmith.server.solutions.PagePermissionImpl;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -21,6 +19,8 @@ import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import reactor.core.publisher.Mono;
@@ -33,13 +33,19 @@ import java.util.regex.Pattern;
 
 @ExtendWith(SpringExtension.class)
 @Slf4j
+@SpringBootTest
 class RefactoringSolutionCEImplTest {
 
     private final String preWord = "\\b(";
     private final String postWord = ")\\b";
     RefactoringSolutionCEImpl refactoringSolutionCE;
+
+    @Autowired
     PagePermission pagePermission;
+
+    @Autowired
     ActionPermission actionPermission;
+
     ObjectMapper mapper = new ObjectMapper();
 
     @MockBean
@@ -77,8 +83,6 @@ class RefactoringSolutionCEImplTest {
 
     @BeforeEach
     public void setUp() {
-        pagePermission = new PagePermissionImpl();
-        actionPermission = new ActionPermissionImpl();
         refactoringSolutionCE = new RefactoringSolutionCEImpl(
                 objectMapper,
                 newPageService,
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/RefactoringSolutionCETest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/RefactoringSolutionCETest.java
index 03914c8e4f..101409f4df 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/RefactoringSolutionCETest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/RefactoringSolutionCETest.java
@@ -6,6 +6,7 @@ import com.appsmith.external.models.ActionDTO;
 import com.appsmith.external.models.Datasource;
 import com.appsmith.external.models.PluginType;
 import com.appsmith.external.models.Property;
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.domains.ActionCollection;
 import com.appsmith.server.domains.Application;
@@ -23,20 +24,21 @@ import com.appsmith.server.dtos.RefactorActionNameInCollectionDTO;
 import com.appsmith.server.dtos.RefactorNameDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.export.internal.ImportExportApplicationService;
 import com.appsmith.server.helpers.MockPluginExecutor;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.newactions.base.NewActionService;
+import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.repositories.NewActionRepository;
 import com.appsmith.server.repositories.PluginRepository;
-import com.appsmith.server.services.ActionCollectionService;
 import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.ApplicationService;
 import com.appsmith.server.services.LayoutActionService;
 import com.appsmith.server.services.LayoutCollectionService;
-import com.appsmith.server.services.NewPageService;
+import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.services.UserService;
 import com.appsmith.server.services.WorkspaceService;
-import com.appsmith.server.solutions.ImportExportApplicationService;
+import com.appsmith.server.solutions.ApplicationPermission;
 import com.appsmith.server.solutions.RefactoringSolution;
 import lombok.extern.slf4j.Slf4j;
 import net.minidev.json.JSONArray;
@@ -120,6 +122,12 @@ class RefactoringSolutionCETest {
     @Autowired
     ImportExportApplicationService importExportApplicationService;
 
+    @Autowired
+    ApplicationPermission applicationPermission;
+
+    @Autowired
+    SessionUserService sessionUserService;
+
     Application testApp = null;
 
     PageDTO testPage = null;
@@ -137,89 +145,83 @@ class RefactoringSolutionCETest {
     Datasource jsDatasource;
 
     @BeforeEach
-    @WithUserDetails(value = "api_user")
     public void setup() {
         newPageService.deleteAll();
-        User apiUser = userService.findByEmail("api_user").block();
+        User currentUser = sessionUserService.getCurrentUser().block();
         Workspace toCreate = new Workspace();
         toCreate.setName("LayoutActionServiceTest");
 
         Workspace workspace =
-                workspaceService.create(toCreate, apiUser, Boolean.FALSE).block();
+                workspaceService.create(toCreate, currentUser, Boolean.FALSE).block();
         workspaceId = workspace.getId();
 
-        if (testApp == null && testPage == null) {
-            // Create application and page which will be used by the tests to create actions for.
-            Application application = new Application();
-            application.setName(UUID.randomUUID().toString());
-            testApp = applicationPageService
-                    .createApplication(application, workspace.getId())
-                    .block();
+        // Create application and page which will be used by the tests to create actions for.
+        Application application = new Application();
+        application.setName(UUID.randomUUID().toString());
+        testApp = applicationPageService
+                .createApplication(application, workspace.getId())
+                .block();
 
-            final String pageId = testApp.getPages().get(0).getId();
+        final String pageId = testApp.getPages().get(0).getId();
 
-            testPage = newPageService.findPageById(pageId, READ_PAGES, false).block();
+        testPage = newPageService.findPageById(pageId, READ_PAGES, false).block();
 
-            Layout layout = testPage.getLayouts().get(0);
-            JSONObject dsl = new JSONObject();
-            dsl.put("widgetName", "firstWidget");
-            JSONArray temp = new JSONArray();
-            temp.addAll(
-                    List.of(new JSONObject(Map.of("key", "testField")), new JSONObject(Map.of("key", "testField2"))));
-            dsl.put("dynamicBindingPathList", temp);
-            dsl.put("testField", "{{ query1.data }}");
-            dsl.put("testField2", "{{jsObject.jsFunction.data}}");
+        Layout layout = testPage.getLayouts().get(0);
+        JSONObject dsl = new JSONObject();
+        dsl.put("widgetName", "firstWidget");
+        JSONArray temp = new JSONArray();
+        temp.addAll(List.of(new JSONObject(Map.of("key", "testField")), new JSONObject(Map.of("key", "testField2"))));
+        dsl.put("dynamicBindingPathList", temp);
+        dsl.put("testField", "{{ query1.data }}");
+        dsl.put("testField2", "{{jsObject.jsFunction.data}}");
 
-            JSONObject dsl2 = new JSONObject();
-            dsl2.put("widgetName", "Table1");
-            dsl2.put("type", "TABLE_WIDGET");
-            Map<String, Object> primaryColumns = new HashMap<>();
-            JSONObject jsonObject = new JSONObject(Map.of("key", "value"));
-            primaryColumns.put("_id", "{{ query1.data }}");
-            primaryColumns.put("_class", jsonObject);
-            dsl2.put("primaryColumns", primaryColumns);
-            final ArrayList<Object> objects = new ArrayList<>();
-            JSONArray temp2 = new JSONArray();
-            temp2.add(new JSONObject(Map.of("key", "primaryColumns._id")));
-            dsl2.put("dynamicBindingPathList", temp2);
-            objects.add(dsl2);
-            dsl.put("children", objects);
+        JSONObject dsl2 = new JSONObject();
+        dsl2.put("widgetName", "Table1");
+        dsl2.put("type", "TABLE_WIDGET");
+        Map<String, Object> primaryColumns = new HashMap<>();
+        JSONObject jsonObject = new JSONObject(Map.of("key", "value"));
+        primaryColumns.put("_id", "{{ query1.data }}");
+        primaryColumns.put("_class", jsonObject);
+        dsl2.put("primaryColumns", primaryColumns);
+        final ArrayList<Object> objects = new ArrayList<>();
+        JSONArray temp2 = new JSONArray();
+        temp2.add(new JSONObject(Map.of("key", "primaryColumns._id")));
+        dsl2.put("dynamicBindingPathList", temp2);
+        objects.add(dsl2);
+        dsl.put("children", objects);
 
-            layout.setDsl(dsl);
-            layout.setPublishedDsl(dsl);
-            layoutActionService
-                    .updateLayout(pageId, testApp.getId(), layout.getId(), layout)
-                    .block();
+        layout.setDsl(dsl);
+        layout.setPublishedDsl(dsl);
+        layoutActionService
+                .updateLayout(pageId, testApp.getId(), layout.getId(), layout)
+                .block();
 
-            testPage = newPageService.findPageById(pageId, READ_PAGES, false).block();
-        }
+        testPage = newPageService.findPageById(pageId, READ_PAGES, false).block();
 
-        if (gitConnectedApp == null) {
-            Application newApp = new Application();
-            newApp.setName(UUID.randomUUID().toString());
-            GitApplicationMetadata gitData = new GitApplicationMetadata();
-            gitData.setBranchName("actionServiceTest");
-            newApp.setGitApplicationMetadata(gitData);
-            gitConnectedApp = applicationPageService
-                    .createApplication(newApp, workspaceId)
-                    .flatMap(application -> {
-                        application.getGitApplicationMetadata().setDefaultApplicationId(application.getId());
-                        return applicationService
-                                .save(application)
-                                .zipWhen(application1 -> importExportApplicationService.exportApplicationById(
-                                        application1.getId(), gitData.getBranchName()));
-                    })
-                    // Assign the branchName to all the resources connected to the application
-                    .flatMap(tuple -> importExportApplicationService.importApplicationInWorkspaceFromGit(
-                            workspaceId, tuple.getT2(), tuple.getT1().getId(), gitData.getBranchName()))
-                    .block();
+        Application newApp = new Application();
+        newApp.setName(UUID.randomUUID().toString());
+        GitApplicationMetadata gitData = new GitApplicationMetadata();
+        gitData.setBranchName("actionServiceTest");
+        newApp.setGitApplicationMetadata(gitData);
+        gitConnectedApp = applicationPageService
+                .createApplication(newApp, workspaceId)
+                .flatMap(application1 -> {
+                    application1.getGitApplicationMetadata().setDefaultApplicationId(application1.getId());
+                    return applicationService
+                            .save(application1)
+                            .zipWhen(application11 -> importExportApplicationService.exportApplicationById(
+                                    application11.getId(), gitData.getBranchName()));
+                })
+                // Assign the branchName to all the resources connected to the application
+                .flatMap(tuple -> importExportApplicationService.importApplicationInWorkspaceFromGit(
+                        workspaceId, tuple.getT2(), tuple.getT1().getId(), gitData.getBranchName()))
+                .block();
 
-            gitConnectedPage = newPageService
-                    .findPageById(gitConnectedApp.getPages().get(0).getId(), READ_PAGES, false)
-                    .block();
+        gitConnectedPage = newPageService
+                .findPageById(gitConnectedApp.getPages().get(0).getId(), READ_PAGES, false)
+                .block();
 
-            branchName = gitConnectedApp.getGitApplicationMetadata().getBranchName();
-        }
+        branchName = gitConnectedApp.getGitApplicationMetadata().getBranchName();
 
         workspaceId = workspace.getId();
         datasource = new Datasource();
@@ -239,11 +241,13 @@ class RefactoringSolutionCETest {
     }
 
     @AfterEach
-    @WithUserDetails(value = "api_user")
     public void cleanup() {
-        applicationPageService.deleteApplication(testApp.getId()).block();
-        testApp = null;
-        testPage = null;
+        List<Application> deletedApplications = applicationService
+                .findByWorkspaceId(workspaceId, applicationPermission.getDeletePermission())
+                .flatMap(remainingApplication -> applicationPageService.deleteApplication(remainingApplication.getId()))
+                .collectList()
+                .block();
+        Workspace deletedWorkspace = workspaceService.archiveById(workspaceId).block();
     }
 
     @Test
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/transactions/ImportApplicationTransactionServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/transactions/ImportApplicationTransactionServiceTest.java
index a728f7cb8f..f947832f0f 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/transactions/ImportApplicationTransactionServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/transactions/ImportApplicationTransactionServiceTest.java
@@ -1,5 +1,6 @@
 package com.appsmith.server.transactions;
 
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
 import com.appsmith.server.domains.ActionCollection;
 import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.NewAction;
@@ -8,15 +9,14 @@ import com.appsmith.server.domains.Workspace;
 import com.appsmith.server.dtos.ApplicationJson;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.export.internal.ImportExportApplicationService;
 import com.appsmith.server.helpers.MockPluginExecutor;
 import com.appsmith.server.helpers.PluginExecutorHelper;
 import com.appsmith.server.migrations.JsonSchemaMigration;
 import com.appsmith.server.newactions.base.NewActionService;
 import com.appsmith.server.repositories.ActionCollectionRepository;
 import com.appsmith.server.repositories.NewActionRepository;
-import com.appsmith.server.services.ActionCollectionService;
 import com.appsmith.server.services.WorkspaceService;
-import com.appsmith.server.solutions.ImportExportApplicationService;
 import com.google.gson.Gson;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml
index fbb6e0bc25..a9aa50e8fa 100644
--- a/deploy/helm/Chart.yaml
+++ b/deploy/helm/Chart.yaml
@@ -11,7 +11,7 @@ sources:
   - https://github.com/appsmithorg/appsmith
 home: https://www.appsmith.com/
 icon: https://assets.appsmith.com/appsmith-icon.png
-version: 2.0.5
+version: 2.0.6
 dependencies:
 - condition: redis.enabled
   name: redis
diff --git a/deploy/helm/templates/statefulset.yaml b/deploy/helm/templates/statefulset.yaml
index c1cdcc219a..eb76e159c9 100644
--- a/deploy/helm/templates/statefulset.yaml
+++ b/deploy/helm/templates/statefulset.yaml
@@ -49,7 +49,7 @@ spec:
       {{- if ((.Values.initContainer.redis).image) }}
         image: {{ .Values.initContainer.redis.image }}
       {{- else }}
-        image: "docker.io/library/redis:6.2-alpine"
+        image: "docker.io/bitnami/redis:7.0.13-debian-11-r10"
       {{- end }}
         command: ['sh', '-c', "until redis-cli -h {{.Release.Name}}-redis-master.{{.Release.Namespace}}.svc.cluster.local ping ; do echo waiting for redis; sleep 2; done"]
       {{- end }}
@@ -58,7 +58,7 @@ spec:
       {{- if ((.Values.initContainer.mongodb).image) }}
         image: {{ .Values.initContainer.mongodb.image }}
       {{- else }}
-        image:  "docker.io/bitnami/mongodb:5.0.17-debian-11-r5"
+        image:  "docker.io/bitnami/mongodb:5.0.21-debian-11-r5"
       {{- end }}
         command: ['sh', '-c', "until mongo --host appsmith-mongodb.{{.Release.Namespace}}.svc.cluster.local --eval 'db.runCommand({ping:1})' ; do echo waiting for mongo; sleep 2; done"]
       {{- end }}
diff --git a/deploy/helm/values.yaml b/deploy/helm/values.yaml
index a962da35d1..06fad20cbe 100644
--- a/deploy/helm/values.yaml
+++ b/deploy/helm/values.yaml
@@ -8,6 +8,8 @@ redis:
   replica:
     replicaCount: 1
     nodeSelector: {}
+  image:
+    tag: 7.0.13-debian-11-r10
 
 mongodb:
   enabled: true
@@ -20,6 +22,8 @@ mongodb:
   architecture: "replicaset"
   replicaSetName: rs0
   nodeSelector: {}
+  image:
+    tag: 5.0.21-debian-11-r5
   arbiter:
     nodeSelector: {}
   hidden:
@@ -62,9 +66,9 @@ strategyType: RollingUpdate
 ##
 initContainer: {}
   # redis:
-  #   image: alpine
+  #   image: docker.io/bitnami/redis-cluster:7.0.13-debian-11-r10
   # mongodb:
-  #   image:  docker.io/bitnami/mongodb:4.4.11-debian-10-r12
+  #   image:  docker.io/bitnami/mongodb:5.0.21-debian-11-r5
 ## Image
 ##
 image: