diff --git a/.github/config.json b/.github/config.json
index 4f34b861ea..c52ba28eec 100644
--- a/.github/config.json
+++ b/.github/config.json
@@ -1 +1 @@
-{"runners":[{"versioning":{"source":"milestones","type":"SemVer"},"prereleaseName":"alpha","issue":{"labels":{"Error Handling":{"conditions":[],"requires":1},"Team Managers Pod":{"conditions":[{"label":"SSO","type":"hasLabel","value":true},{"label":"RBAC","type":"hasLabel","value":true},{"label":"Audit Logs","type":"hasLabel","value":true},{"label":"Airgap","type":"hasLabel","value":true},{"label":"Enterprise Edition","type":"hasLabel","value":true},{"label":"SCIM","type":"hasLabel","value":true},{"label":"Invite flow","type":"hasLabel","value":true},{"label":"User Profile","type":"hasLabel","value":true},{"label":"Admin Settings","type":"hasLabel","value":true},{"label":"Workspace settings","type":"hasLabel","value":true},{"label":"User Session ","type":"hasLabel","value":true}],"requires":1},"New Developers Pod":{"conditions":[{"label":"Omnibar","type":"hasLabel","value":true},{"label":"Telemetry","type":"hasLabel","value":true},{"label":"Entity Explorer","type":"hasLabel","value":true},{"label":"IDE","type":"hasLabel","value":true},{"label":"i18n","type":"hasLabel","value":true},{"label":"IDE Navigation","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":"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":"Autocomplete","type":"hasLabel","value":true},{"label":"Evaluated Value","type":"hasLabel","value":true},{"label":"Slash Command","type":"hasLabel","value":true},{"label":"New JS Function","type":"hasLabel","value":true},{"label":"JS Usability","type":"hasLabel","value":true},{"label":"OnPageLoad","type":"hasLabel","value":true},{"label":"Framework Functions","type":"hasLabel","value":true},{"label":"JS Objects","type":"hasLabel","value":true},{"label":"JS Evaluation","type":"hasLabel","value":true},{"label":"AST-frontend","type":"hasLabel","value":true},{"label":"Custom JS Libraries","type":"hasLabel","value":true},{"label":"Action Selector","type":"hasLabel","value":true},{"label":"Widget setter method","type":"hasLabel","value":true},{"label":"Error Handling","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":"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":"One-click Binding","type":"hasLabel","value":true},{"label":"Old widget version","type":"hasLabel","value":true},{"label":"Widget Discoverability","type":"hasLabel","value":true},{"label":"Custom widgets","type":"hasLabel","value":true},{"label":"Switch Group Widget","type":"hasLabel","value":true},{"label":"Checkbox Group widget","type":"hasLabel","value":true},{"label":"Checkbox Widget","type":"hasLabel","value":true},{"label":"Table Inline Edit","type":"hasLabel","value":true},{"label":"App Theming","type":"hasLabel","value":true}],"requires":1},"UI Builders Pod":{"conditions":[{"label":"Property Pane","type":"hasLabel","value":true},{"label":"Copy Paste","type":"hasLabel","value":true},{"label":"Drag & Drop","type":"hasLabel","value":true},{"label":"Undo/Redo","type":"hasLabel","value":true},{"label":"Widgets Pane","type":"hasLabel","value":true},{"label":"UI Performance","type":"hasLabel","value":true},{"label":"Widget Grouping","type":"hasLabel","value":true},{"label":"Reflow & Resize","type":"hasLabel","value":true},{"label":"Canvas / Grid","type":"hasLabel","value":true},{"label":"Auto Height","type":"hasLabel","value":true},{"label":"Browser specific","type":"hasLabel","value":true},{"label":"Auto Layout","type":"hasLabel","value":true},{"label":"Fixed layout","type":"hasLabel","value":true},{"label":"App Navigation","type":"hasLabel","value":true}],"requires":1},"User Education Pod":{"conditions":[{"label":"Documentation","type":"hasLabel","value":true}],"requires":1},"DevOps Pod":{"conditions":[{"label":"Docker","type":"hasLabel","value":true},{"label":"Super Admin","type":"hasLabel","value":true},{"label":"Deployment","type":"hasLabel","value":true},{"label":"K8s","type":"hasLabel","value":true},{"label":"Email Config","type":"hasLabel","value":true},{"label":"Backup & Restore","type":"hasLabel","value":true},{"label":"AWS AMI","type":"hasLabel","value":true},{"label":"Observability","type":"hasLabel","value":true},{"label":"Heroku","type":"hasLabel","value":true},{"label":"New Deployment Mode","type":"hasLabel","value":true},{"label":"Supervisor","type":"hasLabel","value":true},{"label":"Deployment Certificates","type":"hasLabel","value":true},{"label":"Mock Data","type":"hasLabel","value":true},{"label":"AWS ECS","type":"hasLabel","value":true},{"label":"Ingress","type":"hasLabel","value":true},{"label":"Nginx","type":"hasLabel","value":true}],"requires":1},"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},"Data Platform Pod":{"conditions":[{"label":"Page load executions","type":"hasLabel","value":true},{"label":"DSL Update","type":"hasLabel","value":true},{"label":"File upload issues","type":"hasLabel","value":true},{"label":"DocumentDB","type":"hasLabel","value":true},{"label":"Platformization","type":"hasLabel","value":true},{"label":"Secret Management","type":"hasLabel","value":true},{"label":"Publish 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":"Elastic Search","type":"hasLabel","value":true},{"label":"OAuth","type":"hasLabel","value":true},{"label":"Airtable","type":"hasLabel","value":true},{"label":"CURL","type":"hasLabel","value":true},{"label":"DynamoDB","type":"hasLabel","value":true},{"label":"Zendesk","type":"hasLabel","value":true},{"label":"Hubspot","type":"hasLabel","value":true},{"label":"Query Forms","type":"hasLabel","value":true},{"label":"Twilio","type":"hasLabel","value":true},{"label":"MySQL","type":"hasLabel","value":true},{"label":"Connection pool","type":"hasLabel","value":true},{"label":"MariaDB","type":"hasLabel","value":true},{"label":"Integrations Pod General","type":"hasLabel","value":true},{"label":"SMTP plugin","type":"hasLabel","value":true},{"label":"Oracle SQL DB","type":"hasLabel","value":true},{"label":"Query filter","type":"hasLabel","value":true},{"label":"Activation - datasources","type":"hasLabel","value":true},{"label":"Onboarding","type":"hasLabel","value":true},{"label":"Generate Page","type":"hasLabel","value":true},{"label":"Sniping Mode","type":"hasLabel","value":true},{"label":"Welcome Screen","type":"hasLabel","value":true},{"label":"Login / Signup","type":"hasLabel","value":true},{"label":"REST API","type":"hasLabel","value":true},{"label":"REST API","type":"hasLabel","value":true},{"label":"Activation - learnability","type":"hasLabel","value":true},{"label":"Datasources","type":"hasLabel","value":true},{"label":"REST API plugin","type":"hasLabel","value":true},{"label":"Prepared statements","type":"hasLabel","value":true},{"label":"Query Generation","type":"hasLabel","value":true},{"label":"Core Query Execution","type":"hasLabel","value":true},{"label":"Query Management","type":"hasLabel","value":true},{"label":"Query Settings","type":"hasLabel","value":true},{"label":"Query performance","type":"hasLabel","value":true},{"label":"Datatype issue","type":"hasLabel","value":true},{"label":"SmartSubstitution","type":"hasLabel","value":true},{"label":"Schema","type":"hasLabel","value":true},{"label":"Suggested Widgets","type":"hasLabel","value":true},{"label":"SAAS Plugins","type":"hasLabel","value":true},{"label":"Reconnect DS modal","type":"hasLabel","value":true}],"requires":1},"Git Pod":{"conditions":[{"label":"Git Version Control","type":"hasLabel","value":true},{"label":"Import-Export-App","type":"hasLabel","value":true},{"label":"Git Auto-commit","type":"hasLabel","value":true},{"label":"Auto-commit","type":"hasLabel","value":true},{"label":"Continuous Deployment","type":"hasLabel","value":true},{"label":"Branch protection","type":"hasLabel","value":true},{"label":"Default branch","type":"hasLabel","value":true},{"label":"Git status","type":"hasLabel","value":true},{"label":"Git performance","type":"hasLabel","value":true},{"label":"SDLC","type":"hasLabel","value":true},{"label":"Custom environments","type":"hasLabel","value":true},{"label":"Multiple Environments","type":"hasLabel","value":true},{"label":"Datasource Environments","type":"hasLabel","value":true}],"requires":1},"Mobile Pod":{"conditions":[],"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":"Appsmith Business Cloud","type":"hasLabel","value":true},{"label":"BE instance","type":"hasLabel","value":true},{"label":"Embedding Apps","type":"hasLabel","value":true},{"label":"TM_BU","type":"hasLabel","value":true},{"label":"Feature Flagging","type":"hasLabel","value":true},{"label":"Invite flow","type":"hasLabel","value":true},{"label":"Invite users","type":"hasLabel","value":true},{"label":"Home Page","type":"hasLabel","value":true},{"label":"1-click upgrade","type":"hasLabel","value":true}],"requires":1},"Performance Pod":{"conditions":[{"label":"Performance","type":"hasLabel","value":true},{"label":"Performance infra","type":"hasLabel","value":true}],"requires":1},"IDE Pod":{"conditions":[{"label":"Preview mode","type":"hasLabel","value":true},{"label":"IDE Infra","type":"hasLabel","value":true},{"label":"Page Management","type":"hasLabel","value":true},{"label":"AST-backend","type":"hasLabel","value":true},{"label":"Entity Refactor","type":"hasLabel","value":true}],"requires":1},"Appsmith Labs":{"conditions":[{"label":"AI","type":"hasLabel","value":true},{"label":"Knowledge Retrieval","type":"hasLabel","value":true}],"requires":1},"Workflows Pod":{"conditions":[{"label":"Workflows","type":"hasLabel","value":true}],"requires":1},"Templates Pod":{"conditions":[{"label":"Templates","type":"hasLabel","value":true},{"label":"Partial-import-export","type":"hasLabel","value":true},{"label":"Building blocks","type":"hasLabel","value":true},{"label":"Fork App","type":"hasLabel","value":true}],"requires":1},"QA Pod":{"conditions":[{"label":"QA","type":"hasLabel","value":true},{"label":"Automation Test","type":"hasLabel","value":true},{"label":"TestGap","type":"hasLabel","value":true},{"label":"Automation failures","type":"hasLabel","value":true},{"label":"Needs automation","type":"hasLabel","value":true}],"requires":1},"Packages pod":{"conditions":[{"label":"Module creator","type":"hasLabel","value":true},{"label":"Module consumer","type":"hasLabel","value":true},{"label":"Package","type":"hasLabel","value":true},{"label":"Package versioning","type":"hasLabel","value":true},{"label":"Convert to module","type":"hasLabel","value":true},{"label":"Query module","type":"hasLabel","value":true},{"label":"JS module","type":"hasLabel","value":true},{"label":"UI module","type":"hasLabel","value":true},{"label":"Packages pod","type":"hasLabel","value":true}],"requires":1},"Anvil POD":{"conditions":[{"label":"Checkbox Component","type":"hasLabel","value":true},{"label":"WDS team","type":"hasLabel","value":true},{"label":"Anvil POD","type":"hasLabel","value":true},{"label":"WDS - all widgets","type":"hasLabel","value":true},{"label":"WDS - input widget","type":"hasLabel","value":true},{"label":"WDS - paragraph widget","type":"hasLabel","value":true},{"label":"WDS - statbox widget","type":"hasLabel","value":true},{"label":"WDS - modal widget","type":"hasLabel","value":true},{"label":"WDS - icon widget","type":"hasLabel","value":true},{"label":"WDS - checkbox widget","type":"hasLabel","value":true},{"label":"WDS - table widget","type":"hasLabel","value":true},{"label":"WDS - keyValue widget","type":"hasLabel","value":true},{"label":"WDS - switch group widget","type":"hasLabel","value":true},{"label":"WDS - theming","type":"hasLabel","value":true},{"label":"Anvil layout","type":"hasLabel","value":true},{"label":"Anvil - theming","type":"hasLabel","value":true},{"label":"Anvil - vertical alignment","type":"hasLabel","value":true},{"label":"Anvil - layout component","type":"hasLabel","value":true},{"label":"Anvil - drag & drop","type":"hasLabel","value":true},{"label":"Anvil - zones & sections","type":"hasLabel","value":true},{"label":"Anvil - copy paste experience","type":"hasLabel","value":true},{"label":"WDS  - phone widget","type":"hasLabel","value":true},{"label":"WDS - responsive widget","type":"hasLabel","value":true},{"label":"Anvil - responsive viewport","type":"hasLabel","value":true},{"label":"WDS  - widget styling","type":"hasLabel","value":true},{"label":"Anvil - spacing","type":"hasLabel","value":true},{"label":"Anvil - responsive canvas","type":"hasLabel","value":true},{"label":"WDS - inline button widget","type":"hasLabel","value":true},{"label":"Anvil team","type":"hasLabel","value":true}],"requires":1},"Activation Pod":{"conditions":[{"label":"Activation","type":"hasLabel","value":true}],"requires":1}}},"root":"."}],"labels":{"Tab Widget":{"color":"e2c76c","name":"Tab Widget","description":""},"Dont merge":{"color":"ADB39C","name":"Dont merge","description":""},"Epic":{"color":"3E4B9E","name":"Epic","description":"A zenhub epic that describes a project"},"Menu Button Widget":{"color":"235708","name":"Menu Button Widget","description":"Issues related to Menu Button widget"},"Checkbox Group widget":{"color":"bbeecd","name":"Checkbox Group widget","description":"Issues related to Checkbox Group Widget"},"Input Widget":{"color":"ae65d8","name":"Input Widget","description":""},"Security":{"color":"99139C","name":"Security","description":""},"QA":{"color":"","name":"QA","description":"Needs QA attention"},"Verified":{"color":"9bf416","name":"Verified","description":""},"Wont Fix":{"color":"ffffff","name":"Wont Fix","description":"This will not be worked on"},"MySQL":{"color":"c9ddc6","name":"MySQL","description":"Issues related to MySQL plugin"},"Development":{"color":"9F8A02","name":"Development","description":""},"Help Wanted":{"color":"008672","name":"Help Wanted","description":"Extra attention is needed"},"Home Page":{"color":"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"},"Fork App":{"color":"714d2f","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":"30c76d","name":"Onboarding","description":"Issues related to onboarding new developers"},"skip-changelog":{"color":"06086F","name":"skip-changelog","description":"Adding this label to a PR prevents it from being listed in the changelog"},"Low":{"color":"79e53b","name":"Low","description":"An issue that is neither critical nor breaks a user flow"},"potential-duplicate":{"color":"d3cb2e","name":"potential-duplicate","description":"This label marks issues that are potential duplicates of already open issues"},"Audio Widget":{"color":"447B9A","name":"Audio Widget","description":"Issues related to Audio Widget"},"Firestore":{"color":"8078b0","name":"Firestore","description":"Issues related to the firestore Integration"},"New Widget":{"color":"be4cf2","name":"New Widget","description":"A request for a new widget"},"Modal Widget":{"color":"03846f","name":"Modal Widget","description":""},"UX Improvement":{"color":"f4a089","name":"UX Improvement","description":""},"S3":{"color":"8078b0","name":"S3","description":"Issues related to the S3 plugin"},"Release Blocker":{"color":"5756bf","name":"Release Blocker","description":"This issue must be resolved before the release"},"safari":{"color":"51C6AA","name":"safari","description":"Bugs seen on safari browser"},"Example Apps":{"color":"1799b0","name":"Example Apps","description":"Example apps created for new signups"},"MultiSelect Widget":{"color":"AB62D4","name":"MultiSelect Widget","description":"Issues related to MultiSelect Widget"},"Calendar Widget":{"color":"8c6644","name":"Calendar Widget","description":""},"Website":{"color":"151720","name":"Website","description":"Related to www.appsmith.com website"},"Low effort":{"color":"8B59F0","name":"Low effort","description":"Something that'll take a few days to build"},"App Viewers Pod":{"color":"cd8ef9","name":"App Viewers Pod","description":"This label assigns issues to the app viewers pod"},"Checkbox Widget":{"color":"bbeecd","name":"Checkbox Widget","description":""},"Spam":{"color":"620faf","name":"Spam","description":""},"Voice Recorder Widget":{"color":"85bc87","name":"Voice Recorder Widget","description":""},"Select Widget":{"color":"0c669e","name":"Select Widget","description":"Select or dropdown widget"},"Bug":{"color":"8ba6fd","name":"Bug","description":"Something isn't right"},"Widget Validation":{"color":"6990BC","name":"Widget Validation","description":"Issues related to widget property validation"},"Generate Page":{"color":"30c76d","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":"30c76d","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"},"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":"","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"},"Text Widget":{"color":"d130d1","name":"Text Widget","description":""},"Video Widget":{"color":"23dd4b","name":"Video Widget","description":""},"Datasources":{"color":"3d590f","name":"Datasources","description":"Issues related to configuring datasource on appsmith"},"error":{"color":"B66773","name":"error","description":"All issues connected to error messages"},"Form Widget":{"color":"09ed77","name":"Form Widget","description":""},"Needs Triaging":{"color":"e8b851","name":"Needs Triaging","description":"Needs attention from maintainers to triage"},"Autocomplete":{"color":"235708","name":"Autocomplete","description":"Issues related to the autocomplete"},"hacktoberfest":{"color":"0052cc","name":"hacktoberfest","description":"All issues that can be solved by the community during Hacktoberfest"},"Medium effort":{"color":"D31156","name":"Medium effort","description":"Something that'll take more than a week but less than a month to build"},"Release":{"color":"57e5e0","name":"Release","description":""},"High":{"color":"c94d14","name":"High","description":"This issue blocks a user from building or impacts a lot of users"},"UI Performance":{"color":"1799b0","name":"UI Performance","description":"Issues related to UI performance"},"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":"30c76d"},"Redis":{"name":"Redis","description":"Issues related to Redis","color":"8078b0"},"New Datasource":{"color":"60b14c","name":"New Datasource","description":"Requests for new datasources"},"Evaluated Value":{"name":"Evaluated Value","description":"Issues related to evaluated values","color":"39f6e7"},"Undo/Redo":{"name":"Undo/Redo","description":"Issues related to undo/redo","color":"f25880"},"App Navigation":{"name":"App Navigation","description":"Issues related to the topbar navigation and configuring it","color":"4773ab"},"Widgets Pane":{"name":"Widgets Pane","description":"Issues related to the discovery and organisation of widgets","color":"ad5d78"},"View Mode":{"color":"1799b0","name":"View Mode","description":"Issues related to the view mode"},"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":"30c76d"},"Slash Command":{"name":"Slash Command","description":"Issues related to the slash command","color":"a0608e"},"Widget Property":{"name":"Widget Property","description":"Issues related to adding / modifying widget properties across widgets","color":"5e92cb"},"Windows":{"name":"Windows","description":"Issues related exclusively to Windows systems","color":"b4cb8a"},"Old App Issues":{"name":"Old App Issues","description":"Issues related to apps old apps a few weeks old and app issues in stale browser session","color":"87ab18"},"Document Viewer Widget":{"name":"Document Viewer Widget","description":"Issues related to Document Viewer Widget","color":"899d4b"},"Radio Group Widget":{"name":"Radio Group Widget","description":"Issues related to radio group widget","color":"b68495"},"Super Admin":{"name":"Super Admin","description":"Issues related to the super admin page","color":"aa95cf"},"Postgres":{"name":"Postgres","description":"Postgres related issues","color":"8078b0"},"New JS Function":{"name":"New JS Function","description":"Issues related to adding a JS Function","color":"8e8aa4"},"Cannot Reproduce Issue":{"color":"93c9cc","name":"Cannot Reproduce Issue","description":"Issues that cannot be reproduced"},"Widget Grouping":{"name":"Widget Grouping","description":"Issues related to Widget Grouping","color":"a49951"},"K8s":{"name":"K8s","description":"Kubernetes related issues","color":"5f318a"},"Docker":{"name":"Docker","description":"Issues related to docker","color":"89b808"},"Camera Widget":{"name":"Camera Widget","description":"Issues and enhancements related to camera widget","color":"e6038e"},"SAAS Plugins":{"name":"SAAS Plugins","description":"Issues related to SAAS Plugins","color":"80e18f"},"JS Promises":{"name":"JS Promises","description":"Issues related to promises","color":"d7771f"},"OnPageLoad":{"name":"OnPageLoad","description":"OnPageLoad issues on functions and queries","color":"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":"30c76d"},"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":"5e0904"},"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":"b893f6"},"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"},"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":"cef66b"},"OAuth":{"name":"OAuth","description":"OAuth related bugs or features","color":"60885f"},"Table Widget V2":{"name":"Table Widget V2","description":"Issues related to Table Widget V2","color":"3a7192"},"IDE Navigation":{"name":"IDE Navigation","description":"Issues/feature requests related to IDE navigation, and context switching","color":"bc0cba"},"Query performance":{"name":"Query performance","description":"Issues that have to do with lack in performance of query execution","color":"cef66b"},"SAAS Manager App":{"name":"SAAS Manager App","description":"Issues with the SAAS manager app","color":"d427db"},"Twilio":{"name":"Twilio","description":"Issues related to Twilio integration","color":"23ba8d"},"Hubspot":{"name":"Hubspot","description":"Issues related to Hubspot integration","color":"60885f"},"Zendesk":{"name":"Zendesk","description":"Issues related to Zendesk integration","color":"60885f"},"Entity Refactor":{"name":"Entity Refactor","description":"Issues related to refactor logic","color":"cef66b"},"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":"bae511"},"Elastic Search":{"name":"Elastic Search","description":"Issues related to the elastic search datasource","color":"8078b0"},"Core Query Execution":{"color":"cef66b","name":"Core Query Execution","description":"Issues related to the execution of all queries"},"Query Management":{"name":"Query Management","description":"Issues related to the CRUD of actions or queries","color":"cef66b"},"Query Settings":{"name":"Query Settings","description":"Issues related to the settings of all queries","color":"cef66b"},"Code Editor":{"name":"Code Editor","description":"Issues related to the code editor","color":"4ca16e"},"Query Forms":{"color":"12b253","name":"Query Forms","description":"Isuses related to the query forms"},"JS Objects":{"color":"22962c","name":"JS Objects","description":"Issues related to JS Objects"},"JS Evaluation":{"color":"22962c","name":"JS Evaluation","description":"Issues related to JS evaluation on the platform"},"SmartSubstitution":{"name":"SmartSubstitution","description":"Issues related to Smart substitution of mustache bindings in queries","color":"bae511"},"Query Generation":{"name":"Query Generation","description":"Issues related to query generation","color":"cef66b"},"Suggested Widgets":{"name":"Suggested Widgets","description":"Issues related to suggesting widgets based on query response","color":"6ac063"},"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"},"Conversion Algorithm":{"name":"Conversion Algorithm","description":"All issue related to converting app from fixed to flex mode & vice versa","color":"d12d2e"},"Browser specific":{"name":"Browser specific","description":"All issue related to browser","color":"d12d2e"},"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":"cef66b"},"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"},"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"},"Feature Flagging":{"name":"Feature Flagging","description":"Anything related feature flagging","color":"8d8a09"},"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"},"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":"bae511"},"Platformization":{"name":"Platformization","description":"Issues or tasks related to platformization of Appsmith codebase","color":"4e972b"},"Activation - datasources":{"name":"Activation - datasources","description":"issues related to activation projects","color":"7c7ace"},"Partial-import-export":{"name":"Partial-import-export","description":"Label for granular reusability.","color":"717732"},"AI":{"name":"AI","description":"All tasks related to AI","color":"75c4ce"},"Custom environments":{"name":"Custom environments","description":"Issues with creating or working with custom environments","color":"bae511"},"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"},"Schema":{"name":"Schema","description":"Issues related to database schema","color":"af939e"},"Fixed layout":{"name":"Fixed layout","description":"issues related to fixed layout","color":"b66681"},"Anvil layout":{"name":"Anvil layout","description":"issues related to the new layout system anvil","color":"5e0904"},"New Deployment Mode":{"name":"New Deployment Mode","description":"Support a new mode of deployment","color":"108033"},"Custom widgets":{"name":"Custom widgets","description":"For all issues related to the custom widget project","color":"c9db9c"},"IDE Pod":{"name":"IDE Pod","description":"https://app.zenhub.com/workspaces/new-developers-pod-60507ad1d4b98d00150a2858/board","color":"d3d248"},"TM_BU":{"name":"TM_BU","description":"The issues on Team Manager which needs to be taken up by Billing & Usage","color":"198cdf"},"Homepage Experience V2":{"name":"Homepage Experience V2","description":"Label for reporting new tasks and bug fixes related to revamped homepage experience","color":"c55d54"},"Appsmith Labs":{"name":"Appsmith Labs","description":"All things related to AI and other new initiatives ","color":"712d51"},"Customer Success":{"name":"Customer Success","description":"Issues that the success team cares about","color":"6ccabd"},"Invite flow":{"name":"Invite flow","description":"Invite users flow and any associated actions","color":"881b35"},"Invite users":{"name":"Invite users","description":"Invite users flow and any associated actions","color":"23e6d6"},"Workflows Pod":{"name":"Workflows Pod","description":"For all issues related to the Workflows feature","color":"a86802"},"DailyPromotionBlocker":{"name":"DailyPromotionBlocker","description":"DailyPromotion Blocker","color":"9b2280"},"JS Binding":{"name":"JS Binding","description":"All issues related to the JS Binding experience","color":"422fed"},"Knowledge Retrieval":{"name":"Knowledge Retrieval","description":"All issues related to knowledge retrieval on Appsmith AI","color":"a36890"},"REST API":{"name":"REST API","description":"REST API plugin related issues","color":"e3ede5"},"1-click upgrade":{"name":"1-click upgrade","description":"For all issues/tasks related to 1-click upgrade & downgrade project","color":"51b5ff"},"Activation - learnability":{"name":"Activation - learnability","description":"Activation - learnability","color":"96fc76"},"Critical":{"color":"a1e3db","name":"Critical","description":"This issue breaks existing apps. Drop everything else to resolve"},"Module creator":{"name":"Module creator","description":"Issues related to the module creator side","color":"bb2c05"},"Module consumer":{"name":"Module consumer","description":"Issues related to the module consumer side","color":"83d3c5"},"Package":{"name":"Package","description":"Issues related to packages","color":"2ad485"},"Package versioning":{"name":"Package versioning","description":"ISsues related to how we manage versions for packages","color":"4c5218"},"Convert to module":{"name":"Convert to module","description":"Issues related to the module creation flow using conversion","color":"4c5218"},"Query module":{"name":"Query module","description":"Issues affecting query modules or its instances","color":"b11a7e"},"JS module":{"name":"JS module","description":"Issues affecting JS modules or its instances","color":"bf76f6"},"Templates Pod":{"name":"Templates Pod","description":"Issues related to Templates","color":"e7b3b9"},"Secret Management":{"name":"Secret Management","description":"Issues related to secret management","color":"cce8e7"},"REST API plugin":{"name":"REST API plugin","description":"REST API plugin related issues","color":"b5948a"},"UI module":{"name":"UI module","description":"Issues affecting UI modules or its instances","color":"d2acee"},"Preview mode":{"name":"Preview mode","description":"Issues related to app previews","color":"3fb8f2"},"Git Auto-commit":{"name":"Git Auto-commit","description":"Issues related to autocommit","color":"717732"},"QA Pod":{"name":"QA Pod","description":"Issues under the QA Pod","color":"717732"},"Automation Test":{"name":"Automation Test","description":"","color":""},"Automation failures":{"name":"Automation failures","description":"","color":""},"Needs automation":{"name":"Needs automation","description":"Issues that needs automated tests","color":""},"Prepared statements":{"name":"Prepared statements","description":"Issues related to prepared statement flow","color":""},"Switch Group Widget":{"name":"Switch Group Widget","description":"Issues related to Switch group Widget","color":""},"Supervisor":{"name":"Supervisor","description":"Issues related to supervisor","color":"2c5813"},"Deployment Certificates":{"name":"Deployment Certificates","description":"Issues related to lets encrypt","color":"e148aa"},"Mock Data":{"name":"Mock Data","description":"Issues related to mock databases","color":"ebf251"},"AWS ECS":{"name":"AWS ECS","description":"Issues related to ECS Fargate","color":"e506ff"},"Publish App":{"name":"Publish App","description":"Issues related to app deployment","color":""},"IDE Infra":{"name":"IDE Infra","description":"Issues related to the IDE infrastructure like saving changes","color":"4c1858"},"User Profile":{"name":"User Profile","description":"Issues related to a user profile","color":"a60d34"},"Admin Settings":{"color":"32a316","name":"Admin Settings","description":"Issues related to admin settings"},"Workspace settings":{"name":"Workspace settings","description":"Issues related to workspace settings","color":"47d1ad"},"Page Management":{"color":"e17a68","name":"Page Management","description":"Issues related to configuring pages"},"Ingress":{"name":"Ingress","description":"Ingress Controller","color":"a86802"},"Nginx":{"name":"Nginx","description":"Issues related to Nginx","color":"e54195"},"Workflows":{"name":"Workflows","description":"","color":"1b89db"},"Building blocks":{"name":"Building blocks","description":"Building blocks on cavas, on templates listing or drag and drop of building blocks.","color":"8e3c7a"},"Table Inline Edit":{"name":"Table Inline Edit","description":"Issues related to inline editing","color":"60895a"},"User Session ":{"name":"User Session ","description":"For all issues/tasks related to user sessions","color":"65a3f5"},"Packages pod":{"name":"Packages pod","description":"issues that belong to the packages pod","color":"423772"},"WDS - all widgets":{"name":"WDS - all widgets","description":"all widget present in WDS","color":"2670ae"},"WDS - input widget":{"name":"WDS - input widget","description":"Issues related to input widget on WDS","color":"2670ae"},"WDS - paragraph widget":{"name":"WDS - paragraph widget","description":"issues related to paragraph widget on WDS","color":"2670ae"},"WDS - statbox widget":{"name":"WDS - statbox widget","description":"issues related to statbox widget on WDS","color":"2670ae"},"WDS - modal widget":{"name":"WDS - modal widget","description":"Issues related to modal widget on WDS","color":"2670ae"},"WDS - icon widget":{"name":"WDS - icon widget","description":"Issues related to icon widget on WDS","color":"2670ae"},"WDS - checkbox widget":{"name":"WDS - checkbox widget","description":"Issues related to checkbox widget on WDS","color":"2670ae"},"WDS - table widget":{"name":"WDS - table widget","description":"Issues related to table widget on WDS","color":"2670ae"},"WDS - keyValue widget":{"name":"WDS - keyValue widget","description":"Issues related to key-value widget on WDS","color":"2670ae"},"WDS - switch group widget":{"name":"WDS - switch group widget","description":"Issues related to switch group widget on WDS","color":"2670ae"},"WDS - theming":{"name":"WDS - theming","description":"Issues related to theming on the Anvil instance","color":"2670ae"},"Anvil POD":{"name":"Anvil POD","description":"Issue related to Anvil project","color":"5e0904"},"Anvil - theming":{"name":"Anvil - theming","description":"Issues related to theming on the Anvil instance","color":"c28de5"},"Anvil - vertical alignment":{"name":"Anvil - vertical alignment","description":"Issues related to vertical alignment on the Anvil layout","color":"c28de5"},"Anvil - layout component":{"name":"Anvil - layout component","description":"Issues related to layout component on the Anvil layout","color":"c28de5"},"Anvil - drag & drop":{"name":"Anvil - drag & drop","description":"Issues related to drag & drop experience on Anvil","color":"c28de5"},"Anvil - zones & sections":{"name":"Anvil - zones & sections","description":"Issues related to zones and sections on the Anvil layout","color":"c28de5"},"Anvil - copy paste experience":{"name":"Anvil - copy paste experience","description":"Issues related to copy paste experience on the Anvil layout","color":"c28de5"},"WDS  - phone widget":{"name":"WDS  - phone widget","description":"Issues related to phone widget on WDS","color":"c28de5"},"WDS - responsive widget":{"name":"WDS - responsive widget","description":"All issues related to widget responsiveness","color":"11ee05"},"Anvil - responsive viewport":{"color":"11ee05","name":"Anvil - responsive viewport","description":"Issues seen on different viewports like mobile"},"WDS  - widget styling":{"color":"11ee05","name":"WDS  - widget styling","description":"all about widget styling"},"Anvil - spacing":{"name":"Anvil - spacing","description":"Related to spacing between widgets in auto layout","color":"11ee05"},"Anvil - responsive canvas":{"name":"Anvil - responsive canvas","description":"All issues related to canvas responsiveness","color":"11ee05"},"WDS - inline button widget":{"name":"WDS - inline button widget","description":"Issues related to inline button widget on WDS","color":"7cef83"},"Activation Pod":{"name":"Activation Pod","description":"for Activation group","color":"d67d00"},"Activation":{"name":"Activation","description":"for Activation group","color":"d67d00"},"Tests":{"name":"Tests","description":"Test issues","color":"4fc7b6"},"Ballpark: XXS":{"name":"Ballpark: XXS","description":"~1xDev in 1/2xSprint","color":""},"Ballpark: XS":{"name":"Ballpark: XS","description":"~1xDev in 1xSprint","color":"53bf71"},"Ballpark: S":{"name":"Ballpark: S","description":"~2xDev in 1xSprint","color":"6e9e65"},"Ballpark: M":{"name":"Ballpark: M","description":"~1xPOD in 1xSprint","color":"2229e6"},"Ballpark: L":{"name":"Ballpark: L","description":"~1xPOD in 3xSprint or 2xPODs in 1xSprint","color":"49962f"},"Ballpark: XL":{"name":"Ballpark: XL","description":"~1xPOD in 1xQuarter or 2xPODs in 2xSprint","color":"b524c9"},"Ballpark: XXL":{"name":"Ballpark: XXL","description":"~2xPODs in 1xQuarter","color":"22092c"},"Auto-commit":{"name":"Auto-commit","description":"Issues related to auto-generated commits showing up on git ","color":"e25b89"},"Continuous Deployment":{"name":"Continuous Deployment","description":"Issues related to CD pipeline on git","color":"aea47c"},"Branch protection":{"name":"Branch protection","description":"Issues related to using a protected branch on git","color":"ab511a"},"Default branch":{"name":"Default branch","description":"Issues related to using a default branch on git","color":"195737"},"Git status":{"name":"Git status","description":"Issues related to information shown on git status modal or number of changes appearing in a branch","color":"c851b8"},"Git performance":{"name":"Git performance","description":"Issues related to perceived performance on any git operation","color":"189af6"},"Anvil team":{"name":"Anvil team","description":"issues related to the new layout system anvil","color":"798200"},"SDLC":{"name":"SDLC","description":"Issues related to software development lifecycle experiences","color":"bae511"},"Reconnect DS modal":{"name":"Reconnect DS modal","description":"Issues related to reconnect datasource modal post app import","color":"2e398b"}},"success":true}
\ No newline at end of file
+{"runners":[{"versioning":{"source":"milestones","type":"SemVer"},"prereleaseName":"alpha","issue":{"labels":{"Error Handling":{"conditions":[],"requires":1},"Team Managers Pod":{"conditions":[{"label":"SSO","type":"hasLabel","value":true},{"label":"RBAC","type":"hasLabel","value":true},{"label":"Audit Logs","type":"hasLabel","value":true},{"label":"Airgap","type":"hasLabel","value":true},{"label":"Enterprise Edition","type":"hasLabel","value":true},{"label":"SCIM","type":"hasLabel","value":true},{"label":"Invite flow","type":"hasLabel","value":true},{"label":"User Profile","type":"hasLabel","value":true},{"label":"Admin Settings","type":"hasLabel","value":true},{"label":"Workspace settings","type":"hasLabel","value":true},{"label":"User Session ","type":"hasLabel","value":true}],"requires":1},"New Developers Pod":{"conditions":[{"label":"Omnibar","type":"hasLabel","value":true},{"label":"Telemetry","type":"hasLabel","value":true},{"label":"Entity Explorer","type":"hasLabel","value":true},{"label":"IDE","type":"hasLabel","value":true},{"label":"i18n","type":"hasLabel","value":true},{"label":"IDE Navigation","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":"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":"Autocomplete","type":"hasLabel","value":true},{"label":"Evaluated Value","type":"hasLabel","value":true},{"label":"Slash Command","type":"hasLabel","value":true},{"label":"New JS Function","type":"hasLabel","value":true},{"label":"JS Usability","type":"hasLabel","value":true},{"label":"OnPageLoad","type":"hasLabel","value":true},{"label":"Framework Functions","type":"hasLabel","value":true},{"label":"JS Objects","type":"hasLabel","value":true},{"label":"JS Evaluation","type":"hasLabel","value":true},{"label":"Custom JS Libraries","type":"hasLabel","value":true},{"label":"Action Selector","type":"hasLabel","value":true},{"label":"Widget setter method","type":"hasLabel","value":true},{"label":"Error Handling","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":"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":"One-click Binding","type":"hasLabel","value":true},{"label":"Old widget version","type":"hasLabel","value":true},{"label":"Widget Discoverability","type":"hasLabel","value":true},{"label":"Custom widgets","type":"hasLabel","value":true},{"label":"Switch Group Widget","type":"hasLabel","value":true},{"label":"Checkbox Group widget","type":"hasLabel","value":true},{"label":"Checkbox Widget","type":"hasLabel","value":true},{"label":"Table Inline Edit","type":"hasLabel","value":true},{"label":"App Theming","type":"hasLabel","value":true}],"requires":1},"UI Builders Pod":{"conditions":[{"label":"Property Pane","type":"hasLabel","value":true},{"label":"Copy Paste","type":"hasLabel","value":true},{"label":"Drag & Drop","type":"hasLabel","value":true},{"label":"Undo/Redo","type":"hasLabel","value":true},{"label":"Widgets Pane","type":"hasLabel","value":true},{"label":"UI Performance","type":"hasLabel","value":true},{"label":"Widget Grouping","type":"hasLabel","value":true},{"label":"Reflow & Resize","type":"hasLabel","value":true},{"label":"Canvas / Grid","type":"hasLabel","value":true},{"label":"Auto Height","type":"hasLabel","value":true},{"label":"Browser specific","type":"hasLabel","value":true},{"label":"Auto Layout","type":"hasLabel","value":true},{"label":"Fixed layout","type":"hasLabel","value":true},{"label":"App Navigation","type":"hasLabel","value":true}],"requires":1},"User Education Pod":{"conditions":[{"label":"Documentation","type":"hasLabel","value":true}],"requires":1},"DevOps Pod":{"conditions":[{"label":"Docker","type":"hasLabel","value":true},{"label":"Super Admin","type":"hasLabel","value":true},{"label":"Deployment","type":"hasLabel","value":true},{"label":"K8s","type":"hasLabel","value":true},{"label":"Email Config","type":"hasLabel","value":true},{"label":"Backup & Restore","type":"hasLabel","value":true},{"label":"AWS AMI","type":"hasLabel","value":true},{"label":"Observability","type":"hasLabel","value":true},{"label":"Heroku","type":"hasLabel","value":true},{"label":"New Deployment Mode","type":"hasLabel","value":true},{"label":"Supervisor","type":"hasLabel","value":true},{"label":"Deployment Certificates","type":"hasLabel","value":true},{"label":"Mock Data","type":"hasLabel","value":true},{"label":"AWS ECS","type":"hasLabel","value":true},{"label":"Ingress","type":"hasLabel","value":true},{"label":"Nginx","type":"hasLabel","value":true}],"requires":1},"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},"Data Platform Pod":{"conditions":[{"label":"Page load executions","type":"hasLabel","value":true},{"label":"DSL Update","type":"hasLabel","value":true},{"label":"File upload issues","type":"hasLabel","value":true},{"label":"DocumentDB","type":"hasLabel","value":true},{"label":"Platformization","type":"hasLabel","value":true},{"label":"Secret Management","type":"hasLabel","value":true},{"label":"Publish App","type":"hasLabel","value":true},{"label":"AST-backend","type":"hasLabel","value":true},{"label":"AST-frontend","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":"Elastic Search","type":"hasLabel","value":true},{"label":"OAuth","type":"hasLabel","value":true},{"label":"Airtable","type":"hasLabel","value":true},{"label":"CURL","type":"hasLabel","value":true},{"label":"DynamoDB","type":"hasLabel","value":true},{"label":"Zendesk","type":"hasLabel","value":true},{"label":"Hubspot","type":"hasLabel","value":true},{"label":"Query Forms","type":"hasLabel","value":true},{"label":"Twilio","type":"hasLabel","value":true},{"label":"MySQL","type":"hasLabel","value":true},{"label":"Connection pool","type":"hasLabel","value":true},{"label":"MariaDB","type":"hasLabel","value":true},{"label":"Integrations Pod General","type":"hasLabel","value":true},{"label":"SMTP plugin","type":"hasLabel","value":true},{"label":"Oracle SQL DB","type":"hasLabel","value":true},{"label":"Query filter","type":"hasLabel","value":true},{"label":"Activation - datasources","type":"hasLabel","value":true},{"label":"Onboarding","type":"hasLabel","value":true},{"label":"Generate Page","type":"hasLabel","value":true},{"label":"Sniping Mode","type":"hasLabel","value":true},{"label":"Welcome Screen","type":"hasLabel","value":true},{"label":"Login / Signup","type":"hasLabel","value":true},{"label":"REST API","type":"hasLabel","value":true},{"label":"REST API","type":"hasLabel","value":true},{"label":"Activation - learnability","type":"hasLabel","value":true},{"label":"Datasources","type":"hasLabel","value":true},{"label":"REST API plugin","type":"hasLabel","value":true},{"label":"Prepared statements","type":"hasLabel","value":true},{"label":"Query Generation","type":"hasLabel","value":true},{"label":"Core Query Execution","type":"hasLabel","value":true},{"label":"Query Management","type":"hasLabel","value":true},{"label":"Query Settings","type":"hasLabel","value":true},{"label":"Query performance","type":"hasLabel","value":true},{"label":"Datatype issue","type":"hasLabel","value":true},{"label":"SmartSubstitution","type":"hasLabel","value":true},{"label":"Schema","type":"hasLabel","value":true},{"label":"Suggested Widgets","type":"hasLabel","value":true},{"label":"SAAS Plugins","type":"hasLabel","value":true},{"label":"Reconnect DS modal","type":"hasLabel","value":true}],"requires":1},"Git Pod":{"conditions":[{"label":"Git Version Control","type":"hasLabel","value":true},{"label":"Import-Export-App","type":"hasLabel","value":true},{"label":"Git Auto-commit","type":"hasLabel","value":true},{"label":"Auto-commit","type":"hasLabel","value":true},{"label":"Continuous Deployment","type":"hasLabel","value":true},{"label":"Branch protection","type":"hasLabel","value":true},{"label":"Default branch","type":"hasLabel","value":true},{"label":"Git status","type":"hasLabel","value":true},{"label":"Git performance","type":"hasLabel","value":true},{"label":"SDLC","type":"hasLabel","value":true},{"label":"Custom environments","type":"hasLabel","value":true},{"label":"Multiple Environments","type":"hasLabel","value":true},{"label":"Datasource Environments","type":"hasLabel","value":true}],"requires":1},"Mobile Pod":{"conditions":[],"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":"Appsmith Business Cloud","type":"hasLabel","value":true},{"label":"BE instance","type":"hasLabel","value":true},{"label":"Embedding Apps","type":"hasLabel","value":true},{"label":"TM_BU","type":"hasLabel","value":true},{"label":"Feature Flagging","type":"hasLabel","value":true},{"label":"Invite flow","type":"hasLabel","value":true},{"label":"Invite users","type":"hasLabel","value":true},{"label":"Home Page","type":"hasLabel","value":true},{"label":"1-click upgrade","type":"hasLabel","value":true}],"requires":1},"Performance Pod":{"conditions":[{"label":"Performance","type":"hasLabel","value":true},{"label":"Performance infra","type":"hasLabel","value":true}],"requires":1},"IDE Pod":{"conditions":[{"label":"Preview mode","type":"hasLabel","value":true},{"label":"IDE Infra","type":"hasLabel","value":true},{"label":"Page Management","type":"hasLabel","value":true},{"label":"Entity Refactor","type":"hasLabel","value":true}],"requires":1},"Appsmith Labs":{"conditions":[{"label":"AI","type":"hasLabel","value":true},{"label":"Knowledge Retrieval","type":"hasLabel","value":true}],"requires":1},"Workflows Pod":{"conditions":[{"label":"Workflows","type":"hasLabel","value":true}],"requires":1},"Templates Pod":{"conditions":[{"label":"Templates","type":"hasLabel","value":true},{"label":"Partial-import-export","type":"hasLabel","value":true},{"label":"Building blocks","type":"hasLabel","value":true},{"label":"Fork App","type":"hasLabel","value":true}],"requires":1},"QA Pod":{"conditions":[{"label":"QA","type":"hasLabel","value":true},{"label":"Automation Test","type":"hasLabel","value":true},{"label":"TestGap","type":"hasLabel","value":true},{"label":"Automation failures","type":"hasLabel","value":true},{"label":"Needs automation","type":"hasLabel","value":true}],"requires":1},"Packages pod":{"conditions":[{"label":"Module creator","type":"hasLabel","value":true},{"label":"Module consumer","type":"hasLabel","value":true},{"label":"Package","type":"hasLabel","value":true},{"label":"Package versioning","type":"hasLabel","value":true},{"label":"Convert to module","type":"hasLabel","value":true},{"label":"Query module","type":"hasLabel","value":true},{"label":"JS module","type":"hasLabel","value":true},{"label":"UI module","type":"hasLabel","value":true},{"label":"Packages pod","type":"hasLabel","value":true}],"requires":1},"Anvil POD":{"conditions":[{"label":"Checkbox Component","type":"hasLabel","value":true},{"label":"WDS team","type":"hasLabel","value":true},{"label":"Anvil POD","type":"hasLabel","value":true},{"label":"WDS - all widgets","type":"hasLabel","value":true},{"label":"WDS - input widget","type":"hasLabel","value":true},{"label":"WDS - paragraph widget","type":"hasLabel","value":true},{"label":"WDS - statbox widget","type":"hasLabel","value":true},{"label":"WDS - modal widget","type":"hasLabel","value":true},{"label":"WDS - icon widget","type":"hasLabel","value":true},{"label":"WDS - checkbox widget","type":"hasLabel","value":true},{"label":"WDS - table widget","type":"hasLabel","value":true},{"label":"WDS - keyValue widget","type":"hasLabel","value":true},{"label":"WDS - switch group widget","type":"hasLabel","value":true},{"label":"WDS - theming","type":"hasLabel","value":true},{"label":"Anvil layout","type":"hasLabel","value":true},{"label":"Anvil - theming","type":"hasLabel","value":true},{"label":"Anvil - vertical alignment","type":"hasLabel","value":true},{"label":"Anvil - layout component","type":"hasLabel","value":true},{"label":"Anvil - drag & drop","type":"hasLabel","value":true},{"label":"Anvil - zones & sections","type":"hasLabel","value":true},{"label":"Anvil - copy paste experience","type":"hasLabel","value":true},{"label":"WDS  - phone widget","type":"hasLabel","value":true},{"label":"WDS - responsive widget","type":"hasLabel","value":true},{"label":"Anvil - responsive viewport","type":"hasLabel","value":true},{"label":"WDS  - widget styling","type":"hasLabel","value":true},{"label":"Anvil - spacing","type":"hasLabel","value":true},{"label":"Anvil - responsive canvas","type":"hasLabel","value":true},{"label":"WDS - inline button widget","type":"hasLabel","value":true},{"label":"Anvil team","type":"hasLabel","value":true}],"requires":1},"Activation Pod":{"conditions":[{"label":"Activation","type":"hasLabel","value":true}],"requires":1}}},"root":"."}],"labels":{"Tab Widget":{"color":"e2c76c","name":"Tab Widget","description":""},"Dont merge":{"color":"ADB39C","name":"Dont merge","description":""},"Epic":{"color":"3E4B9E","name":"Epic","description":"A zenhub epic that describes a project"},"Menu Button Widget":{"color":"235708","name":"Menu Button Widget","description":"Issues related to Menu Button widget"},"Checkbox Group widget":{"color":"bbeecd","name":"Checkbox Group widget","description":"Issues related to Checkbox Group Widget"},"Input Widget":{"color":"ae65d8","name":"Input Widget","description":""},"Security":{"color":"99139C","name":"Security","description":""},"QA":{"color":"","name":"QA","description":"Needs QA attention"},"Verified":{"color":"9bf416","name":"Verified","description":""},"Wont Fix":{"color":"ffffff","name":"Wont Fix","description":"This will not be worked on"},"MySQL":{"color":"c9ddc6","name":"MySQL","description":"Issues related to MySQL plugin"},"Development":{"color":"9F8A02","name":"Development","description":""},"Help Wanted":{"color":"008672","name":"Help Wanted","description":"Extra attention is needed"},"Home Page":{"color":"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"},"Fork App":{"color":"714d2f","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":"30c76d","name":"Onboarding","description":"Issues related to onboarding new developers"},"skip-changelog":{"color":"06086F","name":"skip-changelog","description":"Adding this label to a PR prevents it from being listed in the changelog"},"Low":{"color":"79e53b","name":"Low","description":"An issue that is neither critical nor breaks a user flow"},"potential-duplicate":{"color":"d3cb2e","name":"potential-duplicate","description":"This label marks issues that are potential duplicates of already open issues"},"Audio Widget":{"color":"447B9A","name":"Audio Widget","description":"Issues related to Audio Widget"},"Firestore":{"color":"8078b0","name":"Firestore","description":"Issues related to the firestore Integration"},"New Widget":{"color":"be4cf2","name":"New Widget","description":"A request for a new widget"},"Modal Widget":{"color":"03846f","name":"Modal Widget","description":""},"UX Improvement":{"color":"f4a089","name":"UX Improvement","description":""},"S3":{"color":"8078b0","name":"S3","description":"Issues related to the S3 plugin"},"Release Blocker":{"color":"5756bf","name":"Release Blocker","description":"This issue must be resolved before the release"},"safari":{"color":"51C6AA","name":"safari","description":"Bugs seen on safari browser"},"Example Apps":{"color":"1799b0","name":"Example Apps","description":"Example apps created for new signups"},"MultiSelect Widget":{"color":"AB62D4","name":"MultiSelect Widget","description":"Issues related to MultiSelect Widget"},"Calendar Widget":{"color":"8c6644","name":"Calendar Widget","description":""},"Website":{"color":"151720","name":"Website","description":"Related to www.appsmith.com website"},"Low effort":{"color":"8B59F0","name":"Low effort","description":"Something that'll take a few days to build"},"App Viewers Pod":{"color":"cd8ef9","name":"App Viewers Pod","description":"This label assigns issues to the app viewers pod"},"Checkbox Widget":{"color":"bbeecd","name":"Checkbox Widget","description":""},"Spam":{"color":"620faf","name":"Spam","description":""},"Voice Recorder Widget":{"color":"85bc87","name":"Voice Recorder Widget","description":""},"Select Widget":{"color":"0c669e","name":"Select Widget","description":"Select or dropdown widget"},"Bug":{"color":"8ba6fd","name":"Bug","description":"Something isn't right"},"Widget Validation":{"color":"6990BC","name":"Widget Validation","description":"Issues related to widget property validation"},"Generate Page":{"color":"30c76d","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":"30c76d","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"},"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":"","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"},"Text Widget":{"color":"d130d1","name":"Text Widget","description":""},"Video Widget":{"color":"23dd4b","name":"Video Widget","description":""},"Datasources":{"color":"3d590f","name":"Datasources","description":"Issues related to configuring datasource on appsmith"},"error":{"color":"B66773","name":"error","description":"All issues connected to error messages"},"Form Widget":{"color":"09ed77","name":"Form Widget","description":""},"Needs Triaging":{"color":"e8b851","name":"Needs Triaging","description":"Needs attention from maintainers to triage"},"Autocomplete":{"color":"235708","name":"Autocomplete","description":"Issues related to the autocomplete"},"hacktoberfest":{"color":"0052cc","name":"hacktoberfest","description":"All issues that can be solved by the community during Hacktoberfest"},"Medium effort":{"color":"D31156","name":"Medium effort","description":"Something that'll take more than a week but less than a month to build"},"Release":{"color":"57e5e0","name":"Release","description":""},"High":{"color":"c94d14","name":"High","description":"This issue blocks a user from building or impacts a lot of users"},"UI Performance":{"color":"1799b0","name":"UI Performance","description":"Issues related to UI performance"},"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":"30c76d"},"Redis":{"name":"Redis","description":"Issues related to Redis","color":"8078b0"},"New Datasource":{"color":"60b14c","name":"New Datasource","description":"Requests for new datasources"},"Evaluated Value":{"name":"Evaluated Value","description":"Issues related to evaluated values","color":"39f6e7"},"Undo/Redo":{"name":"Undo/Redo","description":"Issues related to undo/redo","color":"f25880"},"App Navigation":{"name":"App Navigation","description":"Issues related to the topbar navigation and configuring it","color":"4773ab"},"Widgets Pane":{"name":"Widgets Pane","description":"Issues related to the discovery and organisation of widgets","color":"ad5d78"},"View Mode":{"color":"1799b0","name":"View Mode","description":"Issues related to the view mode"},"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":"30c76d"},"Slash Command":{"name":"Slash Command","description":"Issues related to the slash command","color":"a0608e"},"Widget Property":{"name":"Widget Property","description":"Issues related to adding / modifying widget properties across widgets","color":"5e92cb"},"Windows":{"name":"Windows","description":"Issues related exclusively to Windows systems","color":"b4cb8a"},"Old App Issues":{"name":"Old App Issues","description":"Issues related to apps old apps a few weeks old and app issues in stale browser session","color":"87ab18"},"Document Viewer Widget":{"name":"Document Viewer Widget","description":"Issues related to Document Viewer Widget","color":"899d4b"},"Radio Group Widget":{"name":"Radio Group Widget","description":"Issues related to radio group widget","color":"b68495"},"Super Admin":{"name":"Super Admin","description":"Issues related to the super admin page","color":"aa95cf"},"Postgres":{"name":"Postgres","description":"Postgres related issues","color":"8078b0"},"New JS Function":{"name":"New JS Function","description":"Issues related to adding a JS Function","color":"8e8aa4"},"Cannot Reproduce Issue":{"color":"93c9cc","name":"Cannot Reproduce Issue","description":"Issues that cannot be reproduced"},"Widget Grouping":{"name":"Widget Grouping","description":"Issues related to Widget Grouping","color":"a49951"},"K8s":{"name":"K8s","description":"Kubernetes related issues","color":"5f318a"},"Docker":{"name":"Docker","description":"Issues related to docker","color":"89b808"},"Camera Widget":{"name":"Camera Widget","description":"Issues and enhancements related to camera widget","color":"e6038e"},"SAAS Plugins":{"name":"SAAS Plugins","description":"Issues related to SAAS Plugins","color":"80e18f"},"JS Promises":{"name":"JS Promises","description":"Issues related to promises","color":"d7771f"},"OnPageLoad":{"name":"OnPageLoad","description":"OnPageLoad issues on functions and queries","color":"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":"30c76d"},"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":"5e0904"},"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":"b893f6"},"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"},"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":"cef66b"},"OAuth":{"name":"OAuth","description":"OAuth related bugs or features","color":"60885f"},"Table Widget V2":{"name":"Table Widget V2","description":"Issues related to Table Widget V2","color":"3a7192"},"IDE Navigation":{"name":"IDE Navigation","description":"Issues/feature requests related to IDE navigation, and context switching","color":"bc0cba"},"Query performance":{"name":"Query performance","description":"Issues that have to do with lack in performance of query execution","color":"cef66b"},"SAAS Manager App":{"name":"SAAS Manager App","description":"Issues with the SAAS manager app","color":"d427db"},"Twilio":{"name":"Twilio","description":"Issues related to Twilio integration","color":"23ba8d"},"Hubspot":{"name":"Hubspot","description":"Issues related to Hubspot integration","color":"60885f"},"Zendesk":{"name":"Zendesk","description":"Issues related to Zendesk integration","color":"60885f"},"Entity Refactor":{"name":"Entity Refactor","description":"Issues related to refactor logic","color":"cef66b"},"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":"bae511"},"Elastic Search":{"name":"Elastic Search","description":"Issues related to the elastic search datasource","color":"8078b0"},"Core Query Execution":{"color":"cef66b","name":"Core Query Execution","description":"Issues related to the execution of all queries"},"Query Management":{"name":"Query Management","description":"Issues related to the CRUD of actions or queries","color":"cef66b"},"Query Settings":{"name":"Query Settings","description":"Issues related to the settings of all queries","color":"cef66b"},"Code Editor":{"name":"Code Editor","description":"Issues related to the code editor","color":"4ca16e"},"Query Forms":{"color":"12b253","name":"Query Forms","description":"Isuses related to the query forms"},"JS Objects":{"color":"22962c","name":"JS Objects","description":"Issues related to JS Objects"},"JS Evaluation":{"color":"22962c","name":"JS Evaluation","description":"Issues related to JS evaluation on the platform"},"SmartSubstitution":{"name":"SmartSubstitution","description":"Issues related to Smart substitution of mustache bindings in queries","color":"bae511"},"Query Generation":{"name":"Query Generation","description":"Issues related to query generation","color":"cef66b"},"Suggested Widgets":{"name":"Suggested Widgets","description":"Issues related to suggesting widgets based on query response","color":"6ac063"},"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"},"Conversion Algorithm":{"name":"Conversion Algorithm","description":"All issue related to converting app from fixed to flex mode & vice versa","color":"d12d2e"},"Browser specific":{"name":"Browser specific","description":"All issue related to browser","color":"d12d2e"},"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":"196a6b"},"AST-backend":{"name":"AST-backend","description":"Backend issues related to AST parsing","color":"196a6b"},"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"},"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"},"Feature Flagging":{"name":"Feature Flagging","description":"Anything related feature flagging","color":"8d8a09"},"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"},"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":"bae511"},"Platformization":{"name":"Platformization","description":"Issues or tasks related to platformization of Appsmith codebase","color":"4e972b"},"Activation - datasources":{"name":"Activation - datasources","description":"issues related to activation projects","color":"7c7ace"},"Partial-import-export":{"name":"Partial-import-export","description":"Label for granular reusability.","color":"717732"},"AI":{"name":"AI","description":"All tasks related to AI","color":"75c4ce"},"Custom environments":{"name":"Custom environments","description":"Issues with creating or working with custom environments","color":"bae511"},"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"},"Schema":{"name":"Schema","description":"Issues related to database schema","color":"af939e"},"Fixed layout":{"name":"Fixed layout","description":"issues related to fixed layout","color":"b66681"},"Anvil layout":{"name":"Anvil layout","description":"issues related to the new layout system anvil","color":"5e0904"},"New Deployment Mode":{"name":"New Deployment Mode","description":"Support a new mode of deployment","color":"108033"},"Custom widgets":{"name":"Custom widgets","description":"For all issues related to the custom widget project","color":"c9db9c"},"IDE Pod":{"name":"IDE Pod","description":"https://app.zenhub.com/workspaces/new-developers-pod-60507ad1d4b98d00150a2858/board","color":"d3d248"},"TM_BU":{"name":"TM_BU","description":"The issues on Team Manager which needs to be taken up by Billing & Usage","color":"198cdf"},"Homepage Experience V2":{"name":"Homepage Experience V2","description":"Label for reporting new tasks and bug fixes related to revamped homepage experience","color":"c55d54"},"Appsmith Labs":{"name":"Appsmith Labs","description":"All things related to AI and other new initiatives ","color":"712d51"},"Customer Success":{"name":"Customer Success","description":"Issues that the success team cares about","color":"6ccabd"},"Invite flow":{"name":"Invite flow","description":"Invite users flow and any associated actions","color":"881b35"},"Invite users":{"name":"Invite users","description":"Invite users flow and any associated actions","color":"23e6d6"},"Workflows Pod":{"name":"Workflows Pod","description":"For all issues related to the Workflows feature","color":"a86802"},"DailyPromotionBlocker":{"name":"DailyPromotionBlocker","description":"DailyPromotion Blocker","color":"9b2280"},"JS Binding":{"name":"JS Binding","description":"All issues related to the JS Binding experience","color":"422fed"},"Knowledge Retrieval":{"name":"Knowledge Retrieval","description":"All issues related to knowledge retrieval on Appsmith AI","color":"a36890"},"REST API":{"name":"REST API","description":"REST API plugin related issues","color":"e3ede5"},"1-click upgrade":{"name":"1-click upgrade","description":"For all issues/tasks related to 1-click upgrade & downgrade project","color":"51b5ff"},"Activation - learnability":{"name":"Activation - learnability","description":"Activation - learnability","color":"96fc76"},"Critical":{"color":"a1e3db","name":"Critical","description":"This issue breaks existing apps. Drop everything else to resolve"},"Module creator":{"name":"Module creator","description":"Issues related to the module creator side","color":"bb2c05"},"Module consumer":{"name":"Module consumer","description":"Issues related to the module consumer side","color":"83d3c5"},"Package":{"name":"Package","description":"Issues related to packages","color":"2ad485"},"Package versioning":{"name":"Package versioning","description":"ISsues related to how we manage versions for packages","color":"4c5218"},"Convert to module":{"name":"Convert to module","description":"Issues related to the module creation flow using conversion","color":"4c5218"},"Query module":{"name":"Query module","description":"Issues affecting query modules or its instances","color":"b11a7e"},"JS module":{"name":"JS module","description":"Issues affecting JS modules or its instances","color":"bf76f6"},"Templates Pod":{"name":"Templates Pod","description":"Issues related to Templates","color":"e7b3b9"},"Secret Management":{"name":"Secret Management","description":"Issues related to secret management","color":"cce8e7"},"REST API plugin":{"name":"REST API plugin","description":"REST API plugin related issues","color":"b5948a"},"UI module":{"name":"UI module","description":"Issues affecting UI modules or its instances","color":"d2acee"},"Preview mode":{"name":"Preview mode","description":"Issues related to app previews","color":"3fb8f2"},"Git Auto-commit":{"name":"Git Auto-commit","description":"Issues related to autocommit","color":"717732"},"QA Pod":{"name":"QA Pod","description":"Issues under the QA Pod","color":"717732"},"Automation Test":{"name":"Automation Test","description":"","color":""},"Automation failures":{"name":"Automation failures","description":"","color":""},"Needs automation":{"name":"Needs automation","description":"Issues that needs automated tests","color":""},"Prepared statements":{"name":"Prepared statements","description":"Issues related to prepared statement flow","color":""},"Switch Group Widget":{"name":"Switch Group Widget","description":"Issues related to Switch group Widget","color":""},"Supervisor":{"name":"Supervisor","description":"Issues related to supervisor","color":"2c5813"},"Deployment Certificates":{"name":"Deployment Certificates","description":"Issues related to lets encrypt","color":"e148aa"},"Mock Data":{"name":"Mock Data","description":"Issues related to mock databases","color":"ebf251"},"AWS ECS":{"name":"AWS ECS","description":"Issues related to ECS Fargate","color":"e506ff"},"Publish App":{"name":"Publish App","description":"Issues related to app deployment","color":""},"IDE Infra":{"name":"IDE Infra","description":"Issues related to the IDE infrastructure like saving changes","color":"4c1858"},"User Profile":{"name":"User Profile","description":"Issues related to a user profile","color":"a60d34"},"Admin Settings":{"color":"32a316","name":"Admin Settings","description":"Issues related to admin settings"},"Workspace settings":{"name":"Workspace settings","description":"Issues related to workspace settings","color":"47d1ad"},"Page Management":{"color":"e17a68","name":"Page Management","description":"Issues related to configuring pages"},"Ingress":{"name":"Ingress","description":"Ingress Controller","color":"a86802"},"Nginx":{"name":"Nginx","description":"Issues related to Nginx","color":"e54195"},"Workflows":{"name":"Workflows","description":"","color":"1b89db"},"Building blocks":{"name":"Building blocks","description":"Building blocks on cavas, on templates listing or drag and drop of building blocks.","color":"8e3c7a"},"Table Inline Edit":{"name":"Table Inline Edit","description":"Issues related to inline editing","color":"60895a"},"User Session ":{"name":"User Session ","description":"For all issues/tasks related to user sessions","color":"65a3f5"},"Packages pod":{"name":"Packages pod","description":"issues that belong to the packages pod","color":"423772"},"WDS - all widgets":{"name":"WDS - all widgets","description":"all widget present in WDS","color":"2670ae"},"WDS - input widget":{"name":"WDS - input widget","description":"Issues related to input widget on WDS","color":"2670ae"},"WDS - paragraph widget":{"name":"WDS - paragraph widget","description":"issues related to paragraph widget on WDS","color":"2670ae"},"WDS - statbox widget":{"name":"WDS - statbox widget","description":"issues related to statbox widget on WDS","color":"2670ae"},"WDS - modal widget":{"name":"WDS - modal widget","description":"Issues related to modal widget on WDS","color":"2670ae"},"WDS - icon widget":{"name":"WDS - icon widget","description":"Issues related to icon widget on WDS","color":"2670ae"},"WDS - checkbox widget":{"name":"WDS - checkbox widget","description":"Issues related to checkbox widget on WDS","color":"2670ae"},"WDS - table widget":{"name":"WDS - table widget","description":"Issues related to table widget on WDS","color":"2670ae"},"WDS - keyValue widget":{"name":"WDS - keyValue widget","description":"Issues related to key-value widget on WDS","color":"2670ae"},"WDS - switch group widget":{"name":"WDS - switch group widget","description":"Issues related to switch group widget on WDS","color":"2670ae"},"WDS - theming":{"name":"WDS - theming","description":"Issues related to theming on the Anvil instance","color":"2670ae"},"Anvil POD":{"name":"Anvil POD","description":"Issue related to Anvil project","color":"5e0904"},"Anvil - theming":{"name":"Anvil - theming","description":"Issues related to theming on the Anvil instance","color":"c28de5"},"Anvil - vertical alignment":{"name":"Anvil - vertical alignment","description":"Issues related to vertical alignment on the Anvil layout","color":"c28de5"},"Anvil - layout component":{"name":"Anvil - layout component","description":"Issues related to layout component on the Anvil layout","color":"c28de5"},"Anvil - drag & drop":{"name":"Anvil - drag & drop","description":"Issues related to drag & drop experience on Anvil","color":"c28de5"},"Anvil - zones & sections":{"name":"Anvil - zones & sections","description":"Issues related to zones and sections on the Anvil layout","color":"c28de5"},"Anvil - copy paste experience":{"name":"Anvil - copy paste experience","description":"Issues related to copy paste experience on the Anvil layout","color":"c28de5"},"WDS  - phone widget":{"name":"WDS  - phone widget","description":"Issues related to phone widget on WDS","color":"c28de5"},"WDS - responsive widget":{"name":"WDS - responsive widget","description":"All issues related to widget responsiveness","color":"11ee05"},"Anvil - responsive viewport":{"color":"11ee05","name":"Anvil - responsive viewport","description":"Issues seen on different viewports like mobile"},"WDS  - widget styling":{"color":"11ee05","name":"WDS  - widget styling","description":"all about widget styling"},"Anvil - spacing":{"name":"Anvil - spacing","description":"Related to spacing between widgets in auto layout","color":"11ee05"},"Anvil - responsive canvas":{"name":"Anvil - responsive canvas","description":"All issues related to canvas responsiveness","color":"11ee05"},"WDS - inline button widget":{"name":"WDS - inline button widget","description":"Issues related to inline button widget on WDS","color":"7cef83"},"Activation Pod":{"name":"Activation Pod","description":"for Activation group","color":"d67d00"},"Activation":{"name":"Activation","description":"for Activation group","color":"d67d00"},"Tests":{"name":"Tests","description":"Test issues","color":"4fc7b6"},"Ballpark: XXS":{"name":"Ballpark: XXS","description":"~1xDev in 1/2xSprint","color":""},"Ballpark: XS":{"name":"Ballpark: XS","description":"~1xDev in 1xSprint","color":"53bf71"},"Ballpark: S":{"name":"Ballpark: S","description":"~2xDev in 1xSprint","color":"6e9e65"},"Ballpark: M":{"name":"Ballpark: M","description":"~1xPOD in 1xSprint","color":"2229e6"},"Ballpark: L":{"name":"Ballpark: L","description":"~1xPOD in 3xSprint or 2xPODs in 1xSprint","color":"49962f"},"Ballpark: XL":{"name":"Ballpark: XL","description":"~1xPOD in 1xQuarter or 2xPODs in 2xSprint","color":"b524c9"},"Ballpark: XXL":{"name":"Ballpark: XXL","description":"~2xPODs in 1xQuarter","color":"22092c"},"Auto-commit":{"name":"Auto-commit","description":"Issues related to auto-generated commits showing up on git ","color":"e25b89"},"Continuous Deployment":{"name":"Continuous Deployment","description":"Issues related to CD pipeline on git","color":"aea47c"},"Branch protection":{"name":"Branch protection","description":"Issues related to using a protected branch on git","color":"ab511a"},"Default branch":{"name":"Default branch","description":"Issues related to using a default branch on git","color":"195737"},"Git status":{"name":"Git status","description":"Issues related to information shown on git status modal or number of changes appearing in a branch","color":"c851b8"},"Git performance":{"name":"Git performance","description":"Issues related to perceived performance on any git operation","color":"189af6"},"Anvil team":{"name":"Anvil team","description":"issues related to the new layout system anvil","color":"798200"},"SDLC":{"name":"SDLC","description":"Issues related to software development lifecycle experiences","color":"bae511"},"Reconnect DS modal":{"name":"Reconnect DS modal","description":"Issues related to reconnect datasource modal post app import","color":"2e398b"}},"success":true}
\ No newline at end of file
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index a6641819b5..7d48f8aa81 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,9 +1,10 @@
 ## Description
 > [!TIP]  
-> _Add a TL;DR when the description is longer than 500 words or extremely technical (helps the content team)._
+> _Add a TL;DR when the description is longer than 500 words or extremely technical (helps the content, marketing, and DevRel team)._
 >
 > _Please also include relevant motivation and context. List any dependencies that are required for this change. Add links to Notion, Figma or any other documents that might be relevant to the PR._
 
+
 Fixes #`Issue Number`  
 _or_  
 Fixes `Issue URL`
@@ -19,4 +20,10 @@ Fixes `Issue URL`
 > [!CAUTION]  
 > If you modify the content in this section, you are likely to disrupt the CI result for your PR.
 
-<!-- end of auto-generated comment: Cypress test results  -->
\ No newline at end of file
+<!-- end of auto-generated comment: Cypress test results  -->
+
+
+## Communication
+Should the DevRel and Marketing teams inform users about this change?
+- [ ] Yes
+- [ ] No
diff --git a/.github/workflows/build-chromatic.yml b/.github/workflows/build-chromatic.yml
index fe2e273c2b..435453f192 100644
--- a/.github/workflows/build-chromatic.yml
+++ b/.github/workflows/build-chromatic.yml
@@ -50,4 +50,4 @@ jobs:
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
           workingDir: ./app/client/packages/storybook
           exitOnceUploaded: true
-          buildScriptName: "build"
+          buildScriptName: "build-storybook"
diff --git a/.github/workflows/build-storybook.yml b/.github/workflows/build-storybook.yml
index ff4f45983a..3a985c0f78 100644
--- a/.github/workflows/build-storybook.yml
+++ b/.github/workflows/build-storybook.yml
@@ -48,4 +48,4 @@ jobs:
           projectToken: ${{ secrets.STORYBOOK_PROJECT_TOKEN }}
           workingDir: ./app/client/packages/storybook
           exitOnceUploaded: true
-          buildScriptName: "build"
+          buildScriptName: "build-storybook"
diff --git a/.github/workflows/ci-debugging.yml b/.github/workflows/ci-debugging.yml
index 72f33351fc..4fcbc6dbff 100644
--- a/.github/workflows/ci-debugging.yml
+++ b/.github/workflows/ci-debugging.yml
@@ -71,7 +71,7 @@ jobs:
           mkdir -p ~/git-server/keys
           mkdir -p ~/git-server/repos
           docker run --name test-event-driver -d -p 22:22 -p 5001:5001 -p 3306:3306 \
-          -p 5432:5432 -p 28017:27017 -p 25:25 -p 5000:5000 -p 3001:3000 --privileged --pid=host --ipc=host --volume /:/host -v ~/git-server/keys:/git-server/keys \
+          -p 5432:5432 -p 28017:27017 -p 25:25 -p 4200:4200 -p 5000:5000 -p 3001:3000 --privileged --pid=host --ipc=host --volume /:/host -v ~/git-server/keys:/git-server/keys \
           -v ~/git-server/repos:/git-server/repos  appsmith/test-event-driver:latest
           cd cicontainerlocal
           docker run -d --name appsmith -p 80:80 \
diff --git a/.github/workflows/ci-test-custom-script.yml b/.github/workflows/ci-test-custom-script.yml
index 241ac49428..12f78abe4b 100644
--- a/.github/workflows/ci-test-custom-script.yml
+++ b/.github/workflows/ci-test-custom-script.yml
@@ -147,7 +147,7 @@ jobs:
           mkdir -p ~/git-server/repos
           ted_tag="${{inputs.ted_tag}}"
           docker run --name test-event-driver -d -p 22:22 -p 5001:5001 -p 3306:3306 \
-          -p 5432:5432 -p 28017:27017 -p 25:25 -p 5000:5000 -p 3001:3000 -p 6001:6001 -p 8001:8000 --privileged --pid=host --ipc=host --volume /:/host -v ~/git-server/keys:/git-server/keys \
+          -p 5432:5432 -p 28017:27017 -p 25:25 -p 4200:4200 -p 5000:5000 -p 3001:3000 -p 6001:6001 -p 8001:8000 --privileged --pid=host --ipc=host --volume /:/host -v ~/git-server/keys:/git-server/keys \
           -v ~/git-server/repos:/git-server/repos "appsmith/test-event-driver:${ted_tag:-latest}"
           docker run --name cloud-services -d -p 8000:80 -p 8090:8090 \
             --privileged --pid=host --ipc=host --add-host=host.docker.internal:host-gateway\
diff --git a/.github/workflows/ci-test-limited.yml b/.github/workflows/ci-test-limited.yml
index 702b6f8018..cbd0c4a35b 100644
--- a/.github/workflows/ci-test-limited.yml
+++ b/.github/workflows/ci-test-limited.yml
@@ -167,7 +167,7 @@ jobs:
           mkdir -p ~/git-server/keys
           mkdir -p ~/git-server/repos
           docker run --name test-event-driver -d -p 22:22 -p 5001:5001 -p 3306:3306 \
-          -p 5432:5432 -p 28017:27017 -p 25:25 -p 5000:5000 -p 3001:3000 -p 6001:6001 -p 8001:8000 --privileged --pid=host --ipc=host --volume /:/host -v ~/git-server/keys:/git-server/keys \
+          -p 5432:5432 -p 28017:27017 -p 25:25 -p 4200:4200 -p 5000:5000 -p 3001:3000 -p 6001:6001 -p 8001:8000 --privileged --pid=host --ipc=host --volume /:/host -v ~/git-server/keys:/git-server/keys \
           -v ~/git-server/repos:/git-server/repos  appsmith/test-event-driver:latest
           docker run --name cloud-services -d -p 8000:80 -p 8090:8090 \
             --privileged --pid=host --ipc=host --add-host=host.docker.internal:host-gateway\
diff --git a/.github/workflows/pr-automation.yml b/.github/workflows/pr-automation.yml
index 66dc91fade..f9f6d2736b 100644
--- a/.github/workflows/pr-automation.yml
+++ b/.github/workflows/pr-automation.yml
@@ -22,8 +22,9 @@ jobs:
 
       # Checkout the code in the current branch in case the workflow is called because of a branch push event
       - name: Checkout the head commit of the branch
-        if: inputs.pr == 0
         uses: actions/checkout@v4
+        with:
+            repository: appsmithorg/appsmith
 
       # Checks for ok-to-test label presence in PR
       - name: Check label
diff --git a/CODEOWNERS b/CODEOWNERS
index 14dc7b1266..b16137f43d 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -30,9 +30,9 @@ app/client/src/widgets/anvil/* @appsmithorg/anvil-team
 # App viewers pod
 app/client/src/widgets/* @appsmithorg/app-viewers
 app/client/src/components/propertyControls/* @appsmithorg/app-viewers
-app/client/src/sagas/OneClickBindingSaga.ts @sbalaji1192
-app/client/src/WidgetQueryGenerators/* @sbalaji1192
-app/client/src/components/editorComponents/WidgetQueryGeneratorForm/* @sbalaji1192
+app/client/src/sagas/OneClickBindingSaga.ts @appsmithorg/app-viewers
+app/client/src/WidgetQueryGenerators/* @appsmithorg/app-viewers
+app/client/src/components/editorComponents/WidgetQueryGeneratorForm/* @appsmithorg/app-viewers
 app/client/src/pages/AppViewer/* @appsmithorg/app-viewers
 
 # New Developers Pod
@@ -101,19 +101,16 @@ app/client/src/widgets/MetaHOC.tsx @appsmithorg/ui-builders
 app/client/src/widgets/withWidgetProps.tsx @appsmithorg/ui-builders
 
 # Git Pod
-app/server/appsmith-git/* @AnaghHegde
-app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImpl.java @AnaghHegde
-app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCE.java @AnaghHegde
-app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java @AnaghHegde
-app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCE.java @AnaghHegde
-app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitCloudServicesUtils.java @AnaghHegde
-app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitDeployKeyGenerator.java @AnaghHegde
-app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitFileUtils.java @AnaghHegde
-app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/GitUtils.java @AnaghHegde
-app/client/src/pages/Editor/gitSync/* @brayn003
+app/server/appsmith-git/ @appsmithorg/git-be-reviewers
+app/server/**/git/** @appsmithorg/git-be-reviewers
+app/server/**/import/** @appsmithorg/git-be-reviewers
+app/server/**/export/** @appsmithorg/git-be-reviewers
+app/server/**/*Git*.java @appsmithorg/git-be-reviewers
+app/server/**/*Import*.java @appsmithorg/git-be-reviewers
+app/server/**/*Export*.java @appsmithorg/git-be-reviewers
 
-# DSL Package
-app/client/packages/dsl/* @brayn003
+app/client/src/pages/Editor/gitSync/ @appsmithorg/git-fe-reviewers
+app/client/packages/dsl/ @appsmithorg/git-fe-reviewers
 
 # Data Platform
 
@@ -149,41 +146,12 @@ app/client/src/transformers/RestAPIDatasourceFormTransformer.ts @ayushpahwa
 
 
 # Followed Globstar paths in combination with wildcard paths. Reference https://docs.gitlab.com/ee/user/project/codeowners/reference.html#globstar-paths
-# Data Platform server - Interfaces
-app/server/appsmith-interfaces/src/main/java/com/appsmith/external/**/Action* @nidhi-nair @sondermanish
-app/server/appsmith-interfaces/src/main/java/com/appsmith/external/**/Datasource* @nidhi-nair @sondermanish
-app/server/appsmith-interfaces/src/main/java/com/appsmith/external/**/OAuth2* @nidhi-nair @sondermanish
-
-# Data Platform server - Controllers
-app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/**/Action* @nidhi-nair @sondermanish
-app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/**/Datasource* @nidhi-nair @sondermanish
-
-# Data Platform server - Domains
-app/server/appsmith-server/src/main/java/com/appsmith/server/domains/**/Action* @nidhi-nair @sondermanish
-app/server/appsmith-server/src/main/java/com/appsmith/server/domains/**/Datasource* @nidhi-nair @sondermanish
-
-# Data Platform server - DTOs
-app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/**/Action* @nidhi-nair @sondermanish
-app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/**/Datasource* @nidhi-nair @sondermanish
-
-# Data Platform server - Repositories
-app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/**/*Action* @nidhi-nair @sondermanish
-app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/**/*Datasource* @nidhi-nair @sondermanish
-
-# Data Platform server - Services
-app/server/appsmith-server/src/main/java/com/appsmith/server/services/**/*Action* @nidhi-nair @sondermanish
-app/server/appsmith-server/src/main/java/com/appsmith/server/services/**/*Datasource* @nidhi-nair @sondermanish
-app/server/appsmith-server/src/main/java/com/appsmith/server/services/**/*Authentication* @nidhi-nair @sondermanish
-
-# Data Platform server - Solutions
-app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/**/*Action* @nidhi-nair @sondermanish
-app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/**/*Datasource* @nidhi-nair @sondermanish
-app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/**/*Authentication* @nidhi-nair @sondermanish
-app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/**/*Environment* @nidhi-nair @sondermanish
-
-# Data Platform server - Misc
-app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/**/Datasource* @nidhi-nair @sondermanish
-app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError* @nidhi-nair @sondermanish
+# Data Platform Pod
+app/server/**/*Action* @nidhi-nair @sondermanish
+app/server/**/*Datasource* @nidhi-nair @sondermanish
+app/server/**/*OAuth2* @nidhi-nair @sondermanish
+app/server/**/*Authentication* @nidhi-nair @sondermanish
+app/server/**/*Environment* @nidhi-nair @sondermanish
 
 # Team Managers pod
 app/client/src/pages/Settings/**/* @ankitakinger
diff --git a/app/client/.gitignore b/app/client/.gitignore
index 1082b216bf..e31d37a575 100755
--- a/app/client/.gitignore
+++ b/app/client/.gitignore
@@ -46,14 +46,12 @@ results/
 /docker/nginx.conf
 /docker/nginx-root.conf
 
-storybook-static/*
-build-storybook.log
-
 .eslintcache
 .vscode
 TODO
 
 /nginx
+/caddy
 
 /public/static/wds/
 
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/TableWidgets_NavigateTo_Validation_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/TableWidgets_NavigateTo_Validation_spec.js
index 98cabcac6c..38b9f4cf98 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Binding/TableWidgets_NavigateTo_Validation_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/TableWidgets_NavigateTo_Validation_spec.js
@@ -1,7 +1,7 @@
 import EditorNavigation, {
   EntityType,
-  PageLeftPane,
 } from "../../../../support/Pages/EditorNavigation";
+import PageList from "../../../../support/Pages/PageList";
 
 const widgetsPage = require("../../../../locators/Widgets.json");
 const commonlocators = require("../../../../locators/commonlocators.json");
@@ -32,7 +32,7 @@ describe(
     it("1. Create MyPage and valdiate if its successfully created", function () {
       cy.Createpage(pageid);
       agHelper.AddDsl("displayWidgetDsl");
-      PageLeftPane.assertPresence(pageid);
+      PageList.assertPresence(pageid);
       //Table Widget Functionality with multiple page
       EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget, {}, [
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Moment_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Moment_Spec.ts
index 8909bc098c..9cb9c89457 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Moment_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Moment_Spec.ts
@@ -2,6 +2,7 @@ import {
   agHelper,
   appSettings,
   dataSources,
+  debuggerHelper,
   deployMode,
   entityExplorer,
   entityItems,
@@ -118,7 +119,15 @@ describe(
     after(
       "Verify Deletion of the datasource after all created queries are deleted",
       () => {
-        deployMode.NavigateBacktoEditor("ran successfully"); //runAstros triggered on PageLaoad of Edit page!
+        deployMode.NavigateBacktoEditor();
+
+        //verify runAstros triggered on PageLaoad of Edit page!
+        debuggerHelper.ClickDebuggerIcon();
+        debuggerHelper.ClickLogsTab();
+        debuggerHelper.DebuggerLogsFilter("JSObject1.runAstros");
+        debuggerHelper.DoesConsoleLogExist("JS Function executed successfully");
+        debuggerHelper.CloseBottomBar();
+
         PageLeftPane.switchSegment(PagePaneSegment.JS);
         entityExplorer.ActionContextMenuByEntityName({
           entityNameinLeftSidebar: "JSObject1",
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Debugger/Widget_property_navigation_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Debugger/Widget_property_navigation_spec.ts
index 24ecf19fc1..1f9699579c 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Debugger/Widget_property_navigation_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Debugger/Widget_property_navigation_spec.ts
@@ -50,7 +50,7 @@ describe(
       _.propPane.NavigateBackToPropertyPane();
       _.debuggerHelper.ClickDebuggerIcon();
       _.debuggerHelper.ClicklogEntityLink();
-      _.agHelper.GetNAssertContains(_.propPane._paneTitle, "Menu Item 1");
+      _.agHelper.GetNAssertContains(_.propPane._paneTitle, "Menu Item");
       _.propPane.AssertIfPropertyIsVisible("icon");
       _.debuggerHelper.CloseBottomBar();
       EditorNavigation.SelectEntityByName("ButtonGroup1", EntityType.Widget);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Hide_Page_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Hide_Page_spec.js
index 1b44f3d403..90f5ba7b7a 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Hide_Page_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Hide_Page_spec.js
@@ -5,6 +5,7 @@ import EditorNavigation, {
 
 import * as _ from "../../../../support/Objects/ObjectsCore";
 import PageList from "../../../../support/Pages/PageList";
+import { EntityItems } from "../../../../support/Pages/AssertHelper";
 
 describe(
   "Hide / Show page test functionality",
@@ -17,6 +18,7 @@ describe(
       _.entityExplorer.ActionContextMenuByEntityName({
         entityNameinLeftSidebar: "Page2",
         action: "Hide",
+        entityType: EntityItems.Page,
       });
       PageLeftPane.switchToAddNew();
       cy.ClearSearch();
@@ -27,6 +29,7 @@ describe(
       _.entityExplorer.ActionContextMenuByEntityName({
         entityNameinLeftSidebar: "Page2",
         action: "Show",
+        entityType: EntityItems.Page,
       });
       cy.ClearSearch();
       _.deployMode.DeployApp();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/JSEditorContextMenu_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/JSEditorContextMenu_Spec.ts
index 12d6629004..c6f892cde2 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/JSEditorContextMenu_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/JSEditorContextMenu_Spec.ts
@@ -9,6 +9,7 @@ import EditorNavigation, {
   PagePaneSegment,
 } from "../../../../support/Pages/EditorNavigation";
 import PageList from "../../../../support/Pages/PageList";
+import { EntityItems } from "../../../../support/Pages/AssertHelper";
 
 describe(
   "Validate basic operations on Entity explorer JSEditor structure",
@@ -49,13 +50,14 @@ describe(
     it("2. Validate Move JSObject", function () {
       const newPageId = "Page2";
       PageList.AddNewPage();
-      PageLeftPane.assertPresence(newPageId);
+      PageList.assertPresence(newPageId);
       EditorNavigation.SelectEntityByName(pageId, EntityType.Page);
       entityExplorer.ActionContextMenuByEntityName({
         entityNameinLeftSidebar: "RenamedJSObjectCopy",
         action: "Move to page",
         subAction: newPageId,
         toastToValidate: "moved to page",
+        entityType: EntityItems.Page,
       });
       EditorNavigation.SelectEntityByName(newPageId, EntityType.Page);
       PageLeftPane.switchSegment(PagePaneSegment.JS);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Page_Load_Spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Page_Load_Spec.js
index 20a2a94ac4..beb2d80dda 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Page_Load_Spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Page_Load_Spec.js
@@ -9,6 +9,7 @@ import {
   entityExplorer,
 } from "../../../../support/Objects/ObjectsCore";
 import PageList from "../../../../support/Pages/PageList";
+import { EntityItems } from "../../../../support/Pages/AssertHelper";
 
 describe("Page Load tests", { tags: ["@tag.IDE"] }, () => {
   afterEach(() => {
@@ -86,6 +87,7 @@ describe("Page Load tests", { tags: ["@tag.IDE"] }, () => {
     entityExplorer.ActionContextMenuByEntityName({
       entityNameinLeftSidebar: "Page1",
       action: "Hide",
+      entityType: EntityItems.Page,
     });
     deployMode.DeployApp();
     // Assert active page DSL
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitDiscardChange/DiscardChanges_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitDiscardChange/DiscardChanges_spec.js
index bbeeb4f187..df7a398ff8 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitDiscardChange/DiscardChanges_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitDiscardChange/DiscardChanges_spec.js
@@ -97,11 +97,10 @@ describe("Git discard changes:", { tags: ["@tag.Git"] }, function () {
   it("4. Delete page2 and trigger discard flow, page2 should be available again", () => {
     PageList.DeletePage(page2);
     // verify page is deleted
-    //entityExplorer.ExpandCollapseEntity("Pages");
-    PageLeftPane.assertAbsence(page2);
+    PageList.assertAbsence(page2);
     gitSync.DiscardChanges();
     // verify page2 is recovered back
-    PageLeftPane.assertPresence(page2);
+    PageList.assertPresence(page2);
     EditorNavigation.SelectEntityByName(page2, EntityType.Page);
     cy.wait("@getPage");
     // verify data binding on page2
@@ -161,14 +160,13 @@ describe("Git discard changes:", { tags: ["@tag.Git"] }, function () {
     // discard changes
     gitSync.DiscardChanges();
     // verify page3 is removed
-    PageList.ShowList();
-    PageLeftPane.assertAbsence(page3);
+    PageList.assertAbsence(page3);
   });
 
   it(`8. Add new page i.e page3, discard changes should not throw error: "resource not found"`, () => {
     cy.Createpage(page3);
     gitSync.DiscardChanges();
-    PageLeftPane.assertAbsence(page3);
+    PageList.assertAbsence(page3);
   });
 
   it("9. On discard failure an error message should be show and user should be able to discard again", () => {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitBugs_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitBugs_spec.js
index 637c496acc..fe1d2dde83 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitBugs_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitBugs_spec.js
@@ -16,6 +16,7 @@ import EditorNavigation, {
   PagePaneSegment,
 } from "../../../../../support/Pages/EditorNavigation";
 import PageList from "../../../../../support/Pages/PageList";
+import { EntityItems } from "../../../../../support/Pages/AssertHelper";
 
 const pagename = "ChildPage";
 const tempBranch = "feat/tempBranch";
@@ -98,6 +99,7 @@ describe("Git sync Bug #10773", { tags: ["@tag.Git"] }, function () {
         entityExplorer.ActionContextMenuByEntityName({
           entityNameinLeftSidebar: "Page1",
           action: "Clone",
+          entityType: EntityItems.Page,
         });
         cy.wait("@clonePage").should(
           "have.nested.property",
@@ -151,6 +153,7 @@ describe("Git sync Bug #10773", { tags: ["@tag.Git"] }, function () {
     entityExplorer.ActionContextMenuByEntityName({
       entityNameinLeftSidebar: "Page1",
       action: "Clone",
+      entityType: EntityItems.Page,
     });
     cy.wait("@clonePage").should(
       "have.nested.property",
@@ -180,6 +183,7 @@ describe("Git sync Bug #10773", { tags: ["@tag.Git"] }, function () {
     entityExplorer.ActionContextMenuByEntityName({
       entityNameinLeftSidebar: "Page1",
       action: "Clone",
+      entityType: EntityItems.Page,
     });
     cy.wait("@clonePage").should(
       "have.nested.property",
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js
index 010b97e0ed..357ee4e477 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js
@@ -27,6 +27,7 @@ import {
   assertHelper,
 } from "../../../../../support/Objects/ObjectsCore";
 import PageList from "../../../../../support/Pages/PageList";
+import { EntityItems } from "../../../../../support/Pages/AssertHelper";
 
 const newPage = "ApiCalls_1";
 const pageName = "crudpage_1";
@@ -102,7 +103,12 @@ describe("Git sync apps", { tags: ["@tag.Git"] }, function () {
       expect(cellData).to.be.equal("New Config");
     });
     // rename page to crud_page
-    entityExplorer.RenameEntityFromExplorer("Page1", pageName);
+    entityExplorer.RenameEntityFromExplorer(
+      "Page1",
+      pageName,
+      false,
+      EntityItems.Page,
+    );
     EditorNavigation.SelectEntityByName(pageName, EntityType.Page);
     // create a clone of page
     cy.get(`.t--entity-item:contains(${pageName})`).within(() => {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/SwitchBranches_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/SwitchBranches_spec.js
index ef1ca01853..88bba0d08a 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/SwitchBranches_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/SwitchBranches_spec.js
@@ -16,6 +16,7 @@ import EditorNavigation, {
   PagePaneSegment,
 } from "../../../../../support/Pages/EditorNavigation";
 import PageList from "../../../../../support/Pages/PageList";
+import { EntityItems } from "../../../../../support/Pages/AssertHelper";
 
 let parentBranchKey = "ParentBranch",
   childBranchKey = "ChildBranch",
@@ -67,7 +68,12 @@ describe("Git sync:", { tags: ["@tag.Git"] }, function () {
     });
 
     PageList.AddNewPage();
-    entityExplorer.RenameEntityFromExplorer("Page2", "ParentPage1", true);
+    entityExplorer.RenameEntityFromExplorer(
+      "Page2",
+      "ParentPage1",
+      false,
+      EntityItems.Page,
+    );
     dataSources.NavigateToDSCreateNew();
     apiPage.CreateApi("ParentApi1");
     jsEditor.CreateJSObject();
@@ -80,7 +86,12 @@ describe("Git sync:", { tags: ["@tag.Git"] }, function () {
       childBranchKey = branName;
     });
     PageList.AddNewPage();
-    entityExplorer.RenameEntityFromExplorer("Page2", "ChildPage1", true);
+    entityExplorer.RenameEntityFromExplorer(
+      "Page2",
+      "ChildPage1",
+      false,
+      EntityItems.Page,
+    );
     dataSources.NavigateToDSCreateNew();
     apiPage.CreateApi("ChildApi1");
     jsEditor.CreateJSObject();
@@ -92,14 +103,10 @@ describe("Git sync:", { tags: ["@tag.Git"] }, function () {
     // A switch here should not show a 404 page
     cy.switchGitBranch(parentBranchKey);
     // When entity not found, takes them to the home page
-    cy.get(`.t--entity.page`)
-      .contains("Page1")
-      .closest(".t--entity")
-      .should("be.visible")
-      .should("have.class", "activePage");
+    PageList.VerifyIsCurrentPage("Page1");
 
     EditorNavigation.SelectEntityByName("ParentPage1", EntityType.Page);
-    PageLeftPane.assertAbsence("ChildPage1");
+    PageList.assertAbsence("ChildPage1");
     PageLeftPane.switchSegment(PagePaneSegment.Queries);
     PageLeftPane.assertAbsence("ChildApi1");
     PageLeftPane.switchSegment(PagePaneSegment.JS);
@@ -113,7 +120,8 @@ describe("Git sync:", { tags: ["@tag.Git"] }, function () {
     entityExplorer.RenameEntityFromExplorer(
       "ParentPage1",
       "ParentPageRenamed",
-      true,
+      false,
+      EntityItems.Page,
     );
     agHelper.RemoveUIElement("Tooltip", "Add a new query/JS Object");
     PageLeftPane.switchSegment(PagePaneSegment.Queries);
@@ -121,8 +129,7 @@ describe("Git sync:", { tags: ["@tag.Git"] }, function () {
 
     cy.switchGitBranch(parentBranchKey);
 
-    PageList.ShowList();
-    PageLeftPane.assertAbsence("ParentPageRenamed");
+    PageList.assertAbsence("ParentPageRenamed");
     PageLeftPane.switchSegment(PagePaneSegment.Queries);
     PageLeftPane.assertAbsence("ParentApiRenamed");
   });
@@ -219,11 +226,7 @@ describe("Git sync:", { tags: ["@tag.Git"] }, function () {
       cy.get(gitSyncLocators.branchListItem).contains("master").click();
       cy.wait(4000);
       PageLeftPane.switchSegment(PagePaneSegment.UI);
-      cy.get(`.t--entity.page`)
-        .contains("Page1")
-        .closest(".t--entity")
-        .should("be.visible")
-        .should("have.class", "activePage");
+      PageList.VerifyIsCurrentPage("Page1");
       cy.get(".t--canvas-artboard").should("be.visible");
     });
     agHelper.RefreshPage();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitWithAutoLayout/conversion_of_git_connected_apps_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitWithAutoLayout/conversion_of_git_connected_apps_spec.js
index 1b326c991c..fc25d66839 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitWithAutoLayout/conversion_of_git_connected_apps_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitWithAutoLayout/conversion_of_git_connected_apps_spec.js
@@ -10,6 +10,7 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../../support/Pages/EditorNavigation";
 import PageList from "../../../../../support/Pages/PageList";
+import { EntityItems } from "../../../../../support/Pages/AssertHelper";
 
 let parentBranchKey = "ParentBranch",
   childBranchKey = "ChildBranch";
@@ -58,6 +59,7 @@ describe("Git sync:", { tags: ["@tag.Git"] }, function () {
 
     entityExplorer.ActionContextMenuByEntityName({
       entityNameinLeftSidebar: "Page2",
+      entityType: EntityItems.Page,
     });
   });
 
diff --git a/app/client/cypress/e2e/Regression/ClientSide/IDE/Editor_Segment_Context_Switching_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/IDE/Editor_Segment_Context_Switching_spec.ts
index 44feb6e5af..034de8cfc7 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/IDE/Editor_Segment_Context_Switching_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/IDE/Editor_Segment_Context_Switching_spec.ts
@@ -33,11 +33,11 @@ describe("Editor Segment Context Switch", { tags: ["@tag.IDE"] }, function () {
   it("will select an item when switched to it", () => {
     // Check JS item is selected
     PageLeftPane.switchSegment(PagePaneSegment.JS);
-    PageLeftPane.selectedItem().should("be.visible");
+    PageLeftPane.selectedItem("not.exist");
 
     // Check Query item is selected
     PageLeftPane.switchSegment(PagePaneSegment.Queries);
-    PageLeftPane.selectedItem().should("be.visible");
+    PageLeftPane.selectedItem("not.exist");
 
     // Check UI item is selected
     PageLeftPane.switchSegment(PagePaneSegment.UI);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Linting/BasicLint_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Linting/BasicLint_spec.ts
index 864f4ee7b9..4331996e14 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Linting/BasicLint_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Linting/BasicLint_spec.ts
@@ -67,8 +67,13 @@ describe("Linting", { tags: ["@tag.JS"] }, () => {
     AppSidebar.navigate(AppSidebarButton.Editor);
   });
 
-  it("1. TC 1927 - Shows correct lint error when Api is deleted or created", () => {
+  it("1. TC 1927 - Show correct lint errors", () => {
+    // For browser APIs it should give linting error
     EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
+    propPane.EnterJSContext("onClick", `{{window}}`);
+    agHelper.AssertElementExist(locators._lintErrorElement);
+
+    // Shows correct lint error when Api is deleted or created
     propPane.EnterJSContext(
       "onClick",
       `{{function(){
diff --git a/app/client/cypress/e2e/Regression/ClientSide/MobileResponsiveTests/ConversionFlow_Corner_Cases_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/MobileResponsiveTests/ConversionFlow_Corner_Cases_spec.ts
index 5d027bdc97..125ba1cd59 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/MobileResponsiveTests/ConversionFlow_Corner_Cases_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/MobileResponsiveTests/ConversionFlow_Corner_Cases_spec.ts
@@ -11,6 +11,7 @@ import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
 import PageList from "../../../../support/Pages/PageList";
+import { EntityItems } from "../../../../support/Pages/AssertHelper";
 
 describe(
   "Handle Cases while conversion",
@@ -37,6 +38,7 @@ describe(
 
       entityExplorer.ActionContextMenuByEntityName({
         entityNameinLeftSidebar: "Page2",
+        entityType: EntityItems.Page,
       });
     });
 
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ApplicationURL_spec.js b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ApplicationURL_spec.js
index f83d14d522..c678779251 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ApplicationURL_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ApplicationURL_spec.js
@@ -7,6 +7,7 @@ import {
   locators,
   propPane,
 } from "../../../../support/Objects/ObjectsCore";
+import { EntityItems } from "../../../../support/Pages/AssertHelper";
 
 describe("Slug URLs", () => {
   let applicationName;
@@ -41,7 +42,12 @@ describe("Slug URLs", () => {
         expect(pathname).to.be.equal(`/app/${appName}/page1-${pageId}/edit`);
       });
     });
-    entityExplorer.RenameEntityFromExplorer("Page1", "Renamed");
+    entityExplorer.RenameEntityFromExplorer(
+      "Page1",
+      "Renamed",
+      false,
+      EntityItems.Page,
+    );
     assertHelper.AssertNetworkStatus("updatePage");
     // cy.location("pathname").then((pathname) => {
     cy.url().then((url) => {
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Omnibar_spec.js b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Omnibar_spec.js
index a7e9503410..b3ae874992 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Omnibar_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Omnibar_spec.js
@@ -5,12 +5,15 @@ import EditorNavigation, {
 const omnibar = require("../../../../locators/Omnibar.json");
 import {
   agHelper,
-  entityExplorer,
   assertHelper,
-  deployMode,
-  draggableWidgets,
 } from "../../../../support/Objects/ObjectsCore";
 
+import {
+  createMessage,
+  NAV_DESCRIPTION,
+  ACTION_OPERATION_DESCRIPTION,
+} from "../../../../../src/ce/constants/messages";
+
 describe("Omnibar functionality test cases", () => {
   const apiName = "Omnibar1";
   const jsObjectName = "Omnibar2";
@@ -19,17 +22,7 @@ describe("Omnibar functionality test cases", () => {
     agHelper.AddDsl("omnibarDsl");
   });
 
-  it("1. Bug #15104  Docs tab opens after clicking on learn more link from property pane", function () {
-    cy.dragAndDropToCanvas(draggableWidgets.AUDIO, { x: 300, y: 500 });
-    agHelper.Sleep(2000);
-    deployMode.StubWindowNAssert(
-      '//span[text()="Learn more"]',
-      "connect-to-a-database",
-      "getConsolidatedData",
-    );
-  });
-
-  it("2.Verify omnibar is present across all pages and validate its fields", function () {
+  it("1.Verify omnibar is present across all pages and validate its fields", function () {
     cy.get(omnibar.globalSearch)
       .trigger("mouseover")
       .should("have.css", "background-color", "rgb(255, 255, 255)");
@@ -39,19 +32,16 @@ describe("Omnibar functionality test cases", () => {
       .eq(0)
       .should("have.text", "Navigate")
       .next()
-      .should(
-        "have.text",
-        "Navigate to any page, widget or file across this project.",
-      );
+      .should("have.text", createMessage(NAV_DESCRIPTION));
     cy.get(omnibar.categoryTitle)
       .eq(1)
       .should("have.text", "Create new")
       .next()
-      .should("have.text", "Create a new query, API or JS Object");
+      .should("have.text", createMessage(ACTION_OPERATION_DESCRIPTION));
     cy.get("body").type("{esc}");
   });
 
-  it("3. Verify Create new section and its data, also create a new api, new js object and new cURL import from omnibar ", function () {
+  it("2. Verify Create new section and its data, also create a new api, new js object and new cURL import from omnibar ", function () {
     cy.intercept("POST", "/api/v1/actions").as("createNewApi");
     cy.intercept("POST", "/api/v1/collections/actions").as(
       "createNewJSCollection",
@@ -90,7 +80,7 @@ describe("Omnibar functionality test cases", () => {
   });
 
   it(
-    "4. On an invalid search, discord link should be displayed and on clicking that link, should open discord in new tab",
+    "3. On an invalid search, discord link should be displayed and on clicking that link, should open discord in new tab",
     { tags: ["@tag.excludeForAirgap"] },
     function () {
       // typing a random string in search bar
@@ -101,30 +91,11 @@ describe("Omnibar functionality test cases", () => {
       cy.get(omnibar.globalSearchInput).should("have.value", "vnjkv");
       // discord link should be visible
       cy.get(omnibar.discordLink).should("be.visible");
-      // cy.window().then((win) => {
-      //   cy.stub(win, "open", (url) => {
-      //     win.location.href = "https://discord.com/invite/rBTTVJp";
-      //   }).as("discordLink");
-      // });
-      // cy.url().then(($urlBeforeDiscord) => {
-      //   // clicking on discord link should open discord
-      //   agHelper.GetNClick(omnibar.discordLink, 0, false, 4000);
-      //   cy.get("@discordLink").should("be.called");
-      //   cy.wait(2000);
-      //   //cy.go(-1);
-      //   cy.visit($urlBeforeDiscord);
-      //   cy.wait(4000); //for page to load
-      // });
-
-      deployMode.StubWindowNAssert(
-        omnibar.discordLink,
-        "https://discord.com/invite/rBTTVJp",
-        "getConsolidatedData",
-      );
+      cy.get(".no-data-title").should("be.visible");
     },
   );
 
-  it("5. Verify Navigate section shows recently opened widgets and datasources", function () {
+  it("4. Verify Navigate section shows recently opened widgets and datasources", function () {
     EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
     cy.get(omnibar.globalSearch).click({ force: true });
     cy.get(omnibar.categoryTitle).contains("Navigate").click();
@@ -147,12 +118,6 @@ describe("Omnibar functionality test cases", () => {
       .next()
       .should("have.text", "Page1");
 
-    cy.xpath(omnibar.recentlyopenItem)
-      .eq(3)
-      .should("have.text", "Audio1")
-      .next()
-      .should("have.text", "Page1");
-
-    cy.xpath(omnibar.recentlyopenItem).eq(4).should("have.text", "Page1");
+    cy.xpath(omnibar.recentlyopenItem).eq(3).should("have.text", "Page1");
   });
 });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/SettingsPane/PageSettings_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/SettingsPane/PageSettings_spec.ts
index bc56fd6635..ccaecba896 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/SettingsPane/PageSettings_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/SettingsPane/PageSettings_spec.ts
@@ -59,10 +59,10 @@ describe("Page Settings", { tags: ["@tag.Settings"] }, () => {
     });
     _.appSettings.ClosePane();
 
-    //Page name doesn't allow special character
+    // Page name doesn't allow slashes and colons
     _.appSettings.OpenAppSettings();
     _.appSettings.GoToPageSettings("Page3");
-    _.pageSettings.UpdatePageNameAndVerifyTextValue("Page3!@#", "Page3 ");
+    _.pageSettings.UpdatePageNameAndVerifyTextValue("Page3/\\:", "Page3");
     _.appSettings.ClosePane();
 
     // Page name doesn't allow empty
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Templates/ForkTemplateToGitConnectedApp.js b/app/client/cypress/e2e/Regression/ClientSide/Templates/ForkTemplateToGitConnectedApp.js
index f8366ebfff..8ba0a8883b 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Templates/ForkTemplateToGitConnectedApp.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Templates/ForkTemplateToGitConnectedApp.js
@@ -40,11 +40,11 @@ describe(
       );
       cy.wait(1000);
       cy.get(template.templateDialogBox).should("be.visible");
-      cy.xpath("//h1[text()='Slack Bot']").scrollIntoView().wait(500).click();
+      cy.get(template.templateCard).first().click();
       cy.get(template.templateViewForkButton).first().click();
       cy.waitUntil(() => cy.xpath("//span[text()='Setting up the template']"), {
         errorMsg: "Setting Templates did not finish even after 75 seconds",
-        timeout: 950000,
+        timeout: 75000,
         interval: 5000,
       }).then(($ele) => {
         cy.wrap($ele).should("have.length", 0);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/VisualTests/AppPageLayout_spec.js b/app/client/cypress/e2e/Regression/ClientSide/VisualTests/AppPageLayout_spec.js
index b6df96a282..f3589c4ea3 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/VisualTests/AppPageLayout_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/VisualTests/AppPageLayout_spec.js
@@ -1,5 +1,9 @@
 import homePage from "../../../../locators/HomePage";
 import * as _ from "../../../../support/Objects/ObjectsCore";
+import {
+  createMessage,
+  LOGIN_PAGE_TITLE,
+} from "../../../../../src/ce/constants/messages";
 
 describe("Visual regression tests", { tags: ["@tag.Visual"] }, () => {
   // for any changes in UI, update the screenshot in snapshot folder, to do so:
@@ -47,7 +51,7 @@ describe("Visual regression tests", { tags: ["@tag.Visual"] }, () => {
     cy.get(homePage.signOutIcon).click();
     cy.wait(500);
     // validating all the fields on login page
-    cy.xpath("//h1").should("have.text", "Sign in");
+    cy.xpath("//h1").should("have.text", createMessage(LOGIN_PAGE_TITLE));
     cy.get(".bp3-label").first().should("have.text", "Email ");
     cy.get(".bp3-label").last().should("have.text", "Password ");
     cy.xpath('//span[text()="Sign in"]').should("be.visible");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/Image_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/Image_Spec.ts
index d8c23dc380..ed9e2cfff7 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/Image_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Camera/Image_Spec.ts
@@ -35,10 +35,10 @@ describe(
 
       // Check camera resource is properly released on navigating away
       PageList.AddNewPage();
-      EditorNavigation.SelectEntityByName("Page2", EntityType.Widget);
+      EditorNavigation.SelectEntityByName("Page2", EntityType.Page);
       agHelper.AssertElementAbsence(widgetLocators.cameraVideo);
 
-      EditorNavigation.SelectEntityByName("Page1", EntityType.Widget);
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
       agHelper.AssertElementVisibility(widgetLocators.cameraVideo);
     });
 
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js
index fdc10c2419..e78f872fca 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js
@@ -94,9 +94,7 @@ describe(
         'SELECT * FROM public."country" LIMIT 10;',
       );
       // Going to HomePage where the button widget is located and opeing it's property pane.
-      cy.get("[data-guided-tour-id='explorer-entity-Page1']").click({
-        force: true,
-      });
+      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
       PageLeftPane.switchSegment(PagePaneSegment.UI);
       cy.openPropertyPane("selectwidget");
       cy.reload();
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/DataIdentifier_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/DataIdentifier_spec.ts
index 6871d98b18..d0f15f8e52 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/DataIdentifier_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/DataIdentifier_spec.ts
@@ -38,22 +38,23 @@ describe(
   () => {
     before(() => {
       agHelper.AddDsl("Listv2/ListV2WithNullPrimaryKey");
-      agHelper.Sleep(3000); //for List to load for CI flakyness
     });
 
     it("1. Widgets get displayed when PrimaryKey doesn't exist - SSP", () => {
       apiPage.CreateAndFillApi(
-        "https://api.punkapi.com/v2/beers?page={{List1.pageNo}}&per_page={{List1.pageSize}}",
+        "http://host.docker.internal:5001/v1/dynamicrecords/getrecordsArray",
         "",
       );
-      agHelper.VerifyEvaluatedValue(
-        "https://api.punkapi.com/v2/beers?page=1&per_page=2",
-      );
       apiPage.RunAPI(false);
+      EditorNavigation.SelectEntityByName("List1", EntityType.Widget);
+      propPane.SelectPropertiesDropDown("Data Identifier", "value");
+      agHelper.AssertElementAbsence(propPane._dropdownControlError);
+
       EditorNavigation.SelectEntityByName("Text2", EntityType.Widget, {}, [
         "List1",
         "Container1",
       ]);
+
       propPane.UpdatePropertyFieldValue("Text", "{{currentIndex}}");
       agHelper.AssertText(propPane._widgetToVerifyText("Text2"), "text", "0");
       table.NavigateToPageUsingButton_List("next", 2);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_spec.ts
index f355423e91..8fc623d5cd 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_spec.ts
@@ -126,7 +126,6 @@ describe(
           " " +
           locators._widgetInDeployed(draggableWidgets.TABLE),
       );
-
       deployMode.NavigateBacktoEditor();
 
       //Fixed height
@@ -135,10 +134,6 @@ describe(
       deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.BUTTON));
       agHelper.ClickButton("Submit");
       agHelper.AssertElementVisibility(locators._modal);
-
-      //Verify that a fixed canvas size is visible when height is selected as Fixed
-      agHelper.AssertProperty(locators._modal, "offsetHeight", 1094);
-      agHelper.AssertProperty(locators._modal, "offsetWidth", 456);
       agHelper.AssertElementVisibility(
         locators._modal +
           " " +
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_2_spec.js
index f52f8080c0..0ed4d0ddce 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_2_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_2_spec.js
@@ -97,8 +97,7 @@ describe(
       // Check if the cursor is at the end when input Type is HTML
       setRTEContent(testString);
       testCursorPoistion(testStringLen, tinyMceId);
-      setRTEContent("{selectAll}");
-      setRTEContent("{backspace}");
+      setRTEContent("{selectAll}{del}");
 
       // Changing the input type to markdown and again testing the cursor position
       cy.openPropertyPane("richtexteditorwidget");
diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Bugs_Spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Bugs_Spec.js
index abf63f460f..58584e081e 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Bugs_Spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Bugs_Spec.js
@@ -46,13 +46,16 @@ describe("Rest Bugs tests", { tags: ["@tag.Datasource"] }, function () {
     agHelper.PressEscape();
 
     //Api 3
-    apiPage.CreateAndFillApi("http://numbersapi.com/random/math", "NumberFact");
+    apiPage.CreateAndFillApi(
+      "http://host.docker.internal:8000/a.txt",
+      "SampleText",
+    );
     agHelper.PressEscape();
 
     //Api 4
     apiPage.CreateAndFillApi(
-      "https://www.thecocktaildb.com/api/json/v1/1/search.php?s=margarita",
-      "CocktailDB",
+      "http://host.docker.internal:5001/v1/dynamicrecords/getrecordsArray",
+      "dynamicRecords",
     );
     agHelper.PressEscape();
 
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 b7bf3e7b43..a77af1001a 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/JSFunctionExecution_spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/JsFunctionExecution/JSFunctionExecution_spec.ts
@@ -367,12 +367,12 @@ describe("JS Function Execution", { tags: ["@tag.JS"] }, function () {
                 isMarkedAsync ? "async" : ""
               } ()=>"${functionName}",`
             : i === functionsLength - 1
-            ? `
+              ? `
             ${functionName}: ${
               isMarkedAsync ? "async" : ""
             } ()=>"${functionName}",
           }`
-            : `
+              : `
             ${functionName}: ${
               isMarkedAsync ? "async" : ""
             } ()=> "${functionName}",`;
diff --git a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JSOnLoad2_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JSOnLoad2_Spec.ts
index 99ab21926e..ff55aad325 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JSOnLoad2_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JSOnLoad2_Spec.ts
@@ -1,6 +1,7 @@
 import {
   agHelper,
   dataSources,
+  debuggerHelper,
   deployMode,
   entityExplorer,
   homePage,
@@ -70,44 +71,14 @@ describe(
       //homePage.DeleteWorkspace("JSOnLoadTest");
     });
 
-    it("6. Tc #1910 - Verify the Number of confirmation models of JS Object on page load", () => {
+    it("6. Tc #1910 - Verify that JSObject functions set to run on pageLoad are executed on page refresh", () => {
       homePage.CreateAppInWorkspace("JSOnLoadTest");
-      entityExplorer.DragDropWidgetNVerify("buttonwidget", 100, 100);
-      dataSources.CreateDataSource("Postgres");
-      cy.get("@dsName").then((dsName) => {
-        datasourceName = dsName;
-        dataSources.CreateQueryAfterDSSaved(
-          `SELECT * FROM public."astronauts" LIMIT 1;`,
-          "getastronauts",
-        );
-        dataSources.CreateQueryFromOverlay(
-          datasourceName,
-          `SELECT * FROM public."category" LIMIT 1;`,
-          "getcategory",
-        );
-        dataSources.CreateQueryFromOverlay(
-          datasourceName,
-          `SELECT * FROM public."city" LIMIT 1;`,
-          "getcity",
-        );
-        dataSources.CreateQueryFromOverlay(
-          datasourceName,
-          `SELECT * FROM public."film" LIMIT 1;`,
-          "getfilm",
-        );
-        dataSources.CreateQueryFromOverlay(
-          datasourceName,
-          `SELECT * FROM public."hogwartsstudents" LIMIT 1;`,
-          "gethogwartsstudents",
-        );
-      });
-
       jsEditor.CreateJSObject(
         `export default {
         astros: () => {
-          return getastronauts.run();	},
+          return "test"	},
         city: () => {
-          return getcity.run()
+          return "test2"
         }
       }`,
         {
@@ -119,57 +90,14 @@ describe(
       );
 
       jsEditor.EnableDisableAsyncFuncSettings("astros", true);
-      jsEditor.EnableDisableAsyncFuncSettings("city", true);
-
-      jsEditor.CreateJSObject(
-        `export default {
-        cat: () => {
-          return getcategory.run();	},
-        hogwartsstudents: () => {
-          return gethogwartsstudents.run();
-        }
-      }`,
-        {
-          paste: true,
-          completeReplace: true,
-          toRun: false,
-          shouldCreateNewJSObj: true,
-        },
-      );
-
-      jsEditor.EnableDisableAsyncFuncSettings("cat", true);
-      jsEditor.EnableDisableAsyncFuncSettings("hogwartsstudents", true);
-
-      jsEditor.CreateJSObject(
-        `export default {
-        film: async () => {
-          return getfilm.run();
-        }
-      }`,
-        {
-          paste: true,
-          completeReplace: true,
-          toRun: false,
-          shouldCreateNewJSObj: true,
-        },
-      );
-      jsEditor.EnableDisableAsyncFuncSettings("film", true);
-    });
-
-    it("7. Tc #1909 - Verify the sequence of of JS Object on page load", () => {
-      EditorNavigation.SelectEntityByName("JSObject1", EntityType.JSObject);
-      jsEditor.EnableDisableAsyncFuncSettings("astros", true);
-      jsEditor.EnableDisableAsyncFuncSettings("city", true);
-      EditorNavigation.SelectEntityByName("JSObject2", EntityType.JSObject);
-      jsEditor.EnableDisableAsyncFuncSettings("cat", true);
-      jsEditor.EnableDisableAsyncFuncSettings("hogwartsstudents", true);
-      EditorNavigation.SelectEntityByName("JSObject3", EntityType.JSObject);
-      jsEditor.EnableDisableAsyncFuncSettings("film", true);
 
       EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
       agHelper.RefreshPage();
 
-      agHelper.ValidateToastMessage("ran successfully", 0, 5);
+      debuggerHelper.ClickDebuggerIcon();
+      debuggerHelper.ClickLogsTab();
+      debuggerHelper.DebuggerLogsFilter("JSObject1.astros");
+      debuggerHelper.DoesConsoleLogExist("JS Function executed successfully");
     });
 
     function AssertJSOnPageLoad(
diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Mongo_Spec.js b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Mongo_Spec.js
index 6e56119b14..44d559645e 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Mongo_Spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Mongo_Spec.js
@@ -288,7 +288,7 @@ describe(
       entityExplorer.ActionContextMenuByEntityName({
         entityNameinLeftSidebar: "ListingAndReviews",
         action: "Delete",
-        entityType: entityItems.Datasource,
+        entityType: entityItems.Page,
       });
       EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
     });
diff --git a/app/client/cypress/e2e/Sanity/Datasources/SMTPDatasource_spec.js b/app/client/cypress/e2e/Sanity/Datasources/SMTPDatasource_spec.js
index 863809a1a8..8b5a1ad756 100644
--- a/app/client/cypress/e2e/Sanity/Datasources/SMTPDatasource_spec.js
+++ b/app/client/cypress/e2e/Sanity/Datasources/SMTPDatasource_spec.js
@@ -1,6 +1,4 @@
-import EditorNavigation, {
-  EntityType,
-} from "../../../support/Pages/EditorNavigation";
+import EditorNavigation from "../../../support/Pages/EditorNavigation";
 
 const datasource = require("../../../locators/DatasourcesEditor.json");
 const queryLocators = require("../../../locators/QueryEditor.json");
@@ -57,7 +55,7 @@ describe(
         .eq(6)
         .type("{{FilePicker.files}}", { parseSpecialCharSequences: false });
       agHelper.ClickOutside(); //to close the evaluated pop-up
-      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      EditorNavigation.ShowCanvas();
       cy.wait(2000);
     });
 
@@ -96,8 +94,7 @@ describe(
     });
 
     it("3. On canvas, fill to email, from email, subject, body, attachment and run query", function () {
-      EditorNavigation.SelectEntityByName("smtpquery", EntityType.Query);
-      EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
+      EditorNavigation.ShowCanvas();
       const noise = Math.random().toString(36).substring(0, 7);
       const fromEmail = `smtp.datasource.tester.${noise}@appsmith.com`;
       cy.wait(2000);
diff --git a/app/client/cypress/fixtures/IframeDsl.json b/app/client/cypress/fixtures/IframeDsl.json
index e104f3c0d0..b665db1274 100644
--- a/app/client/cypress/fixtures/IframeDsl.json
+++ b/app/client/cypress/fixtures/IframeDsl.json
@@ -32,7 +32,7 @@
           "topRow": 4,
           "bottomRow": 36,
           "parentRowSpace": 10,
-          "source": "https://www.example.com",
+          "source": "http://host.docker.internal:8000/a.txt",
           "type": "IFRAME_WIDGET",
           "hideCard": false,
           "borderOpacity": 100,
diff --git a/app/client/cypress/fixtures/IframeOnSrcDocChange.json b/app/client/cypress/fixtures/IframeOnSrcDocChange.json
index 95fcca3822..2a66c7d378 100644
--- a/app/client/cypress/fixtures/IframeOnSrcDocChange.json
+++ b/app/client/cypress/fixtures/IframeOnSrcDocChange.json
@@ -60,7 +60,7 @@
                   "topRow": 6.0,
                   "bottomRow": 38.0,
                   "parentRowSpace": 10.0,
-                  "source": "https://www.example.com",
+                  "source": "http://host.docker.internal:8000/a.txt",
                   "type": "IFRAME_WIDGET",
                   "hideCard": false,
                   "borderOpacity": 100.0,
diff --git a/app/client/cypress/fixtures/Listv2/Listv2JSObjects.json b/app/client/cypress/fixtures/Listv2/Listv2JSObjects.json
index f7033f7bcf..b621c04914 100644
--- a/app/client/cypress/fixtures/Listv2/Listv2JSObjects.json
+++ b/app/client/cypress/fixtures/Listv2/Listv2JSObjects.json
@@ -391,7 +391,7 @@
                         "longitude": "134.8",
                         "phone": "1234 456 789",
                         "email": "erewt@etewt.com",
-                        "image": "https://randomuser.me/api/portraits/med/women/39.jpg",
+                        "image": "http://host.docker.internal:8000/photo-1492529029602-33e53698f407.jpeg",
                         "country": "India"
                     }
                 },
@@ -812,7 +812,7 @@
                 "rightColumn": 64,
                 "textSize": "0.875rem",
                 "widgetId": "hasf62rs16",
-                "tableData": "[\n  {\n    \"id\": 8,\n    \"gender\": \"Male2\",\n    \"latitude\": \"-46.799\",\n    \"longitude\": \"134.8\",\n    \"dob\": null,\n    \"phone\": \"1234 456 789\",\n    \"email\": \"erewt@etewt.com\",\n    \"image\": \"https://randomuser.me/api/portraits/med/women/39.jpg\",\n    \"country\": \"India\",\n    \"name\": \"Perry234\"\n  },\n  {\n    \"id\": 14,\n    \"gender\": \"Female\",\n    \"latitude\": \"-55.3277\",\n    \"longitude\": \"14.598\",\n    \"dob\": \"1960-06-11T04:07:44.187Z\",\n    \"phone\": \"(480)-579-1070\",\n    \"email\": \"lucille.martinez@example.com\",\n    \"image\": \"https://randomuser.me/api/portraits/med/women/41.jpg\",\n    \"country\": \"Myanmar\",\n    \"name\": \"Aliess123\"\n  },\n  {\n    \"id\": 20,\n    \"gender\": \"female\",\n    \"latitude\": \"50.3512\",\n    \"longitude\": \"-144.4759\",\n    \"dob\": \"1989-03-18T05:45:11.987Z\",\n    \"phone\": \"03-7420-3707\",\n    \"email\": \"jennie.james@example.com\",\n    \"image\": \"https://randomuser.me/api/portraits/med/women/6.jpg\",\n    \"country\": \"Australia\",\n    \"name\": \"Jennie James\"\n  },\n  {\n    \"id\": 538,\n    \"gender\": \"Female\",\n    \"latitude\": \"234\",\n    \"longitude\": \"34354534\",\n    \"dob\": null,\n    \"phone\": null,\n    \"email\": \"prapulla.c@moolya.com\",\n    \"image\": null,\n    \"country\": null,\n    \"name\": null\n  },\n  {\n    \"id\": 539,\n    \"gender\": \"Female\",\n    \"latitude\": \"234\",\n    \"longitude\": \"34354534\",\n    \"dob\": null,\n    \"phone\": null,\n    \"email\": \"prapulla.c@moolya.com\",\n    \"image\": null,\n    \"country\": null,\n    \"name\": null\n  },\n  {\n    \"id\": 542,\n    \"gender\": \"male\",\n    \"latitude\": \"10\",\n    \"longitude\": \"10\",\n    \"dob\": \"2000-10-10T00:00:00Z\",\n    \"phone\": null,\n    \"email\": null,\n    \"image\": null,\n    \"country\": null,\n    \"name\": null\n  },\n  {\n    \"id\": 543,\n    \"gender\": \"test\",\n    \"latitude\": \"0.88\",\n    \"longitude\": \"0.88\",\n    \"dob\": \"2000-12-12T00:00:00Z\",\n    \"phone\": null,\n    \"email\": null,\n    \"image\": null,\n    \"country\": null,\n    \"name\": null\n  },\n  {\n    \"id\": 553,\n    \"gender\": \"female\",\n    \"latitude\": \"55\",\n    \"longitude\": \"33\",\n    \"dob\": \"2019-07-01T05:30:00Z\",\n    \"phone\": \"12345678\",\n    \"email\": \"1026033274@qq.com\",\n    \"image\": \"\",\n    \"country\": \"india\",\n    \"name\": \"test\"\n  },\n  {\n    \"id\": 554,\n    \"gender\": \"male\",\n    \"latitude\": \"55\",\n    \"longitude\": \"22\",\n    \"dob\": \"2019-07-01T05:30:00Z\",\n    \"phone\": \"1234567\",\n    \"email\": \"1026033274@qq.com\",\n    \"image\": \"\",\n    \"country\": \"state\",\n    \"name\": \"teest\"\n  },\n  {\n    \"id\": 555,\n    \"gender\": \"male\",\n    \"latitude\": \"55\",\n    \"longitude\": \"44\",\n    \"dob\": \"2019-07-01T05:30:00Z\",\n    \"phone\": \"12345678\",\n    \"email\": \"1026033274@qq.com\",\n    \"image\": \"\",\n    \"country\": \"state\",\n    \"name\": \"111222\"\n  },\n  {\n    \"id\": 556,\n    \"gender\": \"female\",\n    \"latitude\": \"22\",\n    \"longitude\": \"11\",\n    \"dob\": \"2019-07-01T05:30:00Z\",\n    \"phone\": \"1234567\",\n    \"email\": \"1026033274@qq.com\",\n    \"image\": \"1\",\n    \"country\": \"brail\",\n    \"name\": \"test1\"\n  },\n  {\n    \"id\": 558,\n    \"gender\": \"Male\",\n    \"latitude\": \"123,45,67.32\",\n    \"longitude\": null,\n    \"dob\": null,\n    \"phone\": null,\n    \"email\": \"subrata@appsmith.com\",\n    \"image\": null,\n    \"country\": null,\n    \"name\": \"Subrata\"\n  },\n  {\n    \"id\": 561,\n    \"gender\": \"Male\",\n    \"latitude\": null,\n    \"longitude\": null,\n    \"dob\": null,\n    \"phone\": null,\n    \"email\": \"will@gmail.com\",\n    \"image\": null,\n    \"country\": null,\n    \"name\": \"Maro\"\n  },\n  {\n    \"id\": 562,\n    \"gender\": \"female\",\n    \"latitude\": \"-46.799\",\n    \"longitude\": \"134.8\",\n    \"dob\": \"2020-09-09T00:00:00Z\",\n    \"phone\": \"1234 456 789\",\n    \"email\": \"test@gmail.com\",\n    \"image\": \"https://randomuser.me/api/portraits/med/women/39.jpg\",\n    \"country\": \"Australia\",\n    \"name\": \"oktest\"\n  },\n  {\n    \"id\": 566,\n    \"gender\": \"femal\",\n    \"latitude\": \"66\",\n    \"longitude\": \"33\",\n    \"dob\": \"2019-07-01T05:30:00Z\",\n    \"phone\": \"123456\",\n    \"email\": \"1026033274@qq.com\",\n    \"image\": \"\",\n    \"country\": \"china\",\n    \"name\": \"test1\"\n  },\n  {\n    \"id\": 570,\n    \"gender\": \"male\",\n    \"latitude\": null,\n    \"longitude\": null,\n    \"dob\": null,\n    \"phone\": null,\n    \"email\": \"balaji@appsmith.com\",\n    \"image\": null,\n    \"country\": null,\n    \"name\": \"Balaji\"\n  },\n  {\n    \"id\": 571,\n    \"gender\": \"male\",\n    \"latitude\": null,\n    \"longitude\": null,\n    \"dob\": null,\n    \"phone\": null,\n    \"email\": \"123\",\n    \"image\": null,\n    \"country\": null,\n    \"name\": \"AAAA\"\n  },\n  {\n    \"id\": 572,\n    \"gender\": \"male\",\n    \"latitude\": null,\n    \"longitude\": null,\n    \"dob\": null,\n    \"phone\": null,\n    \"email\": \"123@12.com\",\n    \"image\": null,\n    \"country\": null,\n    \"name\": \"balaji app viewer\"\n  }\n]",
+                "tableData": "[\n  {\n    \"id\": 8,\n    \"gender\": \"Male2\",\n    \"latitude\": \"-46.799\",\n    \"longitude\": \"134.8\",\n    \"dob\": null,\n    \"phone\": \"1234 456 789\",\n    \"email\": \"erewt@etewt.com\",\n    \"image\": \"http://host.docker.internal:8000/photo-1492529029602-33e53698f407.jpeg\",\n    \"country\": \"India\",\n    \"name\": \"Perry234\"\n  },\n  {\n    \"id\": 14,\n    \"gender\": \"Female\",\n    \"latitude\": \"-55.3277\",\n    \"longitude\": \"14.598\",\n    \"dob\": \"1960-06-11T04:07:44.187Z\",\n    \"phone\": \"(480)-579-1070\",\n    \"email\": \"lucille.martinez@example.com\",\n    \"image\": \"http://host.docker.internal:8000/photo-1503469432756-4aae2e18d881.jpeg\",\n    \"country\": \"Myanmar\",\n    \"name\": \"Aliess123\"\n  },\n  {\n    \"id\": 20,\n    \"gender\": \"female\",\n    \"latitude\": \"50.3512\",\n    \"longitude\": \"-144.4759\",\n    \"dob\": \"1989-03-18T05:45:11.987Z\",\n    \"phone\": \"03-7420-3707\",\n    \"email\": \"jennie.james@example.com\",\n    \"image\": \"http://host.docker.internal:8000/photo-1547401208-4e3278cb1488.jpeg\",\n    \"country\": \"Australia\",\n    \"name\": \"Jennie James\"\n  },\n  {\n    \"id\": 538,\n    \"gender\": \"Female\",\n    \"latitude\": \"234\",\n    \"longitude\": \"34354534\",\n    \"dob\": null,\n    \"phone\": null,\n    \"email\": \"prapulla.c@moolya.com\",\n    \"image\": null,\n    \"country\": null,\n    \"name\": null\n  },\n  {\n    \"id\": 539,\n    \"gender\": \"Female\",\n    \"latitude\": \"234\",\n    \"longitude\": \"34354534\",\n    \"dob\": null,\n    \"phone\": null,\n    \"email\": \"prapulla.c@moolya.com\",\n    \"image\": null,\n    \"country\": null,\n    \"name\": null\n  },\n  {\n    \"id\": 542,\n    \"gender\": \"male\",\n    \"latitude\": \"10\",\n    \"longitude\": \"10\",\n    \"dob\": \"2000-10-10T00:00:00Z\",\n    \"phone\": null,\n    \"email\": null,\n    \"image\": null,\n    \"country\": null,\n    \"name\": null\n  },\n  {\n    \"id\": 543,\n    \"gender\": \"test\",\n    \"latitude\": \"0.88\",\n    \"longitude\": \"0.88\",\n    \"dob\": \"2000-12-12T00:00:00Z\",\n    \"phone\": null,\n    \"email\": null,\n    \"image\": null,\n    \"country\": null,\n    \"name\": null\n  },\n  {\n    \"id\": 553,\n    \"gender\": \"female\",\n    \"latitude\": \"55\",\n    \"longitude\": \"33\",\n    \"dob\": \"2019-07-01T05:30:00Z\",\n    \"phone\": \"12345678\",\n    \"email\": \"1026033274@qq.com\",\n    \"image\": \"\",\n    \"country\": \"india\",\n    \"name\": \"test\"\n  },\n  {\n    \"id\": 554,\n    \"gender\": \"male\",\n    \"latitude\": \"55\",\n    \"longitude\": \"22\",\n    \"dob\": \"2019-07-01T05:30:00Z\",\n    \"phone\": \"1234567\",\n    \"email\": \"1026033274@qq.com\",\n    \"image\": \"\",\n    \"country\": \"state\",\n    \"name\": \"teest\"\n  },\n  {\n    \"id\": 555,\n    \"gender\": \"male\",\n    \"latitude\": \"55\",\n    \"longitude\": \"44\",\n    \"dob\": \"2019-07-01T05:30:00Z\",\n    \"phone\": \"12345678\",\n    \"email\": \"1026033274@qq.com\",\n    \"image\": \"\",\n    \"country\": \"state\",\n    \"name\": \"111222\"\n  },\n  {\n    \"id\": 556,\n    \"gender\": \"female\",\n    \"latitude\": \"22\",\n    \"longitude\": \"11\",\n    \"dob\": \"2019-07-01T05:30:00Z\",\n    \"phone\": \"1234567\",\n    \"email\": \"1026033274@qq.com\",\n    \"image\": \"1\",\n    \"country\": \"brail\",\n    \"name\": \"test1\"\n  },\n  {\n    \"id\": 558,\n    \"gender\": \"Male\",\n    \"latitude\": \"123,45,67.32\",\n    \"longitude\": null,\n    \"dob\": null,\n    \"phone\": null,\n    \"email\": \"subrata@appsmith.com\",\n    \"image\": null,\n    \"country\": null,\n    \"name\": \"Subrata\"\n  },\n  {\n    \"id\": 561,\n    \"gender\": \"Male\",\n    \"latitude\": null,\n    \"longitude\": null,\n    \"dob\": null,\n    \"phone\": null,\n    \"email\": \"will@gmail.com\",\n    \"image\": null,\n    \"country\": null,\n    \"name\": \"Maro\"\n  },\n  {\n    \"id\": 562,\n    \"gender\": \"female\",\n    \"latitude\": \"-46.799\",\n    \"longitude\": \"134.8\",\n    \"dob\": \"2020-09-09T00:00:00Z\",\n    \"phone\": \"1234 456 789\",\n    \"email\": \"test@gmail.com\",\n    \"image\": \"http://host.docker.internal:8000/photo-1492529029602-33e53698f407.jpeg\",\n    \"country\": \"Australia\",\n    \"name\": \"oktest\"\n  },\n  {\n    \"id\": 566,\n    \"gender\": \"femal\",\n    \"latitude\": \"66\",\n    \"longitude\": \"33\",\n    \"dob\": \"2019-07-01T05:30:00Z\",\n    \"phone\": \"123456\",\n    \"email\": \"1026033274@qq.com\",\n    \"image\": \"\",\n    \"country\": \"china\",\n    \"name\": \"test1\"\n  },\n  {\n    \"id\": 570,\n    \"gender\": \"male\",\n    \"latitude\": null,\n    \"longitude\": null,\n    \"dob\": null,\n    \"phone\": null,\n    \"email\": \"balaji@appsmith.com\",\n    \"image\": null,\n    \"country\": null,\n    \"name\": \"Balaji\"\n  },\n  {\n    \"id\": 571,\n    \"gender\": \"male\",\n    \"latitude\": null,\n    \"longitude\": null,\n    \"dob\": null,\n    \"phone\": null,\n    \"email\": \"123\",\n    \"image\": null,\n    \"country\": null,\n    \"name\": \"AAAA\"\n  },\n  {\n    \"id\": 572,\n    \"gender\": \"male\",\n    \"latitude\": null,\n    \"longitude\": null,\n    \"dob\": null,\n    \"phone\": null,\n    \"email\": \"123@12.com\",\n    \"image\": null,\n    \"country\": null,\n    \"name\": \"balaji app viewer\"\n  }\n]",
                 "label": "Data",
                 "searchKey": "",
                 "parentId": "0",
diff --git a/app/client/cypress/fixtures/tableResizedColumnsDsl.json b/app/client/cypress/fixtures/tableResizedColumnsDsl.json
index 85ea1b6a2a..8747f449d3 100644
--- a/app/client/cypress/fixtures/tableResizedColumnsDsl.json
+++ b/app/client/cypress/fixtures/tableResizedColumnsDsl.json
@@ -62,7 +62,7 @@
         ]
       },
       {
-        "image": "https://source.unsplash.com/mGFHA_0TWnA/2048x620",
+        "image": "http://host.docker.internal:8000/photo-1492529029602-33e53698f407.jpeg",
         "widgetName": "Image1",
         "rightColumn": 64,
         "widgetId": "ah4cbb9o2e",
diff --git a/app/client/cypress/fixtures/tableV2ResizedColumnsDsl.json b/app/client/cypress/fixtures/tableV2ResizedColumnsDsl.json
index f33aef4a6c..cdf9c50cbf 100644
--- a/app/client/cypress/fixtures/tableV2ResizedColumnsDsl.json
+++ b/app/client/cypress/fixtures/tableV2ResizedColumnsDsl.json
@@ -62,7 +62,7 @@
         ]
       },
       {
-        "image": "https://source.unsplash.com/mGFHA_0TWnA/2048x620",
+        "image": "http://host.docker.internal:8000/photo-1503469432756-4aae2e18d881.jpeg",
         "widgetName": "Image1",
         "rightColumn": 64,
         "widgetId": "ah4cbb9o2e",
diff --git a/app/client/cypress/snapshots/AppPageLayout_spec.js/EmptyApp.snap.png b/app/client/cypress/snapshots/AppPageLayout_spec.js/EmptyApp.snap.png
index 20419acd4f..cf3ce916fb 100644
Binary files a/app/client/cypress/snapshots/AppPageLayout_spec.js/EmptyApp.snap.png and b/app/client/cypress/snapshots/AppPageLayout_spec.js/EmptyApp.snap.png differ
diff --git a/app/client/cypress/snapshots/AppPageLayout_spec.js/Profile.snap.png b/app/client/cypress/snapshots/AppPageLayout_spec.js/Profile.snap.png
index 04bac05fcb..76481833a7 100644
Binary files a/app/client/cypress/snapshots/AppPageLayout_spec.js/Profile.snap.png and b/app/client/cypress/snapshots/AppPageLayout_spec.js/Profile.snap.png differ
diff --git a/app/client/cypress/snapshots/AppPageLayout_spec.js/apppage.snap.png b/app/client/cypress/snapshots/AppPageLayout_spec.js/apppage.snap.png
index bcbddcf31c..f27c15ad7a 100644
Binary files a/app/client/cypress/snapshots/AppPageLayout_spec.js/apppage.snap.png and b/app/client/cypress/snapshots/AppPageLayout_spec.js/apppage.snap.png differ
diff --git a/app/client/cypress/snapshots/AppPageLayout_spec.js/emptyAppBuilder.snap.png b/app/client/cypress/snapshots/AppPageLayout_spec.js/emptyAppBuilder.snap.png
index bcbddcf31c..f27c15ad7a 100644
Binary files a/app/client/cypress/snapshots/AppPageLayout_spec.js/emptyAppBuilder.snap.png and b/app/client/cypress/snapshots/AppPageLayout_spec.js/emptyAppBuilder.snap.png differ
diff --git a/app/client/cypress/snapshots/AppPageLayout_spec.js/loginpage.snap.png b/app/client/cypress/snapshots/AppPageLayout_spec.js/loginpage.snap.png
index cc335a2a05..ca3f579fc9 100644
Binary files a/app/client/cypress/snapshots/AppPageLayout_spec.js/loginpage.snap.png and b/app/client/cypress/snapshots/AppPageLayout_spec.js/loginpage.snap.png differ
diff --git a/app/client/cypress/snapshots/AppPageLayout_spec.js/quickPageWizard.snap.png b/app/client/cypress/snapshots/AppPageLayout_spec.js/quickPageWizard.snap.png
index c0205b7401..8391571782 100644
Binary files a/app/client/cypress/snapshots/AppPageLayout_spec.js/quickPageWizard.snap.png and b/app/client/cypress/snapshots/AppPageLayout_spec.js/quickPageWizard.snap.png differ
diff --git a/app/client/cypress/snapshots/DatasourcePageLayout_spec.js/emptydatasourcepage.snap.png b/app/client/cypress/snapshots/DatasourcePageLayout_spec.js/emptydatasourcepage.snap.png
index 128c6307cb..60b7e94117 100644
Binary files a/app/client/cypress/snapshots/DatasourcePageLayout_spec.js/emptydatasourcepage.snap.png and b/app/client/cypress/snapshots/DatasourcePageLayout_spec.js/emptydatasourcepage.snap.png differ
diff --git a/app/client/cypress/snapshots/JSEditorComment_spec.js/jsObjAfterCommenting1.snap.png b/app/client/cypress/snapshots/JSEditorComment_spec.js/jsObjAfterCommenting1.snap.png
index f32fcbd8f7..7517889c1b 100644
Binary files a/app/client/cypress/snapshots/JSEditorComment_spec.js/jsObjAfterCommenting1.snap.png and b/app/client/cypress/snapshots/JSEditorComment_spec.js/jsObjAfterCommenting1.snap.png differ
diff --git a/app/client/cypress/snapshots/JSEditorComment_spec.js/jsObjBeforeCommenting1.snap.png b/app/client/cypress/snapshots/JSEditorComment_spec.js/jsObjBeforeCommenting1.snap.png
index 5b42068fdd..e32b87efc9 100644
Binary files a/app/client/cypress/snapshots/JSEditorComment_spec.js/jsObjBeforeCommenting1.snap.png and b/app/client/cypress/snapshots/JSEditorComment_spec.js/jsObjBeforeCommenting1.snap.png differ
diff --git a/app/client/cypress/snapshots/JSEditorIndent_spec.js/formattedJSONBodyAfterSave.snap.png b/app/client/cypress/snapshots/JSEditorIndent_spec.js/formattedJSONBodyAfterSave.snap.png
index 1f9afa4c18..4d5cf7f492 100644
Binary files a/app/client/cypress/snapshots/JSEditorIndent_spec.js/formattedJSONBodyAfterSave.snap.png and b/app/client/cypress/snapshots/JSEditorIndent_spec.js/formattedJSONBodyAfterSave.snap.png differ
diff --git a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterGoLineStartSmart5.snap.png b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterGoLineStartSmart5.snap.png
index 2cf487d9ce..9d7b49e029 100644
Binary files a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterGoLineStartSmart5.snap.png and b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterGoLineStartSmart5.snap.png differ
diff --git a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify1.snap.png b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify1.snap.png
index 102b2c2dee..1513631299 100644
Binary files a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify1.snap.png and b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify1.snap.png differ
diff --git a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify2.snap.png b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify2.snap.png
index f335d099f8..d9568bd339 100644
Binary files a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify2.snap.png and b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify2.snap.png differ
diff --git a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify3.snap.png b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify3.snap.png
index 13cb914d49..7b97b74c5d 100644
Binary files a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify3.snap.png and b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify3.snap.png differ
diff --git a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify4.snap.png b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify4.snap.png
index 86442585db..9555cee5ea 100644
Binary files a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify4.snap.png and b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify4.snap.png differ
diff --git a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify4_1.snap.png b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify4_1.snap.png
index 86387284dc..b76f64cf6b 100644
Binary files a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify4_1.snap.png and b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify4_1.snap.png differ
diff --git a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify6.snap.png b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify6.snap.png
index f335d099f8..d9568bd339 100644
Binary files a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify6.snap.png and b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify6.snap.png differ
diff --git a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify7.snap.png b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify7.snap.png
index f335d099f8..c6e3c82c4f 100644
Binary files a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify7.snap.png and b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjAfterPrettify7.snap.png differ
diff --git a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforeGoLineStartSmart5.snap.png b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforeGoLineStartSmart5.snap.png
index 33c9517694..e73b7b1098 100644
Binary files a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforeGoLineStartSmart5.snap.png and b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforeGoLineStartSmart5.snap.png differ
diff --git a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforePrettify1.snap.png b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforePrettify1.snap.png
index 0bcb463791..3174be50f8 100644
Binary files a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforePrettify1.snap.png and b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforePrettify1.snap.png differ
diff --git a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforePrettify2.snap.png b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforePrettify2.snap.png
index 152bcb603f..7042165d69 100644
Binary files a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforePrettify2.snap.png and b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforePrettify2.snap.png differ
diff --git a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforePrettify3.snap.png b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforePrettify3.snap.png
index cccfd38882..c88f695784 100644
Binary files a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforePrettify3.snap.png and b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforePrettify3.snap.png differ
diff --git a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforePrettify4.snap.png b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforePrettify4.snap.png
index 798a3ac90c..0a51ab0309 100644
Binary files a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforePrettify4.snap.png and b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforePrettify4.snap.png differ
diff --git a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforePrettify6.snap.png b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforePrettify6.snap.png
index 5006f39b4d..8000d375c4 100644
Binary files a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforePrettify6.snap.png and b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforePrettify6.snap.png differ
diff --git a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforePrettify7.snap.png b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforePrettify7.snap.png
index 2cd8e9c5cf..31975d44bc 100644
Binary files a/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforePrettify7.snap.png and b/app/client/cypress/snapshots/JSEditorIndent_spec.js/jsObjBeforePrettify7.snap.png differ
diff --git a/app/client/cypress/snapshots/JSEditorSaveAndAutoIndent_spec.js/jsObjAfterSaveAndPrettify.snap.png b/app/client/cypress/snapshots/JSEditorSaveAndAutoIndent_spec.js/jsObjAfterSaveAndPrettify.snap.png
index 8bfc5894ea..f2f44d41bd 100644
Binary files a/app/client/cypress/snapshots/JSEditorSaveAndAutoIndent_spec.js/jsObjAfterSaveAndPrettify.snap.png and b/app/client/cypress/snapshots/JSEditorSaveAndAutoIndent_spec.js/jsObjAfterSaveAndPrettify.snap.png differ
diff --git a/app/client/cypress/snapshots/JSEditorSaveAndAutoIndent_spec.js/jsObjBeforeSaveAndPrettify.snap.png b/app/client/cypress/snapshots/JSEditorSaveAndAutoIndent_spec.js/jsObjBeforeSaveAndPrettify.snap.png
index 5006f39b4d..8000d375c4 100644
Binary files a/app/client/cypress/snapshots/JSEditorSaveAndAutoIndent_spec.js/jsObjBeforeSaveAndPrettify.snap.png and b/app/client/cypress/snapshots/JSEditorSaveAndAutoIndent_spec.js/jsObjBeforeSaveAndPrettify.snap.png differ
diff --git a/app/client/cypress/snapshots/WidgetsLayout_spec.js/inlineDisabled.snap.png b/app/client/cypress/snapshots/WidgetsLayout_spec.js/inlineDisabled.snap.png
index e123f96879..b77ef05696 100644
Binary files a/app/client/cypress/snapshots/WidgetsLayout_spec.js/inlineDisabled.snap.png and b/app/client/cypress/snapshots/WidgetsLayout_spec.js/inlineDisabled.snap.png differ
diff --git a/app/client/cypress/snapshots/WidgetsLayout_spec.js/inlineEnabled.snap.png b/app/client/cypress/snapshots/WidgetsLayout_spec.js/inlineEnabled.snap.png
index b42bf86634..4ef9d6efe1 100644
Binary files a/app/client/cypress/snapshots/WidgetsLayout_spec.js/inlineEnabled.snap.png and b/app/client/cypress/snapshots/WidgetsLayout_spec.js/inlineEnabled.snap.png differ
diff --git a/app/client/cypress/support/Pages/AggregateHelper.ts b/app/client/cypress/support/Pages/AggregateHelper.ts
index 1b6c584ed1..cb6ccd29f4 100644
--- a/app/client/cypress/support/Pages/AggregateHelper.ts
+++ b/app/client/cypress/support/Pages/AggregateHelper.ts
@@ -289,8 +289,8 @@ export class AggregateHelper {
     return exists === "noVerify"
       ? locator // Return the locator without verification if exists is "noVerify"
       : exists === "exist"
-      ? locator.should("have.length.at.least", 1)
-      : locator.should("have.length", 0);
+        ? locator.should("have.length.at.least", 1)
+        : locator.should("have.length", 0);
   }
 
   public GetNAssertElementText(
diff --git a/app/client/cypress/support/Pages/EntityExplorer.ts b/app/client/cypress/support/Pages/EntityExplorer.ts
index b8760c1d13..fb04637dee 100644
--- a/app/client/cypress/support/Pages/EntityExplorer.ts
+++ b/app/client/cypress/support/Pages/EntityExplorer.ts
@@ -1,4 +1,5 @@
 import { ObjectsRegistry } from "../Objects/Registry";
+import type { EntityItemsType } from "./AssertHelper";
 import { EntityItems } from "./AssertHelper";
 import EditorNavigation, {
   EntityType,
@@ -38,8 +39,7 @@ interface EntityActionParams {
     | "Export"
     | "Import";
   subAction?: string;
-  //@ts-expect-error: type mismatch
-  entityType?: EntityItems;
+  entityType?: EntityItemsType;
   toAssertAction?: boolean;
   toastToValidate?: string;
 }
@@ -82,6 +82,9 @@ export class EntityExplorer {
   }: EntityActionParams) {
     AppSidebar.navigate(AppSidebarButton.Editor);
     this.agHelper.Sleep();
+    if (entityType === EntityItems.Page) {
+      PageList.ShowList();
+    }
     cy.xpath(this._contextMenu(entityNameinLeftSidebar))
       .scrollIntoView()
       .last()
@@ -98,6 +101,9 @@ export class EntityExplorer {
         toastToValidate: toastToValidate,
       });
     }
+    if (entityType === EntityItems.Page) {
+      PageList.HideList();
+    }
   }
 
   public DeleteWidgetFromEntityExplorer(widgetNameinLeftSidebar: string) {
@@ -168,10 +174,10 @@ export class EntityExplorer {
       dropTargetId
         ? dropTargetId + this.locator._dropHere
         : parentWidgetType
-        ? this.locator._widgetInCanvas(parentWidgetType) +
-          " " +
-          this.locator._dropHere
-        : this.locator._dropHere,
+          ? this.locator._widgetInCanvas(parentWidgetType) +
+            " " +
+            this.locator._dropHere
+          : this.locator._dropHere,
     )
       .first()
       .trigger("mousemove", x, y, {
@@ -256,13 +262,17 @@ export class EntityExplorer {
     entityName: string,
     renameVal: string,
     viaMenu = false,
+    entityType?: EntityItemsType,
   ) {
     AppSidebar.navigate(AppSidebarButton.Editor);
-    PageList.ShowList();
+    if (entityType === EntityItems.Page && !viaMenu) {
+      PageList.ShowList();
+    }
     if (viaMenu)
       this.ActionContextMenuByEntityName({
         entityNameinLeftSidebar: entityName,
         action: "Edit name",
+        entityType,
       });
     else cy.xpath(PageLeftPane.listItemSelector(entityName)).dblclick();
     cy.xpath(this.locator._entityNameEditing(entityName))
@@ -271,6 +281,10 @@ export class EntityExplorer {
       .type("{enter}")
       .wait(300);
     this.agHelper.Sleep(); //allowing time for name change to reflect in EntityExplorer
-    PageLeftPane.assertPresence(renameVal);
+    if (entityType === EntityItems.Page) {
+      PageList.assertPresence(renameVal);
+    } else {
+      PageLeftPane.assertPresence(renameVal);
+    }
   }
 }
diff --git a/app/client/cypress/support/Pages/GitSync.ts b/app/client/cypress/support/Pages/GitSync.ts
index eec861a88e..7a409b0251 100644
--- a/app/client/cypress/support/Pages/GitSync.ts
+++ b/app/client/cypress/support/Pages/GitSync.ts
@@ -344,8 +344,7 @@ export class GitSync {
           "Unable to import application in workspace",
         ),
       );
-      this.agHelper.AssertElementExist(this.locator._btnSpinner);
-      this.agHelper.AssertElementAbsence(this.locator._btnSpinner, 70000); //Since page taking more time to laod in some cases
+      this.agHelper.WaitUntilEleAppear(this._branchName(branch + uid));
       this.agHelper.AssertElementVisibility(this._branchName(branch + uid));
       this.assertHelper.AssertNetworkStatus("getBranch");
       cy.wrap(branch + uid).as("gitbranchName");
diff --git a/app/client/cypress/support/Pages/IDE/LeftPane.ts b/app/client/cypress/support/Pages/IDE/LeftPane.ts
index 003a2f7039..1b5b644350 100644
--- a/app/client/cypress/support/Pages/IDE/LeftPane.ts
+++ b/app/client/cypress/support/Pages/IDE/LeftPane.ts
@@ -91,9 +91,12 @@ export class LeftPane {
         }
       });
   }
-  public selectedItem(): Cypress.Chainable {
+  public selectedItem(
+    exists?: "exist" | "not.exist" | "noVerify",
+  ): Cypress.Chainable {
     return ObjectsRegistry.AggregateHelper.GetElement(
       this.locators.activeItemSelector,
+      exists,
     );
   }
 
diff --git a/app/client/cypress/support/Pages/PageList.ts b/app/client/cypress/support/Pages/PageList.ts
index ca89ff269f..f08d4ac520 100644
--- a/app/client/cypress/support/Pages/PageList.ts
+++ b/app/client/cypress/support/Pages/PageList.ts
@@ -4,13 +4,14 @@ import EditorNavigation, {
   AppSidebarButton,
   EntityType,
 } from "./EditorNavigation";
+import { EntityItems } from "./AssertHelper";
 
 class PageList {
   private locators = {
     pageListItem: (pageName: string) =>
       `.t--entity.page:contains('${pageName}')`,
     newButton: ".pages .t--entity-add-btn",
-    newPageOption: (option: string) => `//span[text()='${option}']/parent::div`,
+    newPageOption: ".ads-v2-menu__menu-item-children",
     switcher: `.t--pages-switcher`,
   };
 
@@ -23,9 +24,9 @@ class PageList {
     AppSidebar.navigate(AppSidebarButton.Editor);
     this.ShowList();
     ObjectsRegistry.AggregateHelper.GetNClick(this.locators.newButton);
-    ObjectsRegistry.AggregateHelper.GetNClick(
-      this.locators.newPageOption(option),
-    );
+    cy.get(this.locators.newPageOption)
+      .contains(option, { matchCase: false })
+      .click({ force: true });
     if (option === "New blank page") {
       ObjectsRegistry.AssertHelper.AssertNetworkStatus("@createPage", 201);
 
@@ -40,37 +41,54 @@ class PageList {
     ObjectsRegistry.AggregateHelper.GetElement(
       this.locators.pageListItem(pageName),
     ).should("have.class", "activePage");
+    this.HideList();
   }
 
   public SelectedPageItem(): Cypress.Chainable {
+    this.ShowList();
     return cy.get(".t--entity.page > .active");
+    this.HideList();
   }
 
   public ClonePage(pageName = "Page1") {
     AppSidebar.navigate(AppSidebarButton.Editor);
-    this.ShowList();
     EditorNavigation.SelectEntityByName(pageName, EntityType.Page);
     ObjectsRegistry.EntityExplorer.ActionContextMenuByEntityName({
       entityNameinLeftSidebar: pageName,
       action: "Clone",
+      entityType: EntityItems.Page,
     });
     ObjectsRegistry.AssertHelper.AssertNetworkStatus("@clonePage", 201);
   }
 
   public ShowList() {
     cy.get(this.locators.switcher).then(($switcher) => {
-      const isActive: string | undefined = $switcher.attr("data-active");
-      if (isActive === "false") {
+      const isActive: string | undefined = $switcher
+        .parent()
+        .attr("data-state");
+      if (isActive === "closed") {
         cy.get(this.locators.switcher).click();
       }
     });
   }
 
+  public HideList() {
+    cy.get(this.locators.switcher).then(($switcher) => {
+      const isActive: string | undefined = $switcher
+        .parent()
+        .attr("data-state");
+      if (isActive === "open") {
+        cy.get(this.locators.switcher).click({ force: true });
+      }
+    });
+  }
+
   assertPresence(pageName: string) {
     this.ShowList();
     ObjectsRegistry.AggregateHelper.AssertElementVisibility(
       this.locators.pageListItem(pageName),
     );
+    this.HideList();
   }
 
   assertAbsence(pageName: string) {
@@ -78,6 +96,7 @@ class PageList {
     ObjectsRegistry.AggregateHelper.AssertElementAbsence(
       this.locators.pageListItem(pageName),
     );
+    this.HideList();
   }
 
   DeletePage(name: string) {
@@ -91,6 +110,7 @@ class PageList {
     cy.wait("@deletePage")
       .its("response.body.responseMeta.status")
       .should("eq", 200);
+    this.HideList();
   }
 }
 
diff --git a/app/client/cypress/support/Pages/PropertyPane.ts b/app/client/cypress/support/Pages/PropertyPane.ts
index 1febbd8188..40d3e0883e 100644
--- a/app/client/cypress/support/Pages/PropertyPane.ts
+++ b/app/client/cypress/support/Pages/PropertyPane.ts
@@ -172,6 +172,7 @@ export class PropertyPane {
 
   _dataIcon = (icon: string) => `[data-icon="${icon}"]`;
   _iconDropdown = "[data-test-id='virtuoso-scroller']";
+  _dropdownControlError = "[data-testid='t---dropdown-control-error']";
 
   public OpenJsonFormFieldSettings(fieldName: string) {
     this.agHelper.GetNClick(this._jsonFieldEdit(fieldName));
diff --git a/app/client/cypress/support/widgetCommands.js b/app/client/cypress/support/widgetCommands.js
index 113b931233..90c8d6a85a 100644
--- a/app/client/cypress/support/widgetCommands.js
+++ b/app/client/cypress/support/widgetCommands.js
@@ -15,6 +15,7 @@ const dynamicInputLocators = require("../locators/DynamicInput.json");
 const viewWidgetsPage = require("../locators/ViewWidgets.json");
 import { ObjectsRegistry } from "../support/Objects/Registry";
 import { TABLE_COLUMN_ORDER_KEY } from "./Constants";
+import { EntityItems } from "./Pages/AssertHelper";
 
 let pageidcopy = " ";
 
@@ -934,7 +935,12 @@ Cypress.Commands.add("Createpage", (pageName, navigateToCanvasPage = true) => {
   PageList.AddNewPage().then((oldPageName) => {
     if (pageName) {
       cy.wait(2000);
-      ee.RenameEntityFromExplorer(oldPageName, pageName, true);
+      ee.RenameEntityFromExplorer(
+        oldPageName,
+        pageName,
+        false,
+        EntityItems.Page,
+      );
     }
     cy.get("#loading").should("not.exist");
   });
diff --git a/app/client/cypress/tags.js b/app/client/cypress/tags.js
index a580cedf6f..08b66fd67d 100644
--- a/app/client/cypress/tags.js
+++ b/app/client/cypress/tags.js
@@ -59,8 +59,12 @@ module.exports = {
     "@tag.PropertyPane",
     "@tag.Workspace",
     "@tag.Sanity",
-    "@tag.Templates",
+    "@tag.Auditlogs",
+    "@tag.AccessControl",
+    "@tag.LicenseAndBilling",
     "@tag.Authentication",
+    "@tag.Provisioning",
+    "@tag.Templates",
     "@tag.MainContainer",
     "@tag.Visual",
     "@tag.Module",
diff --git a/app/client/package.json b/app/client/package.json
index 11a438ff90..229aae43cf 100644
--- a/app/client/package.json
+++ b/app/client/package.json
@@ -111,7 +111,7 @@
     "d3-geo": "^3.1.0",
     "dayjs": "^1.10.6",
     "deep-diff": "^1.0.2",
-    "design-system": "npm:@appsmithorg/design-system@2.1.37",
+    "design-system": "npm:@appsmithorg/design-system@2.1.38",
     "design-system-old": "npm:@appsmithorg/design-system-old@1.1.16",
     "downloadjs": "^1.4.7",
     "echarts": "^5.4.2",
diff --git a/app/client/packages/design-system/headless/src/components/Button/stories/Button.stories.mdx b/app/client/packages/design-system/headless/src/components/Button/stories/Button.stories.mdx
deleted file mode 100644
index e144e01615..0000000000
--- a/app/client/packages/design-system/headless/src/components/Button/stories/Button.stories.mdx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Button } from "@design-system/headless";
-import { Canvas, Meta, Story, ArgsTable } from "@storybook/addon-docs";
-
-<Meta
-  title="Design-system/Headless/Button"
-  component={Button}
-  args={{
-    children: "Button",
-  }}
-/>
-
-export const Template = (args) => <Button {...args} />;
-
-# Button
-
-A button is a clickable element that is used to trigger an action.
-
-<Canvas>
-  <Story name="Button">{Template.bind({})}</Story>
-</Canvas>
-
-<ArgsTable story="Button" of={Button} />
diff --git a/app/client/packages/design-system/headless/src/components/Button/stories/Button.stories.tsx b/app/client/packages/design-system/headless/src/components/Button/stories/Button.stories.tsx
new file mode 100644
index 0000000000..f98f65f27b
--- /dev/null
+++ b/app/client/packages/design-system/headless/src/components/Button/stories/Button.stories.tsx
@@ -0,0 +1,14 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import { Button } from "@design-system/headless";
+
+const meta: Meta<typeof Button> = {
+  component: Button,
+  title: "Design-system/headless/Button",
+  render: () => <Button>Button</Button>,
+};
+
+export default meta;
+type Story = StoryObj<typeof Button>;
+
+export const Main: Story = {};
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 f3ba579417..93adf2987f 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
@@ -76,8 +76,8 @@ const _Checkbox = (props: CheckboxProps, ref: CheckboxRef) => {
   const dataState = isIndeterminate
     ? "indeterminate"
     : Boolean(inputProps.checked)
-    ? "checked"
-    : "unchecked";
+      ? "checked"
+      : "unchecked";
 
   return (
     <label
diff --git a/app/client/packages/design-system/headless/src/components/Checkbox/stories/Checkbox.stories.tsx b/app/client/packages/design-system/headless/src/components/Checkbox/stories/Checkbox.stories.tsx
new file mode 100644
index 0000000000..53982742a9
--- /dev/null
+++ b/app/client/packages/design-system/headless/src/components/Checkbox/stories/Checkbox.stories.tsx
@@ -0,0 +1,22 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import { Checkbox, CheckboxGroup } from "@design-system/headless";
+
+const meta: Meta<typeof CheckboxGroup> = {
+  component: CheckboxGroup,
+  title: "Design-system/headless/CheckboxGroup",
+  subcomponents: {
+    Checkbox,
+  },
+  render: (args) => (
+    <CheckboxGroup {...args}>
+      <Checkbox value="value-1">Value 1</Checkbox>
+      <Checkbox value="value-2">Value 2</Checkbox>
+    </CheckboxGroup>
+  ),
+};
+
+export default meta;
+type Story = StoryObj<typeof Checkbox>;
+
+export const Main: Story = {};
diff --git a/app/client/packages/design-system/headless/src/components/Checkbox/stories/CheckboxGroup.stories.mdx b/app/client/packages/design-system/headless/src/components/Checkbox/stories/CheckboxGroup.stories.mdx
deleted file mode 100644
index 0a3168bbcc..0000000000
--- a/app/client/packages/design-system/headless/src/components/Checkbox/stories/CheckboxGroup.stories.mdx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { CheckboxGroup, Checkbox } from "@design-system/headless";
-import { Canvas, Meta, Story, ArgsTable } from "@storybook/addon-docs";
-
-<Meta
-  title="Design-system/Headless/CheckboxGroup"
-  component={CheckboxGroup}
-  args={{
-    label: "Checkbox group",
-    children: (
-      <>
-        <Checkbox value="option 1">Option 1</Checkbox>
-        <Checkbox value="option 2">Option 2</Checkbox>
-      </>
-    ),
-  }}
-/>
-
-export const Template = (args) => <CheckboxGroup {...args} />;
-
-# CheckboxGroup
-
-A Checkbox group is a group of radio buttons that are related to each other in some way. For example, they may all represent a single question on a survey. The Checkbox group component is a headless component that provides the logic and accessibility implementation for a group of radio buttons.
-
-Note: The `<input="checkbox" />` is visually hidden. Use the `<span data-icon />` to render a custom looking checkbox.
-
-<Canvas>
-  <Story name="CheckboxGroup">{Template.bind({})}</Story>
-</Canvas>
-
-<ArgsTable story="CheckboxGroup" of={CheckboxGroup} />
diff --git a/app/client/packages/design-system/headless/src/components/Menu/stories/Menu.stories.mdx b/app/client/packages/design-system/headless/src/components/Menu/stories/Menu.stories.mdx
deleted file mode 100644
index c70d69bdca..0000000000
--- a/app/client/packages/design-system/headless/src/components/Menu/stories/Menu.stories.mdx
+++ /dev/null
@@ -1,109 +0,0 @@
-import { Menu, Button, MenuList, Item } from "@design-system/headless";
-import { Canvas, Meta, Story, ArgsTable, Source } from "@storybook/addon-docs";
-
-<Meta title="Design-system/Headless/Menu" component={Menu} />
-
-export const Template = (args) => {
-  return (
-    <Menu {...args}>
-      <Button>Menu trigger</Button>
-      <MenuList>
-        <Item>Cut</Item>
-        <Item>Copy</Item>
-        <Item>Paste</Item>
-      </MenuList>
-    </Menu>
-  );
-};
-
-# Menu
-
-A menu displays a list of actions or options that a user can choose.
-
-<Canvas>
-  <Story name="Menu">{Template.bind({})}</Story>
-</Canvas>
-
-## Menu props
-
-<ArgsTable story="Menu" of={Menu} />
-
-## MenuList props
-
-<ArgsTable of={MenuList} />
-
-## Item props
-
-Item props are not pulled up in the ArgsTable, the data can be found [here](https://react-spectrum.adobe.com/react-aria/Menu.html#item).
-
-# Placement
-
-The placement of the menu can be changed by passing the `placement` prop.
-
-<Story name="Menu placement">
-  <Menu placement="left">
-    <Button>Left</Button>
-    <MenuList>
-      <Item key="copy">Copy</Item>
-      <Item key="cut">Cut</Item>
-      <Item key="paste">Paste</Item>
-    </MenuList>
-  </Menu>
-  <Menu placement="top">
-    <Button>Top</Button>
-    <MenuList>
-      <Item key="copy">Copy</Item>
-      <Item key="cut">Cut</Item>
-      <Item key="paste">Paste</Item>
-    </MenuList>
-  </Menu>
-  <Menu placement="bottom">
-    <Button>Bottom</Button>
-    <MenuList>
-      <Item key="copy">Copy</Item>
-      <Item key="cut">Cut</Item>
-      <Item key="paste">Paste</Item>
-    </MenuList>
-  </Menu>
-  <Menu placement="right">
-    <Button>Right</Button>
-    <MenuList>
-      <Item key="copy">Copy</Item>
-      <Item key="cut">Cut</Item>
-      <Item key="paste">Paste</Item>
-    </MenuList>
-  </Menu>
-</Story>
-
-# Menu example
-
-<Canvas>
-  <Story name="Menu example">
-    <Menu
-      items={[
-        { id: 1, name: "New" },
-        { id: 2, name: "Open" },
-      ]}
-      onAction={(key) => console.log(key)}
-    >
-      <Button>Menu trigger</Button>
-      <MenuList>{(item) => <Item key={item.name}>{item.name}</Item>}</MenuList>
-    </Menu>
-  </Story>
-</Canvas>
-
-<Source
-  dark
-  code={`
-<Menu
-  items={[
-    { id: 1, name: "New" },
-    { id: 2, name: "Open" },
-  ]}
-  onAction={(key) => console.log(key)}
->
-  <Button>Menu trigger</Button>
-  <MenuList>{(item) => <Item key={item.name}>{item.name}</Item>}</MenuList>
-</Menu>
-`}
-/>
diff --git a/app/client/packages/design-system/headless/src/components/Menu/stories/Menu.stories.tsx b/app/client/packages/design-system/headless/src/components/Menu/stories/Menu.stories.tsx
new file mode 100644
index 0000000000..de07b5fde7
--- /dev/null
+++ b/app/client/packages/design-system/headless/src/components/Menu/stories/Menu.stories.tsx
@@ -0,0 +1,75 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import { Menu, Button, MenuList, Item } from "@design-system/headless";
+
+/**
+ * A menu displays a list of actions or options that a user can choose.
+ *
+ * Item props are not pulled up in the ArgsTable, the data can be found [here](https://react-spectrum.adobe.com/react-aria/Menu.html#item).
+ */
+
+const meta: Meta<typeof Menu> = {
+  component: Menu,
+  title: "Design-system/headless/Menu",
+  subcomponents: {
+    //@ts-expect-error: don't need props to pass here
+    MenuList,
+  },
+  render: (args) => (
+    <Menu {...args}>
+      <Button>Menu trigger</Button>
+      <MenuList>
+        <Item>Cut</Item>
+        <Item>Copy</Item>
+        <Item>Paste</Item>
+      </MenuList>
+    </Menu>
+  ),
+};
+
+export default meta;
+type Story = StoryObj<typeof Menu>;
+
+export const Main: Story = {};
+
+/**
+ * The placement of the menu can be changed by passing the `placement` prop.
+ */
+export const Placement: Story = {
+  render: () => (
+    <>
+      <Menu placement="left">
+        <Button>Left</Button>
+        <MenuList>
+          <Item key="copy">Copy</Item>
+          <Item key="cut">Cut</Item>
+          <Item key="paste">Paste</Item>
+        </MenuList>
+      </Menu>
+      <Menu placement="top">
+        <Button>Top</Button>
+        <MenuList>
+          <Item key="copy">Copy</Item>
+          <Item key="cut">Cut</Item>
+          <Item key="paste">Paste</Item>
+        </MenuList>
+      </Menu>
+      <Menu placement="bottom">
+        <Button>Bottom</Button>
+        <MenuList>
+          <Item key="copy">Copy</Item>
+          <Item key="cut">Cut</Item>
+          <Item key="paste">Paste</Item>
+        </MenuList>
+      </Menu>
+      <Menu placement="right">
+        <Button>Right</Button>
+        <MenuList>
+          <Item key="copy">Copy</Item>
+          <Item key="cut">Cut</Item>
+          <Item key="paste">Paste</Item>
+        </MenuList>
+      </Menu>
+    </>
+  ),
+};
diff --git a/app/client/packages/design-system/headless/src/components/Popover/stories/Popover.stories.mdx b/app/client/packages/design-system/headless/src/components/Popover/stories/Popover.stories.mdx
deleted file mode 100644
index 340b180585..0000000000
--- a/app/client/packages/design-system/headless/src/components/Popover/stories/Popover.stories.mdx
+++ /dev/null
@@ -1,132 +0,0 @@
-import {
-  Popover,
-  PopoverTrigger,
-  PopoverContent,
-  PopoverModalContent,
-  Button,
-} from "@design-system/headless";
-import { ControlledPopover } from "./ControlledPopover";
-import { Canvas, Meta, Story, ArgsTable, Source } from "@storybook/addon-docs";
-
-<Meta title="Design-system/Headless/Popover" component={Popover} />
-
-export const Template = (args) => {
-  return (
-    <Popover {...args}>
-      <PopoverTrigger>
-        <Button>My trigger</Button>
-      </PopoverTrigger>
-      <PopoverContent>My popover</PopoverContent>
-    </Popover>
-  );
-};
-
-# Popover
-
-A popover is an interactive mini-dialog floating element that displays information related to an anchor element when the element is clicked.
-
-Based on the [headless Popover component](/?path=/docs/design-system-headless-popover--docs).
-
-<Canvas>
-  <Story name="Popover">{Template.bind({})}</Story>
-</Canvas>
-
-## Popover props
-
-<ArgsTable story="Popover" of={Popover} />
-
-## PopoverTrigger props
-
-<ArgsTable of={PopoverTrigger} />
-
-## PopoverContent props
-
-<ArgsTable of={PopoverContent} />
-
-# Modal
-
-A modal is a floating element that displays information that requires immediate attention, appearing over the page content and blocking interactions with the page until it is dismissed.
-
-## PopoverModalContent props
-
-<ArgsTable of={PopoverModalContent} />
-
-<Source
-  dark
-  code={`
-export const Modal = () => {
-  const [isOpen, setIsOpen] = useState(false);
-  const ref = useRef(null);
-
-    return (
-      <>
-        <Button onPress={() => setIsOpen(!isOpen)} ref={ref}>
-          Controlled popover
-        </Button>
-        <Popover isOpen={isOpen} setOpen={setIsOpen} triggerRef={ref}>
-          <PopoverContent>Controlled popover content</PopoverContent>
-        </Popover>
-      </>
-    );
-
-};
-`}
-/>
-
-# Placement
-
-The placement of the popover can be changed by passing the `placement` prop.
-
-<Canvas>
-  <Story name="Popover placement">
-    <Popover placement="left">
-      <PopoverTrigger>
-        <Button>Left</Button>
-      </PopoverTrigger>
-      <PopoverContent>My popover</PopoverContent>
-    </Popover>
-    <Popover placement="top">
-      <PopoverTrigger>
-        <Button>Top</Button>
-      </PopoverTrigger>
-      <PopoverContent>My popover</PopoverContent>
-    </Popover>
-    <Popover placement="bottom">
-      <PopoverTrigger>
-        <Button>Bottom</Button>
-      </PopoverTrigger>
-      <PopoverContent>My popover</PopoverContent>
-    </Popover>
-    <Popover placement="right">
-      <PopoverTrigger>
-        <Button>Right</Button>
-      </PopoverTrigger>
-      <PopoverContent>My popover</PopoverContent>
-    </Popover>
-  </Story>
-</Canvas>
-
-# Controlled popover
-
-<Canvas>
-  <Story name="Controlled popover">
-    <ControlledPopover />
-  </Story>
-</Canvas>
-
-<Source
-  dark
-  code={`
-export const ControlledPopover = () => {
-  const [isOpen, setIsOpen] = useState(false);
-  return (
-    <Popover isOpen={isOpen} setOpen={setIsOpen}>
-      <PopoverTrigger>
-        <Button onPress={() => setIsOpen(!isOpen)}>Controlled popover</Button>
-      </PopoverTrigger>
-      <PopoverContent>Controlled popover content</PopoverContent>
-    </Popover>
-  );
-};
-`}
-/>
diff --git a/app/client/packages/design-system/headless/src/components/Popover/stories/Popover.stories.tsx b/app/client/packages/design-system/headless/src/components/Popover/stories/Popover.stories.tsx
new file mode 100644
index 0000000000..bcb0ff147b
--- /dev/null
+++ b/app/client/packages/design-system/headless/src/components/Popover/stories/Popover.stories.tsx
@@ -0,0 +1,82 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import {
+  Popover,
+  PopoverTrigger,
+  PopoverContent,
+  PopoverModalContent,
+  Button,
+} from "@design-system/headless";
+import { ControlledPopover as ControlledPopoverExample } from "./ControlledPopover";
+
+/**
+ * A popover is an interactive mini-dialog floating element that displays information related to an anchor element when the element is clicked.
+ *
+ * Based on the [headless Popover component](/?path=/docs/design-system-headless-popover--docs).
+ *
+ * A popover is a floating element that displays information that requires immediate attention, appearing over the page content and blocking interactions with the page until it is dismissed.
+ */
+
+const meta: Meta<typeof Popover> = {
+  component: Popover,
+  title: "Design-system/headless/Popover",
+  subcomponents: {
+    //@ts-expect-error: don't need props to pass here
+    PopoverTrigger,
+    //@ts-expect-error: don't need props to pass here
+    PopoverContent,
+    //@ts-expect-error: don't need props to pass here
+    PopoverModalContent,
+  },
+  render: (args) => (
+    <Popover {...args}>
+      <PopoverTrigger>
+        <Button>My trigger</Button>
+      </PopoverTrigger>
+      <PopoverContent>My popover</PopoverContent>
+    </Popover>
+  ),
+};
+
+export default meta;
+type Story = StoryObj<typeof Popover>;
+
+export const Main: Story = {};
+
+/**
+ * The placement of the menu can be changed by passing the `placement` prop.
+ */
+export const Placement: Story = {
+  render: () => (
+    <>
+      <Popover placement="left">
+        <PopoverTrigger>
+          <Button>Left</Button>
+        </PopoverTrigger>
+        <PopoverContent>My popover</PopoverContent>
+      </Popover>
+      <Popover placement="top">
+        <PopoverTrigger>
+          <Button>Top</Button>
+        </PopoverTrigger>
+        <PopoverContent>My popover</PopoverContent>
+      </Popover>
+      <Popover placement="bottom">
+        <PopoverTrigger>
+          <Button>Bottom</Button>
+        </PopoverTrigger>
+        <PopoverContent>My popover</PopoverContent>
+      </Popover>
+      <Popover placement="right">
+        <PopoverTrigger>
+          <Button>Right</Button>
+        </PopoverTrigger>
+        <PopoverContent>My popover</PopoverContent>
+      </Popover>
+    </>
+  ),
+};
+
+export const ControlledPopover: Story = {
+  render: () => <ControlledPopoverExample />,
+};
diff --git a/app/client/packages/design-system/headless/src/components/Radio/stories/Radio.stories.tsx b/app/client/packages/design-system/headless/src/components/Radio/stories/Radio.stories.tsx
new file mode 100644
index 0000000000..9554d7d98f
--- /dev/null
+++ b/app/client/packages/design-system/headless/src/components/Radio/stories/Radio.stories.tsx
@@ -0,0 +1,28 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import { RadioGroup, Radio } from "@design-system/headless";
+
+/**
+ * A Radio group is a group of radio buttons that are related to each other in some way. For example, they may all represent a single question on a survey. The Radio group component is a headless component that provides the logic and accessibility implementation for a group of radio buttons.
+ *
+ * Note: The `<input="radio" />` is visually hidden by default. Use the `<span data-icon />` to render custom looking radio.
+ */
+const meta: Meta<typeof RadioGroup> = {
+  component: RadioGroup,
+  title: "Design-system/headless/RadioGroup",
+  subcomponents: {
+    //@ts-expect-error: don't need props to pass here
+    Radio,
+  },
+  render: (args) => (
+    <RadioGroup label="Radio group" {...args}>
+      <Radio value="option 1">Option 1</Radio>
+      <Radio value="option 2">Option 2</Radio>
+    </RadioGroup>
+  ),
+};
+
+export default meta;
+type Story = StoryObj<typeof RadioGroup>;
+
+export const Main: Story = {};
diff --git a/app/client/packages/design-system/headless/src/components/Radio/stories/RadioGroup.stories.mdx b/app/client/packages/design-system/headless/src/components/Radio/stories/RadioGroup.stories.mdx
deleted file mode 100644
index 904a43d8a3..0000000000
--- a/app/client/packages/design-system/headless/src/components/Radio/stories/RadioGroup.stories.mdx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { RadioGroup, Radio } from "@design-system/headless";
-import { Canvas, Meta, Story, ArgsTable } from "@storybook/addon-docs";
-
-<Meta
-  title="Design-system/Headless/RadioGroup"
-  component={RadioGroup}
-  args={{
-    label: "Radio group",
-    children: (
-      <>
-        <Radio value="option 1">Option 1</Radio>
-        <Radio value="option 2">Option 2</Radio>
-      </>
-    ),
-  }}
-/>
-
-export const Template = (args) => <RadioGroup {...args} />;
-
-# RadioGroup
-
-A Radio group is a group of radio buttons that are related to each other in some way. For example, they may all represent a single question on a survey. The Radio group component is a headless component that provides the logic and accessibility implementation for a group of radio buttons.
-
-Note: The `<input="radio" />` is visually hidden by default. Use the `<span data-icon />` to render custom looking radio.
-
-<Canvas>
-  <Story name="RadioGroup">{Template.bind({})}</Story>
-</Canvas>
-
-<ArgsTable story="RadioGroup" of={RadioGroup} />
diff --git a/app/client/packages/design-system/headless/src/components/TextInput/stories/TextInput.stories.mdx b/app/client/packages/design-system/headless/src/components/TextInput/stories/TextInput.stories.mdx
deleted file mode 100644
index 6b0bf3f3e5..0000000000
--- a/app/client/packages/design-system/headless/src/components/TextInput/stories/TextInput.stories.mdx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Canvas, Meta, Story, ArgsTable } from "@storybook/addon-docs";
-
-import { TextInput } from "../";
-
-<Meta
-  title="Design-system/headless/TextInput"
-  component={TextInput}
-  args={{
-    label: "Label",
-    placeholder: "Placeholder",
-  }}
-/>
-
-export const Template = (args) => <TextInput {...args} />;
-
-# TextInput
-
-TextInput component allows users to input text. It is mostly used in forms.
-
-<Canvas>
-  <Story name="TextInput">{Template.bind({})}</Story>
-</Canvas>
-
-# Props
-
-<ArgsTable of={TextInput} />
diff --git a/app/client/packages/design-system/headless/src/components/TextInput/stories/TextInput.stories.ts b/app/client/packages/design-system/headless/src/components/TextInput/stories/TextInput.stories.ts
new file mode 100644
index 0000000000..574e5525a5
--- /dev/null
+++ b/app/client/packages/design-system/headless/src/components/TextInput/stories/TextInput.stories.ts
@@ -0,0 +1,19 @@
+import type { Meta, StoryObj } from "@storybook/react";
+import { TextInput } from "@design-system/headless";
+
+/**
+ * TextInput component allows users to input text. It is mostly used in forms.
+ */
+const meta: Meta<typeof TextInput> = {
+  component: TextInput,
+  title: "Design-system/headless/TextInput",
+  args: {
+    label: "Label",
+    placeholder: "Placeholder",
+  },
+};
+
+export default meta;
+type Story = StoryObj<typeof TextInput>;
+
+export const Main: Story = {};
diff --git a/app/client/packages/design-system/headless/src/components/Tooltip/stories/Tooltip.stories.mdx b/app/client/packages/design-system/headless/src/components/Tooltip/stories/Tooltip.stories.mdx
deleted file mode 100644
index 92fe4d2fca..0000000000
--- a/app/client/packages/design-system/headless/src/components/Tooltip/stories/Tooltip.stories.mdx
+++ /dev/null
@@ -1,85 +0,0 @@
-import {
-  TooltipRoot,
-  TooltipTrigger,
-  TooltipContent,
-  Button,
-} from "@design-system/headless";
-import { Canvas, Meta, Story, ArgsTable } from "@storybook/addon-docs";
-
-<Meta
-  title="Design-system/Headless/Tooltip"
-  component={TooltipRoot}
-  args={{
-    open: undefined,
-    onOpenChange: undefined,
-  }}
-/>
-
-export const Template = (args) => {
-  return (
-    <TooltipRoot {...args}>
-      <TooltipTrigger>
-        <Button>My trigger</Button>
-      </TooltipTrigger>
-      <TooltipContent>My tooltip</TooltipContent>
-    </TooltipRoot>
-  );
-};
-
-# Tooltip
-
-A tooltip is a small pop-up that appears when a user places their cursor over an element such as a link or button. Tooltips can be used to provide users with additional information about an element without having to clutter up the UI with additional text.
-
-<Canvas>
-  <Story name="Tooltip">{Template.bind({})}</Story>
-</Canvas>
-
-<ArgsTable story="Tooltip" of={TooltipRoot} />
-
-# Placement
-
-The placement of the tooltip can be changed by passing the `placement` prop.
-
-<Canvas>
-  <Story name="Tooltip placement">
-    <TooltipRoot placement="left">
-      <TooltipTrigger>
-        <Button>Left</Button>
-      </TooltipTrigger>
-      <TooltipContent>My tooltip</TooltipContent>
-    </TooltipRoot>
-    <TooltipRoot placement="top">
-      <TooltipTrigger>
-        <Button>Top</Button>
-      </TooltipTrigger>
-      <TooltipContent>My tooltip</TooltipContent>
-    </TooltipRoot>
-    <TooltipRoot placement="bottom">
-      <TooltipTrigger>
-        <Button>Bottom</Button>
-      </TooltipTrigger>
-      <TooltipContent>My tooltip</TooltipContent>
-    </TooltipRoot>
-    <TooltipRoot placement="right">
-      <TooltipTrigger>
-        <Button>Right</Button>
-      </TooltipTrigger>
-      <TooltipContent>My tooltip</TooltipContent>
-    </TooltipRoot>
-  </Story>
-</Canvas>
-
-# Disabled
-
-If the trigger is disabled, the tooltip will not be displayed.
-
-<Canvas>
-  <Story name="Tooltip disabled">
-    <TooltipRoot>
-      <TooltipTrigger>
-        <Button isDisabled>Disabled</Button>
-      </TooltipTrigger>
-      <TooltipContent disabled>My tooltip</TooltipContent>
-    </TooltipRoot>
-  </Story>
-</Canvas>
diff --git a/app/client/packages/design-system/headless/src/components/Tooltip/stories/Tooltip.stories.tsx b/app/client/packages/design-system/headless/src/components/Tooltip/stories/Tooltip.stories.tsx
new file mode 100644
index 0000000000..4960294d40
--- /dev/null
+++ b/app/client/packages/design-system/headless/src/components/Tooltip/stories/Tooltip.stories.tsx
@@ -0,0 +1,81 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import {
+  TooltipRoot,
+  TooltipTrigger,
+  TooltipContent,
+  Button,
+} from "@design-system/headless";
+
+/**
+ * A tooltip is a small pop-up that appears when a user places their cursor over an element such as a link or button. Tooltips can be used to provide users with additional information about an element without having to clutter up the UI with additional text.
+ */
+const meta: Meta<typeof TooltipRoot> = {
+  component: TooltipRoot,
+  title: "Design-system/headless/Tooltip",
+  subcomponents: {
+    TooltipTrigger,
+    TooltipContent,
+  },
+  render: (args) => (
+    <TooltipRoot {...args}>
+      <TooltipTrigger>
+        <Button>My trigger</Button>
+      </TooltipTrigger>
+      <TooltipContent>My tooltip</TooltipContent>
+    </TooltipRoot>
+  ),
+};
+
+export default meta;
+type Story = StoryObj<typeof TooltipRoot>;
+
+export const Main: Story = {};
+
+/**
+ * The placement of the tooltip can be changed by passing the `placement` prop.
+ */
+export const Placement: Story = {
+  render: () => (
+    <>
+      <TooltipRoot placement="left">
+        <TooltipTrigger>
+          <Button>Left</Button>
+        </TooltipTrigger>
+        <TooltipContent>My tooltip</TooltipContent>
+      </TooltipRoot>
+      <TooltipRoot placement="top">
+        <TooltipTrigger>
+          <Button>Top</Button>
+        </TooltipTrigger>
+        <TooltipContent>My tooltip</TooltipContent>
+      </TooltipRoot>
+      <TooltipRoot placement="bottom">
+        <TooltipTrigger>
+          <Button>Bottom</Button>
+        </TooltipTrigger>
+        <TooltipContent>My tooltip</TooltipContent>
+      </TooltipRoot>
+      <TooltipRoot placement="right">
+        <TooltipTrigger>
+          <Button>Right</Button>
+        </TooltipTrigger>
+        <TooltipContent>My tooltip</TooltipContent>
+      </TooltipRoot>
+    </>
+  ),
+};
+
+/**
+ * If the trigger is disabled, the tooltip will not be displayed.
+ */
+export const Disabled: Story = {
+  render: () => (
+    <TooltipRoot>
+      <TooltipTrigger>
+        <Button isDisabled>Disabled</Button>
+      </TooltipTrigger>
+      <TooltipContent>My tooltip</TooltipContent>
+    </TooltipRoot>
+  ),
+};
diff --git a/app/client/packages/design-system/theming/src/stories/BoxShadow.stories.mdx b/app/client/packages/design-system/theming/src/stories/BoxShadow.mdx
similarity index 100%
rename from app/client/packages/design-system/theming/src/stories/BoxShadow.stories.mdx
rename to app/client/packages/design-system/theming/src/stories/BoxShadow.mdx
diff --git a/app/client/packages/design-system/theming/src/stories/Color.stories.mdx b/app/client/packages/design-system/theming/src/stories/Color.mdx
similarity index 100%
rename from app/client/packages/design-system/theming/src/stories/Color.stories.mdx
rename to app/client/packages/design-system/theming/src/stories/Color.mdx
diff --git a/app/client/packages/design-system/theming/src/stories/Dimension.stories.mdx b/app/client/packages/design-system/theming/src/stories/Dimension.mdx
similarity index 80%
rename from app/client/packages/design-system/theming/src/stories/Dimension.stories.mdx
rename to app/client/packages/design-system/theming/src/stories/Dimension.mdx
index 04ed880451..01fa1468fb 100644
--- a/app/client/packages/design-system/theming/src/stories/Dimension.stories.mdx
+++ b/app/client/packages/design-system/theming/src/stories/Dimension.mdx
@@ -6,6 +6,8 @@ import {
   StyledSquarePreview,
 } from "@design-system/storybook";
 
+import { Icon } from "@design-system/widgets";
+
 <Meta title="Design-system/Theme/Tokens/Dimension" />
 
 # Dimension
@@ -114,10 +116,14 @@ Border radii on various elements are fluid and additionally adjusted by theme co
 
 export const BorderRadius = () => {
   const { theme } = useTheme();
-  const { borderRadius } = theme;
+  console.log(theme);
+  const { borderRadiusElevation } = theme;
   return (
     <ThemeProvider theme={theme}>
-      <TokenTable prefix="border-radius" tokens={borderRadius}>
+      <TokenTable
+        prefix="border-radius-elevation"
+        tokens={borderRadiusElevation}
+      >
         {(cssVar) => (
           <StyledSquarePreview
             style={{
@@ -134,11 +140,37 @@ export const BorderRadius = () => {
 
 ### Icon Sizing
 
---
+export const IconSizing = () => {
+  const { theme } = useTheme();
+  const { iconSize } = theme;
+  return (
+    <ThemeProvider theme={theme}>
+      <TokenTable prefix="icon-size" tokens={iconSize}>
+        {(cssVar) => (
+          <Icon name="star" style={{ width: cssVar, height: cssVar }} />
+        )}
+      </TokenTable>
+    </ThemeProvider>
+  );
+};
+
+<IconSizing />
 
 ### Icon Stroke
 
---
+export const IconStroke = () => {
+  const { theme } = useTheme();
+  const { strokeWidth } = theme;
+  return (
+    <ThemeProvider theme={theme}>
+      <TokenTable prefix="stroke-width" tokens={strokeWidth}>
+        {(cssVar) => <Icon name="star" style={{ strokeWidth: cssVar }} />}
+      </TokenTable>
+    </ThemeProvider>
+  );
+};
+
+<IconStroke />
 
 [Table will be here once scale is implemented]
 
diff --git a/app/client/packages/design-system/theming/src/stories/Opacity.stories.mdx b/app/client/packages/design-system/theming/src/stories/Opacity.mdx
similarity index 100%
rename from app/client/packages/design-system/theming/src/stories/Opacity.stories.mdx
rename to app/client/packages/design-system/theming/src/stories/Opacity.mdx
diff --git a/app/client/packages/design-system/theming/src/stories/Theme.stories.mdx b/app/client/packages/design-system/theming/src/stories/Theme.mdx
similarity index 96%
rename from app/client/packages/design-system/theming/src/stories/Theme.stories.mdx
rename to app/client/packages/design-system/theming/src/stories/Theme.mdx
index 4a63513d59..4ee417fa21 100644
--- a/app/client/packages/design-system/theming/src/stories/Theme.stories.mdx
+++ b/app/client/packages/design-system/theming/src/stories/Theme.mdx
@@ -1,4 +1,4 @@
-import { Meta, ArgsTable } from "@storybook/addon-docs";
+import { Meta, ArgTypes } from "@storybook/blocks";
 import { ThemeProvider } from "@design-system/theming";
 
 <Meta title="Design-system/Theme/Theme" component={ThemeProvider} />
@@ -18,7 +18,7 @@ application, allowing for consistent styling across your entire application.
 
 export const Template = () => <ThemeProvider theme={{}} />;
 
-<ArgsTable of={ThemeProvider} />
+<ArgTypes of={ThemeProvider} />
 
 ## useTheme
 
diff --git a/app/client/packages/design-system/theming/src/stories/ZIndex.stories.mdx b/app/client/packages/design-system/theming/src/stories/ZIndex.mdx
similarity index 100%
rename from app/client/packages/design-system/theming/src/stories/ZIndex.stories.mdx
rename to app/client/packages/design-system/theming/src/stories/ZIndex.mdx
diff --git a/app/client/packages/design-system/widgets-old/src/Button/Button.stories.tsx b/app/client/packages/design-system/widgets-old/src/Button/Button.stories.tsx
deleted file mode 100644
index 1ed6e7cd64..0000000000
--- a/app/client/packages/design-system/widgets-old/src/Button/Button.stories.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import * as React from "react";
-import type { ComponentMeta, ComponentStory } from "@storybook/react";
-import { Button, Category, Size } from "@design-system/widgets-old";
-
-export default {
-  title: "Design System/Widgets-old/Button",
-  component: Button,
-  args: {
-    fill: true,
-    onClick: () => {
-      // eslint-disable-next-line no-console
-      console.log("Clicked");
-    },
-    size: Size.large,
-    tag: "button",
-    text: "Button",
-  },
-} as ComponentMeta<typeof Button>;
-
-// eslint-disable-next-line react/function-component-definition
-const Template: ComponentStory<typeof Button> = (args) => {
-  return <Button {...args} />;
-};
-
-export const Primary = Template.bind({});
-Primary.args = {
-  category: Category.primary,
-};
-
-export const Secondary = Template.bind({});
-Secondary.args = {
-  category: Category.secondary,
-};
-
-export const Tertiary = Template.bind({});
-Tertiary.args = {
-  category: Category.tertiary,
-};
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 658a5e9853..a531ccc060 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
@@ -512,8 +512,8 @@ const getButtonContent = (props: ButtonProps) => {
   const iconPos = props.iconPosition
     ? props.iconPosition
     : props.tag === "a"
-    ? IconPositions.right
-    : IconPositions.left;
+      ? IconPositions.right
+      : IconPositions.left;
   return (
     <>
       {iconPos === IconPositions.left && getIconContent(props)}
diff --git a/app/client/packages/design-system/widgets-old/src/Dropdown/Dropdown.stories.tsx b/app/client/packages/design-system/widgets-old/src/Dropdown/Dropdown.stories.tsx
deleted file mode 100644
index d4dba240e1..0000000000
--- a/app/client/packages/design-system/widgets-old/src/Dropdown/Dropdown.stories.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import * as React from "react";
-import type { ComponentMeta, ComponentStory } from "@storybook/react";
-
-import { Dropdown } from "@design-system/widgets-old";
-
-export default {
-  title: "Design System/Widgets-old/Dropdown",
-  component: Dropdown,
-} as ComponentMeta<typeof Dropdown>;
-
-// eslint-disable-next-line react/function-component-definition
-const Template: ComponentStory<typeof Dropdown> = (args) => {
-  return <Dropdown {...args} />;
-};
-
-const options = [
-  { label: "One", value: "one" },
-  { label: "Two", value: "two" },
-  { label: "Three", value: "three" },
-  { label: "Four", value: "four" },
-  { label: "Five", value: "five" },
-  { label: "Six", value: "six" },
-  { label: "Seven", value: "seven" },
-  { label: "Eight", value: "eight" },
-];
-const selected = [
-  {
-    label: "One",
-    value: "one",
-  },
-];
-
-export const DropdownExample = Template.bind({});
-DropdownExample.storyName = "Dropdown";
-DropdownExample.args = {
-  allowDeselection: true,
-  containerClassName: "dropdown-container",
-  isMultiSelect: true,
-  // eslint-disable-next-line no-console
-  onSelect: () => console.log("selected"),
-  options,
-  selected,
-  showLabelOnly: true,
-};
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 ee8cc53117..7278b3299e 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
@@ -258,16 +258,16 @@ const Selected = styled.div<{
     props.hasError
       ? `border: 1px solid var(--ads-danger-main)`
       : props.isOpen
-      ? `border: 1px solid ${
-          !!props.bgColor
-            ? props.bgColor
-            : "var(--appsmith-input-focus-border-color)"
-        }`
-      : props.disabled
-      ? `border: 1px solid var(--ads-dropdown-disabled-header-background-color)`
-      : `border: 1px solid ${
-          !!props.bgColor ? props.bgColor : "var(--ads-color-black-250)"
-        }`};
+        ? `border: 1px solid ${
+            !!props.bgColor
+              ? props.bgColor
+              : "var(--appsmith-input-focus-border-color)"
+          }`
+        : props.disabled
+          ? `border: 1px solid var(--ads-dropdown-disabled-header-background-color)`
+          : `border: 1px solid ${
+              !!props.bgColor ? props.bgColor : "var(--ads-color-black-250)"
+            }`};
   .${Classes.TEXT} {
     text-overflow: ellipsis;
     white-space: nowrap;
@@ -280,8 +280,8 @@ const Selected = styled.div<{
             !!props.bgColor
               ? "var(--ads-color-black-0)"
               : props.selected
-              ? "var(--ads-dropdown-selected-header-text-color)"
-              : "var(--ads-dropdown-default-header-text-color)"
+                ? "var(--ads-dropdown-selected-header-text-color)"
+                : "var(--ads-dropdown-default-header-text-color)"
           }`};
   }
   &:hover {
@@ -463,8 +463,8 @@ const OptionWrapper = styled.div<{
       props.disabled
         ? "var(--ads-color-black-470)"
         : props.selected
-        ? "var(--ads-dropdown-default-menu-hover-text-color)"
-        : "var(--ads-dropdown-default-menu-text-color)"};
+          ? "var(--ads-dropdown-default-menu-hover-text-color)"
+          : "var(--ads-dropdown-default-menu-text-color)"};
   }
   .${Classes.ICON} {
     margin-right: var(--ads-spaces-5);
@@ -706,8 +706,8 @@ function DefaultDropDownValueNode({
         ? selected.label
         : selected.value
       : placeholder
-      ? placeholder
-      : "Please select an option.";
+        ? placeholder
+        : "Please select an option.";
 
   function Label() {
     if (isMultiSelect && Array.isArray(selected) && selected.length) {
@@ -1123,8 +1123,9 @@ 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/Icon.stories.tsx b/app/client/packages/design-system/widgets-old/src/Icon/Icon.stories.tsx
deleted file mode 100644
index 2422d8e68d..0000000000
--- a/app/client/packages/design-system/widgets-old/src/Icon/Icon.stories.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import * as React from "react";
-import type { ComponentMeta, ComponentStory } from "@storybook/react";
-
-import {
-  Icon as IconComponent,
-  IconCollection,
-  IconSize,
-} from "@design-system/widgets-old";
-import styled from "styled-components";
-
-export default {
-  title: "Design System/Widgets-old/Icon",
-  component: IconComponent,
-  argTypes: {
-    size: {
-      control: "select",
-      options: [
-        IconSize.XXS,
-        IconSize.XS,
-        IconSize.SMALL,
-        IconSize.MEDIUM,
-        IconSize.LARGE,
-        IconSize.XL,
-        IconSize.XXL,
-        IconSize.XXXL,
-        IconSize.XXXXL,
-      ],
-    },
-    name: {
-      control: "select",
-      options: IconCollection,
-    },
-  },
-} as ComponentMeta<typeof IconComponent>;
-
-// eslint-disable-next-line react/function-component-definition
-const Template: ComponentStory<typeof IconComponent> = (args) => (
-  <IconComponent {...args} />
-);
-
-export const Icon = Template.bind({});
-Icon.args = {
-  name: "filter",
-  size: IconSize.XXXXL,
-  fillColor: "gray",
-  withWrapper: false,
-};
-
-const IconWrapper = styled.div`
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  height: 4rem;
-`;
-
-const AllIconsWrapper = styled.div`
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-`;
-
-export const AllIcons = () => {
-  return (
-    <AllIconsWrapper>
-      {IconCollection.map((icon, index) => (
-        <IconWrapper key={index}>
-          <IconComponent name={icon} size={IconSize.XXXXL} />
-          <p>{icon}</p>
-        </IconWrapper>
-      ))}
-    </AllIconsWrapper>
-  );
-};
-
-AllIcons.decorators = [
-  (Story: any) => (
-    <div style={{ height: "75%", width: "25%" }}>
-      <Story />
-    </div>
-  ),
-];
diff --git a/app/client/packages/design-system/widgets-old/src/LabelWithTooltip/LabelWithTooltip.stories.tsx b/app/client/packages/design-system/widgets-old/src/LabelWithTooltip/LabelWithTooltip.stories.tsx
deleted file mode 100644
index 4a62d3f4a7..0000000000
--- a/app/client/packages/design-system/widgets-old/src/LabelWithTooltip/LabelWithTooltip.stories.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import * as React from "react";
-import type { ComponentMeta, ComponentStory } from "@storybook/react";
-
-// change ThisComponentName to the name of the component you are writing a story for
-import { LabelWithTooltip, LabelPosition } from "@design-system/widgets-old";
-import { Alignment } from "@blueprintjs/core";
-
-export default {
-  // change ComponentDisplay to the name of the component you are writing a story for
-  title: "Design System/Widgets-old/LabelWithTooltip",
-  component: LabelWithTooltip,
-} as ComponentMeta<typeof LabelWithTooltip>;
-
-// eslint-disable-next-line react/function-component-definition
-const Template: ComponentStory<typeof LabelWithTooltip> = (args) => {
-  return <LabelWithTooltip {...args} />;
-};
-
-export const LabelWithTooltipExample = Template.bind({});
-LabelWithTooltipExample.storyName = "Label With Tooltip";
-LabelWithTooltipExample.args = {
-  alignment: Alignment.CENTER,
-  compact: true,
-  disabled: false,
-  inline: true,
-  loading: false,
-  optionCount: 4,
-  position: LabelPosition.Auto,
-  text: "this is a Label",
-  helpText: "Here is the tooltip",
-};
diff --git a/app/client/packages/design-system/widgets-old/src/ListSegmentHeader/ListSegmentHeader.stories.tsx b/app/client/packages/design-system/widgets-old/src/ListSegmentHeader/ListSegmentHeader.stories.tsx
deleted file mode 100644
index 511d47a1b1..0000000000
--- a/app/client/packages/design-system/widgets-old/src/ListSegmentHeader/ListSegmentHeader.stories.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import * as React from "react";
-import type { ComponentMeta, ComponentStory } from "@storybook/react";
-
-// change ThisComponentName to the name of the component you are writing a story for
-import { SegmentHeader } from "@design-system/widgets-old";
-
-export default {
-  // change ComponentDisplay to the name of the component you are writing a story for
-  title: "Design System/Widgets-old/SegmentHeader",
-  component: SegmentHeader,
-} as ComponentMeta<typeof SegmentHeader>;
-
-// eslint-disable-next-line react/function-component-definition
-const Template: ComponentStory<typeof SegmentHeader> = (args) => {
-  return <SegmentHeader {...args} />;
-};
-
-export const ListSegmentHeader = Template.bind({});
-ListSegmentHeader.args = {
-  title: "The Bee Movie",
-};
diff --git a/app/client/packages/design-system/widgets-old/src/MenuDivider/MenuDivider.stories.tsx b/app/client/packages/design-system/widgets-old/src/MenuDivider/MenuDivider.stories.tsx
deleted file mode 100644
index adcf0cd14d..0000000000
--- a/app/client/packages/design-system/widgets-old/src/MenuDivider/MenuDivider.stories.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import * as React from "react";
-import type { ComponentMeta, ComponentStory } from "@storybook/react";
-
-import { MenuDivider } from "@design-system/widgets-old";
-
-export default {
-  title: "Design System/Widgets-old/Menu Divider",
-  component: MenuDivider,
-} as ComponentMeta<typeof MenuDivider>;
-
-const Template: ComponentStory<typeof MenuDivider> = () => (
-  <div style={{ minWidth: "8rem" }}>
-    <MenuDivider />
-  </div>
-);
-
-export const MenuDividerStory = Template.bind({});
-MenuDividerStory.storyName = "Menu Divider";
diff --git a/app/client/packages/design-system/widgets-old/src/ScrollIndicator/ScrollIndicator.stories.tsx b/app/client/packages/design-system/widgets-old/src/ScrollIndicator/ScrollIndicator.stories.tsx
deleted file mode 100644
index fdf772a797..0000000000
--- a/app/client/packages/design-system/widgets-old/src/ScrollIndicator/ScrollIndicator.stories.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import * as React from "react";
-import { useRef } from "react";
-import type { ComponentStory, ComponentMeta } from "@storybook/react";
-
-import { ScrollIndicator } from "@design-system/widgets-old";
-
-export default {
-  title: "Design System/Widgets-old/Scroll Indicator",
-  component: ScrollIndicator,
-} as ComponentMeta<typeof ScrollIndicator>;
-
-const Template: ComponentStory<typeof ScrollIndicator> = () => {
-  const containerRef = useRef<HTMLDivElement>(null);
-  return (
-    <div
-      ref={containerRef}
-      style={{
-        height: "400px",
-        width: "40vw",
-        backgroundColor: "#8a8383c4",
-        overflow: "scroll",
-      }}
-    >
-      <div style={{ height: "800px" }} />
-      <ScrollIndicator
-        alwaysShowScrollbar
-        containerRef={containerRef}
-        mode="DARK"
-        right="0"
-        top="0"
-      />
-    </div>
-  );
-};
-
-export const ScrollIndicatorStory = Template.bind({});
-ScrollIndicatorStory.storyName = "Scroll Indicator";
diff --git a/app/client/packages/design-system/widgets-old/src/SearchComponent/SearchComponent.stories.tsx b/app/client/packages/design-system/widgets-old/src/SearchComponent/SearchComponent.stories.tsx
deleted file mode 100644
index 6958983931..0000000000
--- a/app/client/packages/design-system/widgets-old/src/SearchComponent/SearchComponent.stories.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import * as React from "react";
-import { SearchComponent } from "@design-system/widgets-old";
-
-import type { ComponentStory } from "@storybook/react";
-
-// TODO: How to write well-typed stories for a class component?
-export default {
-  title: "Design System/Widgets-old/Search Input",
-  component: SearchComponent,
-};
-
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-const Template: ComponentStory<typeof SearchComponent> = (args) => (
-  <SearchComponent {...args} />
-);
-
-export const SearchInput = Template.bind({});
-SearchInput.args = {
-  onSearch: () => {
-    // eslint-disable-next-line no-console
-    console.log("test");
-  },
-  placeholder: "This is a placeholder",
-  value: "",
-};
diff --git a/app/client/packages/design-system/widgets-old/src/Spinner/Spinner.stories.tsx b/app/client/packages/design-system/widgets-old/src/Spinner/Spinner.stories.tsx
deleted file mode 100644
index 4a2369eaf6..0000000000
--- a/app/client/packages/design-system/widgets-old/src/Spinner/Spinner.stories.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import * as React from "react";
-import {
-  IconSize,
-  Spinner as SpinnerComponent,
-} from "@design-system/widgets-old";
-
-import type { ComponentMeta, ComponentStory } from "@storybook/react";
-
-export default {
-  title: "Design System/Widgets-old/Spinner",
-  component: SpinnerComponent,
-} as ComponentMeta<typeof SpinnerComponent>;
-
-// eslint-disable-next-line react/function-component-definition
-const Template: ComponentStory<typeof SpinnerComponent> = (args) => (
-  <SpinnerComponent {...args} />
-);
-
-export const Spinner = Template.bind({});
-Spinner.args = {
-  size: IconSize.SMALL,
-};
diff --git a/app/client/packages/design-system/widgets-old/src/TableDropdown/TableDropdown.stories.tsx b/app/client/packages/design-system/widgets-old/src/TableDropdown/TableDropdown.stories.tsx
deleted file mode 100644
index 184f31caf7..0000000000
--- a/app/client/packages/design-system/widgets-old/src/TableDropdown/TableDropdown.stories.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import * as React from "react";
-import type { ComponentMeta, ComponentStory } from "@storybook/react";
-
-import { TableDropdown as TableDropdownComponent } from "@design-system/widgets-old";
-
-export default {
-  title: "Design System/Widgets-old/TableDropdown",
-  component: TableDropdownComponent,
-} as ComponentMeta<typeof TableDropdownComponent>;
-
-// eslint-disable-next-line react/function-component-definition
-const Template: ComponentStory<typeof TableDropdownComponent> = (args) => {
-  return <TableDropdownComponent {...args} />;
-};
-
-export const TableDropdown = Template.bind({});
-TableDropdown.args = {
-  options: [
-    {
-      id: "1",
-      name: "Option 1",
-      desc: "Option 1 description",
-    },
-    {
-      id: "2",
-      name: "Option 2",
-      desc: "Option 2 description",
-    },
-    {
-      id: "3",
-      name: "Option 3",
-      desc: "Option 3 description",
-    },
-  ],
-  selectedIndex: 0,
-  onSelect: (option: any) => {
-    // eslint-disable-next-line no-console
-    console.log(option);
-  },
-};
diff --git a/app/client/packages/design-system/widgets-old/src/Text/Text.stories.tsx b/app/client/packages/design-system/widgets-old/src/Text/Text.stories.tsx
deleted file mode 100644
index dff4655a69..0000000000
--- a/app/client/packages/design-system/widgets-old/src/Text/Text.stories.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import * as React from "react";
-import type { ComponentMeta, ComponentStory } from "@storybook/react";
-
-import { Text as TextComponent, TextType } from "@design-system/widgets-old";
-
-export default {
-  title: "Design System/Widgets-old/Text",
-  component: TextComponent,
-} as ComponentMeta<typeof TextComponent>;
-
-// eslint-disable-next-line react/function-component-definition
-const Template: ComponentStory<typeof TextComponent> = (args) => {
-  return <TextComponent {...args}> Some Content 🍎 </TextComponent>;
-};
-
-export const Text = Template.bind({});
-Text.args = {
-  type: TextType.P0,
-};
diff --git a/app/client/packages/design-system/widgets-old/src/Text/index.tsx b/app/client/packages/design-system/widgets-old/src/Text/index.tsx
index f3ce116bab..8872278b44 100644
--- a/app/client/packages/design-system/widgets-old/src/Text/index.tsx
+++ b/app/client/packages/design-system/widgets-old/src/Text/index.tsx
@@ -105,8 +105,8 @@ const Text = styled.span.attrs<TextProps>(({ className, cypressSelector }) => ({
     props.highlight
       ? "var(--ads-text-highlight-color)"
       : props.color
-      ? props.color
-      : typeSelector(props)};
+        ? props.color
+        : typeSelector(props)};
   text-transform: ${(props) => (props.case ? props.case : "none")};
   text-align: ${(props) => (props.textAlign ? props.textAlign : "normal")};
 `;
diff --git a/app/client/packages/design-system/widgets-old/src/Toast/Toast.stories.tsx b/app/client/packages/design-system/widgets-old/src/Toast/Toast.stories.tsx
deleted file mode 100644
index bd1bc2f97a..0000000000
--- a/app/client/packages/design-system/widgets-old/src/Toast/Toast.stories.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import * as React from "react";
-import type { ComponentMeta, ComponentStory } from "@storybook/react";
-
-import { ToastComponent, Variant, Button } from "@design-system/widgets-old";
-
-export default {
-  // change ComponentDisplay to the name of the component you are writing a story for
-  title: "Design System/Widgets-old/Toast",
-  component: ToastComponent,
-} as ComponentMeta<typeof ToastComponent>;
-
-// eslint-disable-next-line react/function-component-definition
-const Template: ComponentStory<typeof ToastComponent> = (args) => {
-  return <ToastComponent {...args} />;
-};
-
-export const Toast = Template.bind({});
-Toast.args = {
-  text: "I hope you have good bread",
-  variant: Variant.success,
-};
-
-const DebugButton = () => (
-  <Button
-    icon="bug"
-    tag="button"
-    text="Debug"
-    type="button"
-    variant={Variant.danger}
-  />
-);
-
-export const ToastWithDebugButton = Template.bind({});
-ToastWithDebugButton.args = {
-  text: "Different bread pop",
-  variant: Variant.danger,
-  showDebugButton: {
-    component: DebugButton,
-    componentProps: {
-      className: "t--toast-debug-button",
-      source: "TOAST",
-    },
-  },
-};
diff --git a/app/client/packages/design-system/widgets-old/src/Toast/index.tsx b/app/client/packages/design-system/widgets-old/src/Toast/index.tsx
index 053f929538..6d238e4be7 100644
--- a/app/client/packages/design-system/widgets-old/src/Toast/index.tsx
+++ b/app/client/packages/design-system/widgets-old/src/Toast/index.tsx
@@ -95,8 +95,8 @@ const ToastBody = styled.div<{
           props.variant === Variant.warning
             ? "var(--ads-toast-icon-fill-color)"
             : props.variant === Variant.danger
-            ? "var(--ads-color-black-0)"
-            : "var(--ads-dropdown-disabled-header-text-color)"};
+              ? "var(--ads-color-black-0)"
+              : "var(--ads-dropdown-disabled-header-text-color)"};
       }
       rect {
         ${(props) =>
diff --git a/app/client/packages/design-system/widgets-old/src/Tooltip/Tooltip.stories.tsx b/app/client/packages/design-system/widgets-old/src/Tooltip/Tooltip.stories.tsx
deleted file mode 100644
index 1ac15d93ef..0000000000
--- a/app/client/packages/design-system/widgets-old/src/Tooltip/Tooltip.stories.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import * as React from "react";
-import type { ComponentMeta, ComponentStory } from "@storybook/react";
-
-import { TooltipComponent } from "@design-system/widgets-old";
-
-export default {
-  title: "Design System/Widgets-old/Tooltip",
-  component: TooltipComponent,
-} as ComponentMeta<typeof TooltipComponent>;
-
-// eslint-disable-next-line react/function-component-definition
-const Template: ComponentStory<typeof TooltipComponent> = (args) => (
-  <TooltipComponent {...args}>Hover over me 😁</TooltipComponent>
-);
-
-export const Tooltip = Template.bind({});
-
-Tooltip.args = {
-  hoverOpenDelay: 200,
-  content: "Something helpful you can put here 💁",
-};
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 371602e997..665a7ecb6e 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
@@ -24,8 +24,8 @@ export const IconWrapper = styled.div<IconProps>`
     props.disabled
       ? "not-allowed"
       : props.onClick
-      ? "pointer"
-      : props.cursor ?? "default"};
+        ? "pointer"
+        : props.cursor ?? "default"};
   opacity: ${(props) => (props.disabled ? 0.5 : 1)};
 
   && svg {
diff --git a/app/client/packages/design-system/widgets/src/components/ActionGroup/stories/ActionGroup.stories.mdx b/app/client/packages/design-system/widgets/src/components/ActionGroup/stories/ActionGroup.stories.mdx
deleted file mode 100644
index 6ed4b13d32..0000000000
--- a/app/client/packages/design-system/widgets/src/components/ActionGroup/stories/ActionGroup.stories.mdx
+++ /dev/null
@@ -1,142 +0,0 @@
-import {
-  Flex,
-  ActionGroup,
-  COLORS,
-  BUTTON_VARIANTS,
-  Item,
-  SIZES,
-} from "@design-system/widgets";
-import { Canvas, Meta, Story, ArgsTable, Source } from "@storybook/addon-docs";
-
-<Meta title="Design-system/Widgets/Action Group" component={ActionGroup} />
-
-# Action Group
-
-A `ActionGroup` is a group of `ActionGroupItem` that are visually connected together.
-The `ActionGroupItem` accepts the same props as the `Button` except `variant` and `color`.
-More information about `Button` props you can find [here](?path=/docs/design-system-widgets-button--docs).
-
-export const Template = (args) => {
-  return (
-    <ActionGroup {...args} onAction={console.log}>
-      <Item key="option-1" icon="heart">
-        Option 1
-      </Item>
-      <Item key="option-2">Option 2</Item>
-      <Item key="option-3">Option 3</Item>
-      <Item key="option-4">Option 4</Item>
-    </ActionGroup>
-  );
-};
-
-<Canvas>
-  <Story name="Action Group">{Template.bind({})}</Story>
-</Canvas>
-
-<ArgsTable story="Action Group" of={ActionGroup} />
-
-## Size
-
-<Story name="Size">
-  <Flex gap="spacing-2" direction="column">
-    {Object.keys(SIZES)
-      .filter((size) => !["large"].includes(size))
-      .map((size) => (
-        <ActionGroup size={size} key={size}>
-          <Item key="option-1">Option 1</Item>
-          <Item key="option-2">Option 2</Item>
-          <Item key="option-3">Option 3</Item>
-          <Item key="option-4">Option 4</Item>
-        </ActionGroup>
-      ))}
-  </Flex>
-</Story>
-
-## Orientation
-
-The `ActionGroup` can be oriented horizontally or vertically. By default it is oriented horizontally.
-
-<Story name="Orientation">
-  <ActionGroup orientation="vertical">
-    <Item key="option-1">Option 1</Item>
-    <Item key="option-2">Option 2</Item>
-    <Item key="option-3">Option 3</Item>
-    <Item key="option-4">Option 4</Item>
-  </ActionGroup>
-</Story>
-
-## Density
-
-The `ActionGroup` can be `compact` or `regular`. By default it is regular.
-
-<Story name="Density">
-  <ActionGroup density="compact">
-    <Item key="option-1">Option 1</Item>
-    <Item key="option-2">Option 2</Item>
-    <Item key="option-3">Option 3</Item>
-    <Item key="option-4">Option 4</Item>
-  </ActionGroup>
-</Story>
-
-## Semantic
-
-`Button` component has 3 visual style variants and 5 semantic color options
-
-<Story name="Semantic">
-  <Flex direction="column" gap="spacing-4" alignItems="center">
-    {Object.values(BUTTON_VARIANTS).map((variant) =>
-      Object.values(COLORS).map((color) => (
-        <ActionGroup
-          variant={variant}
-          color={color}
-          key={`${variant}-${color}`}
-        >
-          <Item>
-            {variant} {color}
-          </Item>
-          <Item>
-            {variant} {color}
-          </Item>
-          <Item>
-            {variant} {color}
-          </Item>
-        </ActionGroup>
-      )),
-    )}
-  </Flex>
-</Story>
-
-## OverflowMode
-
-The `ActionGroup` can be `collapse`. By default it is not collapsed. When collpaised, the `ActionGroup` will show items based on the width available. The rest of the items will be shown under a dropdown menu.
-
-<Story name="OverflowMode">
-  <div style={{ maxWidth: 150 }}>
-    <ActionGroup overflowMode="collapse" variant="outlined">
-      <Item key="option-1" icon="file">
-        Option 1
-      </Item>
-      <Item key="option-2">Option 2</Item>
-      <Item isSeparator />
-      <Item key="option-3" icon="file">
-        {"Option 3"}
-      </Item>
-      <Item key="option-4" icon="trash" iconPosition="end" color="negative">
-        {"Option 4"}
-      </Item>
-    </ActionGroup>
-  </div>
-</Story>
-
-## Disabled Keys
-
-The `ActionGroup` can have disabled keys. The disabled keys will be disabled in the `ActionGroup` and will not trigger the `onAction` callback.
-
-<Story name="Disabled Keys">
-  <ActionGroup disabledKeys={["option-2", "option-4"]}>
-    <Item key="option-1">Option 1</Item>
-    <Item key="option-2">Option 2</Item>
-    <Item key="option-3">Option 3</Item>
-    <Item key="option-4">Option 4</Item>
-  </ActionGroup>
-</Story>
diff --git a/app/client/packages/design-system/widgets/src/components/ActionGroup/stories/ActionGroup.stories.tsx b/app/client/packages/design-system/widgets/src/components/ActionGroup/stories/ActionGroup.stories.tsx
new file mode 100644
index 0000000000..396ff60fda
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/ActionGroup/stories/ActionGroup.stories.tsx
@@ -0,0 +1,186 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import {
+  Flex,
+  ActionGroup,
+  COLORS,
+  BUTTON_VARIANTS,
+  Item,
+  SIZES,
+} from "@design-system/widgets";
+
+/**
+ * A `ActionGroup` is a group of `Item` that are visually connected together.
+ * The `Item` accepts the same props as the `Button` except `variant` and `color`.
+ * More information about `Button` props you can find [here](?path=/docs/design-system-widgets-button--docs).
+ */
+const meta: Meta<typeof ActionGroup> = {
+  component: ActionGroup,
+  title: "Design-system/Widgets/ActionGroup",
+};
+
+export default meta;
+type Story = StoryObj<typeof ActionGroup>;
+
+export const Main: Story = {
+  render: (args) => (
+    <ActionGroup {...args}>
+      <Item icon="heart" key="option-1">
+        Option 1
+      </Item>
+      <Item key="option-2">Option 2</Item>
+      <Item key="option-3">Option 3</Item>
+      <Item key="option-4">Option 4</Item>
+    </ActionGroup>
+  ),
+};
+
+/**
+ * There are 3 variants of the ActionGroup component.
+ */
+export const Variants: Story = {
+  render: () => (
+    <Flex gap="1rem" wrap="wrap">
+      {Object.values(BUTTON_VARIANTS).map((variant) => (
+        <ActionGroup key={`${variant}`} variant={variant}>
+          <Item>{variant}</Item>
+          <Item>{variant}</Item>
+          <Item>{variant}</Item>
+        </ActionGroup>
+      ))}
+    </Flex>
+  ),
+};
+
+/**
+ * `ActionGroup` component has 3 visual style variants and 5 semantic color options
+ */
+export const Semantic: Story = {
+  render: () => (
+    <Flex alignItems="center" direction="column" gap="spacing-4">
+      {Object.values(BUTTON_VARIANTS).map((variant) =>
+        Object.values(COLORS).map((color) => (
+          <ActionGroup
+            color={color}
+            key={`${variant}-${color}`}
+            variant={variant}
+          >
+            <Item>
+              {variant} {color}
+            </Item>
+            <Item>
+              {variant} {color}
+            </Item>
+            <Item>
+              {variant} {color}
+            </Item>
+          </ActionGroup>
+        )),
+      )}
+    </Flex>
+  ),
+};
+
+/**
+ * The component supports two sizes `small` and `medium`. Default size is `medium`.
+ */
+export const Sizes: Story = {
+  render: () => (
+    <Flex direction="column" gap="spacing-2">
+      {Object.keys(SIZES)
+        .filter((size) => !["large"].includes(size))
+        .map((size) => (
+          <ActionGroup key={size} size={size}>
+            <Item key="option-1">Option 1</Item>
+            <Item key="option-2">Option 2</Item>
+            <Item key="option-3">Option 3</Item>
+            <Item key="option-4">Option 4</Item>
+          </ActionGroup>
+        ))}
+    </Flex>
+  ),
+};
+
+/**
+ * The `ActionGroup` can be oriented horizontally or vertically. By default, it is oriented horizontally.
+ */
+export const Orientation: Story = {
+  render: () => (
+    <Flex direction="column" gap="spacing-2">
+      <ActionGroup>
+        <Item key="option-1">Option 1</Item>
+        <Item key="option-2">Option 2</Item>
+        <Item key="option-3">Option 3</Item>
+        <Item key="option-4">Option 4</Item>
+      </ActionGroup>
+      <ActionGroup orientation="vertical">
+        <Item key="option-1">Option 1</Item>
+        <Item key="option-2">Option 2</Item>
+        <Item key="option-3">Option 3</Item>
+        <Item key="option-4">Option 4</Item>
+      </ActionGroup>
+    </Flex>
+  ),
+};
+
+/**
+ * The `ActionGroup` can be `compact` or `regular`. By default, it is regular.
+ */
+
+export const Density: Story = {
+  render: () => (
+    <Flex direction="column" gap="spacing-2">
+      <ActionGroup density="compact">
+        <Item key="option-1">Option 1</Item>
+        <Item key="option-2">Option 2</Item>
+        <Item key="option-3">Option 3</Item>
+        <Item key="option-4">Option 4</Item>
+      </ActionGroup>
+      <ActionGroup>
+        <Item key="option-1">Option 1</Item>
+        <Item key="option-2">Option 2</Item>
+        <Item key="option-3">Option 3</Item>
+        <Item key="option-4">Option 4</Item>
+      </ActionGroup>
+    </Flex>
+  ),
+};
+
+/**
+ * The `ActionGroup` can be `collapse`. By default, it is not collapsed. When collpaised, the `ActionGroup` will show items based on the width available. The rest of the items will be shown under a dropdown menu.
+ */
+
+export const Overflow: Story = {
+  render: () => (
+    <Flex width="sizing-50">
+      <ActionGroup overflowMode="collapse" variant="outlined">
+        <Item icon="file" key="option-1">
+          Option 1
+        </Item>
+        <Item key="option-2">Option 2</Item>
+        <Item isSeparator />
+        <Item icon="file" key="option-3">
+          {"Option 3"}
+        </Item>
+        <Item color="negative" icon="trash" iconPosition="end" key="option-4">
+          {"Option 4"}
+        </Item>
+      </ActionGroup>
+    </Flex>
+  ),
+};
+
+/**
+ * The `ActionGroup` can have disabled keys.
+ */
+
+export const DisabledKeys: Story = {
+  render: () => (
+    <ActionGroup disabledKeys={["option-2", "option-4"]}>
+      <Item key="option-1">Option 1</Item>
+      <Item key="option-2">Option 2</Item>
+      <Item key="option-3">Option 3</Item>
+      <Item key="option-4">Option 4</Item>
+    </ActionGroup>
+  ),
+};
diff --git a/app/client/packages/design-system/widgets/src/components/Button/stories/Button.stories.mdx b/app/client/packages/design-system/widgets/src/components/Button/stories/Button.stories.mdx
deleted file mode 100644
index 713cb588f3..0000000000
--- a/app/client/packages/design-system/widgets/src/components/Button/stories/Button.stories.mdx
+++ /dev/null
@@ -1,153 +0,0 @@
-import {
-  Button,
-  BUTTON_VARIANTS,
-  COLORS,
-  Flex,
-  SIZES,
-} from "@design-system/widgets";
-import { Canvas, Meta, Story, ArgsTable } from "@storybook/blocks";
-
-<Meta
-  title="Design-system/Widgets/Button"
-  component={Button}
-  args={{
-    children: "Button",
-  }}
-/>
-
-export const Template = (args) => <Button {...args} />;
-
-# Button
-
-A button is a clickable element that is used to trigger an action.
-
-<Canvas>
-  <Story name="Button">{Template.bind({})}</Story>
-</Canvas>
-
-<ArgsTable story="Button" of={Button} />
-
-## Variants
-
-There are 3 variants of the button component.
-
-<Story
-  name="Filled"
-  args={{
-    children: "Filled",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-<Story
-  name="Outlined"
-  args={{
-    variant: "outlined",
-    children: "Outlined",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-<Story
-  name="Ghost"
-  args={{
-    variant: "ghost",
-    children: "Ghost",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-## Semantic
-
-`Button` component has 3 visual style variants and 5 semantic color options
-
-<Story name="Semantic">
-  <Flex gap="1rem" wrap="wrap">
-    {Object.values(BUTTON_VARIANTS).map((variant) =>
-      Object.values(COLORS).map((color) => (
-        <div key={`${variant}-${color}`} style={{ marginBottom: 10 }}>
-          <Button variant={variant} color={color} children={color} />
-        </div>
-      )),
-    )}
-  </Flex>
-</Story>
-
-## Size
-
-There are 2 sizes of the button component. Default size is `medium`.
-
-<Story name="Size">
-  <Flex gap="spacing-2">
-    {Object.keys(SIZES)
-      .filter((size) => !["large"].includes(size))
-      .map((size) => (
-        <div key={size} style={{ marginBottom: 10 }}>
-          <Button size={size} icon="star" children={size} />
-        </div>
-      ))}
-  </Flex>
-</Story>
-
-## Disabled
-
-<Story
-  name="Disabled State"
-  args={{
-    isDisabled: true,
-    children: "Disabled",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-## Loading
-
-<Story
-  name="Loading State"
-  args={{
-    isLoading: true,
-    children: "Loading",
-    onPress: () => alert("on pressed"),
-  }}
->
-  {Template.bind({})}
-</Story>
-
-## With Icon
-
-<Story
-  name="With Icon"
-  args={{
-    children: "With Icon",
-    icon: "star",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-## Icon Position
-
-<Story
-  name="Icon Position - Start"
-  args={{
-    children: "Icon Start",
-    icon: "123",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-<Story
-  name="Icon Position - End"
-  args={{
-    children: "Icon End",
-    icon: "alert-square",
-    iconPosition: "end",
-  }}
->
-  {Template.bind({})}
-</Story>
diff --git a/app/client/packages/design-system/widgets/src/components/Button/stories/Button.stories.tsx b/app/client/packages/design-system/widgets/src/components/Button/stories/Button.stories.tsx
new file mode 100644
index 0000000000..678e5cc33f
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Button/stories/Button.stories.tsx
@@ -0,0 +1,107 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import {
+  Button,
+  Flex,
+  BUTTON_VARIANTS,
+  COLORS,
+  SIZES,
+} from "@design-system/widgets";
+
+/**
+ * A button is a clickable element that is used to trigger an action.
+ */
+const meta: Meta<typeof Button> = {
+  component: Button,
+  title: "Design-system/Widgets/Button",
+};
+
+export default meta;
+type Story = StoryObj<typeof Button>;
+
+export const Main: Story = {
+  args: {
+    children: "Button",
+  },
+};
+
+/**
+ * There are 3 variants of the button component.
+ */
+export const Variants: Story = {
+  render: () => (
+    <Flex gap="spacing-4" wrap="wrap">
+      {Object.values(BUTTON_VARIANTS).map((variant) => (
+        <Button key={`${variant}`} variant={variant}>
+          {variant}
+        </Button>
+      ))}
+    </Flex>
+  ),
+};
+
+/**
+ * `Button` component has 3 visual style variants and 5 semantic color options
+ */
+export const Semantic: Story = {
+  render: () => (
+    <Flex gap="spacing-4" wrap="wrap">
+      {Object.values(BUTTON_VARIANTS).map((variant) =>
+        Object.values(COLORS).map((color) => (
+          <Button color={color} key={`${variant}-${color}`} variant={variant}>
+            {`${variant}-${color}`}
+          </Button>
+        )),
+      )}
+    </Flex>
+  ),
+};
+
+/**
+ * The component supports two sizes `small` and `medium`. Default size is `medium`.
+ */
+export const Sizes: Story = {
+  render: () => (
+    <Flex alignItems="start" gap="spacing-4">
+      {Object.keys(SIZES)
+        .filter((size) => !["large"].includes(size))
+        .map((size) => (
+          <Button icon="star" key={size} size={size}>
+            {size}
+          </Button>
+        ))}
+    </Flex>
+  ),
+};
+
+export const Disabled: Story = {
+  args: {
+    isDisabled: true,
+    children: "Button",
+  },
+};
+
+export const Loading: Story = {
+  args: {
+    isLoading: true,
+  },
+};
+
+export const Icon: Story = {
+  args: {
+    icon: "star",
+  },
+};
+
+export const IconPosition: Story = {
+  render: () => (
+    <Flex gap="spacing-4">
+      <Button icon="star" iconPosition="start">
+        Button
+      </Button>
+      <Button icon="star" iconPosition="end">
+        Button
+      </Button>
+    </Flex>
+  ),
+};
diff --git a/app/client/packages/design-system/widgets/src/components/ButtonGroup/stories/ButtonGroup.stories.mdx b/app/client/packages/design-system/widgets/src/components/ButtonGroup/stories/ButtonGroup.stories.mdx
deleted file mode 100644
index 0d88ef62fa..0000000000
--- a/app/client/packages/design-system/widgets/src/components/ButtonGroup/stories/ButtonGroup.stories.mdx
+++ /dev/null
@@ -1,111 +0,0 @@
-import {
-  Flex,
-  ButtonGroup,
-  COLORS,
-  Item,
-  BUTTON_VARIANTS,
-} from "@design-system/widgets";
-import { Canvas, Meta, Story, ArgsTable, Source } from "@storybook/addon-docs";
-
-<Meta title="Design-system/Widgets/Button Group" component={ButtonGroup} />
-
-# Button Group
-
-A `ButtonGroup` is a group of buttons that are visually connected together.
-The `Item` accepts the same props as the `Button` except `variant` and `color`.
-More information about `Button` props you can find [here](?path=/docs/design-system-widgets-button--docs).
-
-export const Template = (args) => {
-  return (
-    <ButtonGroup {...args}>
-      <Item>Option 1</Item>
-      <Item>Option 2</Item>
-      <Item>Option 3</Item>
-    </ButtonGroup>
-  );
-};
-
-<Canvas>
-  <Story name="Button Group">{Template.bind({})}</Story>
-</Canvas>
-
-<ArgsTable story="Button Group" of={ButtonGroup} />
-
-## Semantic
-
-`Button` component has 3 visual style variants and 5 semantic color options
-
-<Story name="Semantic">
-  <Flex direction="column" gap="spacing-4" alignItems="center" width="100%">
-    {Object.values(BUTTON_VARIANTS).map((variant) =>
-      Object.values(COLORS).map((color) => (
-        <ButtonGroup
-          variant={variant}
-          color={color}
-          key={`${variant}-${color}`}
-        >
-          <Item>
-            {variant} {color}
-          </Item>
-          <Item>
-            {variant} {color}
-          </Item>
-          <Item>
-            {variant} {color}
-          </Item>
-        </ButtonGroup>
-      )),
-    )}
-  </Flex>
-</Story>
-
-## Orientation
-
-<Story name="Orientation horizontal">{Template.bind({})}</Story>
-
-<Story
-  name="Orientation vertical"
-  args={{
-    orientation: "vertical",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-# Responsive
-
-<Story name="Responsive">
-  <div style={{ width: 150 }}>
-    <ButtonGroup variant="outlined">
-      <Item key="option-1">Option 1</Item>
-      <Item key="option-2">Option 2</Item>
-      <Item key="option-3" icon="file">
-        {"Option 3"}
-      </Item>
-      <Item key="option-4" icon="trash" iconPosition="end" color="negative">
-        {"Option 4"}
-      </Item>
-    </ButtonGroup>
-  </div>
-</Story>
-
-## ButtonGroupItem usage
-
-<Story name="ButtonGroupItem usage">
-  <ButtonGroup>
-    <Item isDisabled>Option 2</Item>
-    <Item isLoading>Option 2</Item>
-    <Item>Option 3</Item>
-  </ButtonGroup>
-</Story>
-
-<Source
-  dark
-  code={`
-<ButtonGroup>
-  <Item>Option 2</Item>
-  <Item isLoading>Option 2</Item>
-  <Item>Option 3</Item>
-</ButtonGroup>
-`}
-/>
diff --git a/app/client/packages/design-system/widgets/src/components/ButtonGroup/stories/ButtonGroup.stories.tsx b/app/client/packages/design-system/widgets/src/components/ButtonGroup/stories/ButtonGroup.stories.tsx
new file mode 100644
index 0000000000..b36ce08e45
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/ButtonGroup/stories/ButtonGroup.stories.tsx
@@ -0,0 +1,124 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import {
+  ButtonGroup,
+  Flex,
+  BUTTON_VARIANTS,
+  COLORS,
+  SIZES,
+  Item,
+} from "@design-system/widgets";
+
+/**
+ * A `ButtonGroup` is a group of buttons that are visually connected together.
+ * The `Item` accepts the same props as the `Button` except `variant` and `color`.
+ * More information about `Button` props you can find [here](?path=/docs/design-system-widgets-button--docs).
+ */
+const meta: Meta<typeof ButtonGroup> = {
+  component: ButtonGroup,
+  title: "Design-system/Widgets/ButtonGroup",
+};
+
+export default meta;
+type Story = StoryObj<typeof ButtonGroup>;
+
+export const Main: Story = {
+  render: (args) => (
+    <ButtonGroup {...args}>
+      <Item>Option 1</Item>
+      <Item>Option 2</Item>
+      <Item>Option 3</Item>
+    </ButtonGroup>
+  ),
+};
+
+/**
+ * `ButtonGroup` component has 3 visual style variants and 5 semantic color options
+ */
+
+export const Semantic: Story = {
+  render: () => (
+    <Flex alignItems="center" direction="column" gap="spacing-4" width="100%">
+      {Object.values(BUTTON_VARIANTS).map((variant) =>
+        Object.values(COLORS).map((color) => (
+          <ButtonGroup
+            color={color}
+            key={`${variant}-${color}`}
+            variant={variant}
+          >
+            <Item>
+              {variant} {color}
+            </Item>
+            <Item>
+              {variant} {color}
+            </Item>
+            <Item>
+              {variant} {color}
+            </Item>
+          </ButtonGroup>
+        )),
+      )}
+    </Flex>
+  ),
+};
+
+/**
+ * The component supports two sizes `small` and `medium`. Default size is `medium`.
+ */
+export const Sizes: Story = {
+  render: () => (
+    <Flex gap="spacing-2">
+      {Object.keys(SIZES)
+        .filter((size) => !["large"].includes(size))
+        .map((size) => (
+          <ButtonGroup key={size} size={size}>
+            <Item>Option 1</Item>
+            <Item>Option 2</Item>
+            <Item>Option 3</Item>
+          </ButtonGroup>
+        ))}
+    </Flex>
+  ),
+};
+
+/**
+ * The `ButtonGroup` can be oriented horizontally or vertically. By default, it is oriented horizontally.
+ */
+export const Orientation: Story = {
+  render: () => (
+    <Flex direction="column" gap="spacing-2">
+      <ButtonGroup>
+        <Item key="option-1">Option 1</Item>
+        <Item key="option-2">Option 2</Item>
+        <Item key="option-3">Option 3</Item>
+        <Item key="option-4">Option 4</Item>
+      </ButtonGroup>
+      <ButtonGroup orientation="vertical">
+        <Item key="option-1">Option 1</Item>
+        <Item key="option-2">Option 2</Item>
+        <Item key="option-3">Option 3</Item>
+        <Item key="option-4">Option 4</Item>
+      </ButtonGroup>
+    </Flex>
+  ),
+};
+
+/**
+ * If there is not enough space for horizontal positioning, then the themes will be positioned vertically
+ */
+export const Responsive: Story = {
+  render: () => (
+    <Flex width="sizing-50">
+      <ButtonGroup variant="outlined">
+        <Item key="option-1">Option 1</Item>
+        <Item key="option-2">Option 2</Item>
+        <Item icon="file" key="option-3">
+          {"Option 3"}
+        </Item>
+        <Item color="negative" icon="trash" iconPosition="end" key="option-4">
+          {"Option 4"}
+        </Item>
+      </ButtonGroup>
+    </Flex>
+  ),
+};
diff --git a/app/client/packages/design-system/widgets/src/components/Checkbox/stories/Checkbox.stories.mdx b/app/client/packages/design-system/widgets/src/components/Checkbox/stories/Checkbox.stories.mdx
deleted file mode 100644
index 96d9c64162..0000000000
--- a/app/client/packages/design-system/widgets/src/components/Checkbox/stories/Checkbox.stories.mdx
+++ /dev/null
@@ -1,136 +0,0 @@
-import { Checkbox } from "@design-system/widgets";
-import { Canvas, Meta, Story, ArgsTable } from "@storybook/addon-docs";
-
-<Meta
-  title="Design-system/Widgets/Checkbox"
-  component={Checkbox}
-  args={{
-    children: "Check me",
-  }}
-/>
-
-export const Template = (args) => <Checkbox {...args} />;
-
-# Checkbox
-
-Checkbox is a component that allows the user to select one or more options from a set.
-
-<Canvas>
-  <Story name="Checkbox">{Template.bind({})}</Story>
-</Canvas>
-
-<ArgsTable story="Checkbox" of={Checkbox} />
-
-## States
-
-<Story
-  name="State - unchecked"
-  args={{
-    children: "Unchecked",
-  }}
->
-  {Template.bind({})}
-</Story>
-<Story
-  name="State - Default Checked"
-  args={{
-    defaultSelected: true,
-    children: "Checked",
-  }}
->
-  {Template.bind({})}
-</Story>
-<Story
-  name="State - Disabled"
-  args={{
-    defaultSelected: true,
-    children: "Disabled",
-    isDisabled: true,
-  }}
->
-  {Template.bind({})}
-</Story>
-<Story
-  name="State - Disabled unchecked"
-  args={{
-    children: "Disabled unchecked",
-    isDisabled: true,
-  }}
->
-  {Template.bind({})}
-</Story>
-<Story
-  name="State - indeterminate"
-  args={{
-    children: "Disabled indeterminate",
-    defaultSelected: true,
-    isIndeterminate: true,
-  }}
->
-  {Template.bind({})}
-</Story>
-<Story
-  name="State - Disabled indeterminate"
-  args={{
-    children: "Disabled indeterminate",
-    isDisabled: true,
-    defaultSelected: true,
-    isIndeterminate: true,
-  }}
->
-  {Template.bind({})}
-</Story>
-<Story
-  name="State - Error"
-  args={{
-    children: "Error",
-    validationState: "invalid",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-## Label Position
-
-<Story
-  parameters={{
-    width: 250,
-  }}
-  name="Label Position - Start"
-  args={{
-    labelPosition: "start",
-    children: "Label Position - Start",
-  }}
->
-  {Template.bind({})}
-</Story>
-<Story
-  parameters={{
-    width: 250,
-  }}
-  name="Label Position - End"
-  args={{
-    labelPosition: "end",
-    children: "Label Position - End",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-## Custom Icon
-
-<Story
-  name="Custom Icon"
-  args={{
-    children: "Custom Icon",
-    icon: (props) => {
-      return (
-        <svg fill="currentColor" viewBox="0 0 24 24" {...props}>
-          <path d="M17.8827 19.2968C16.1814 20.3755 14.1638 21.0002 12.0003 21.0002C6.60812 21.0002 2.12215 17.1204 1.18164 12.0002C1.61832 9.62282 2.81932 7.5129 4.52047 5.93457L1.39366 2.80777L2.80788 1.39355L22.6069 21.1925L21.1927 22.6068L17.8827 19.2968ZM5.9356 7.3497C4.60673 8.56015 3.6378 10.1672 3.22278 12.0002C4.14022 16.0521 7.7646 19.0002 12.0003 19.0002C13.5997 19.0002 15.112 18.5798 16.4243 17.8384L14.396 15.8101C13.7023 16.2472 12.8808 16.5002 12.0003 16.5002C9.51498 16.5002 7.50026 14.4854 7.50026 12.0002C7.50026 11.1196 7.75317 10.2981 8.19031 9.60442L5.9356 7.3497ZM12.9139 14.328L9.67246 11.0866C9.5613 11.3696 9.50026 11.6777 9.50026 12.0002C9.50026 13.3809 10.6196 14.5002 12.0003 14.5002C12.3227 14.5002 12.6309 14.4391 12.9139 14.328ZM20.8068 16.5925L19.376 15.1617C20.0319 14.2268 20.5154 13.1586 20.7777 12.0002C19.8603 7.94818 16.2359 5.00016 12.0003 5.00016C11.1544 5.00016 10.3329 5.11773 9.55249 5.33818L7.97446 3.76015C9.22127 3.26959 10.5793 3.00016 12.0003 3.00016C17.3924 3.00016 21.8784 6.87992 22.8189 12.0002C22.5067 13.6998 21.8038 15.2628 20.8068 16.5925ZM11.7229 7.50857C11.8146 7.50299 11.9071 7.50016 12.0003 7.50016C14.4855 7.50016 16.5003 9.51488 16.5003 12.0002C16.5003 12.0933 16.4974 12.1858 16.4919 12.2775L11.7229 7.50857Z" />
-        </svg>
-      );
-    },
-  }}
->
-  {Template.bind({})}
-</Story>
diff --git a/app/client/packages/design-system/widgets/src/components/Checkbox/stories/Checkbox.stories.tsx b/app/client/packages/design-system/widgets/src/components/Checkbox/stories/Checkbox.stories.tsx
new file mode 100644
index 0000000000..576cbadf75
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Checkbox/stories/Checkbox.stories.tsx
@@ -0,0 +1,66 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import { Checkbox, Flex } from "@design-system/widgets";
+
+/**
+ * Checkbox is a component that allows the user to select one or more options from a set.
+ */
+const meta: Meta<typeof Checkbox> = {
+  component: Checkbox,
+  title: "Design-system/Widgets/Checkbox",
+};
+
+export default meta;
+type Story = StoryObj<typeof Checkbox>;
+
+export const Main: Story = {
+  args: {
+    children: "Check me",
+  },
+};
+
+export const States: Story = {
+  render: () => (
+    <Flex direction="column" gap="spacing-4">
+      <Checkbox>Unchecked</Checkbox>
+      <Checkbox defaultSelected>Checked</Checkbox>
+      <Checkbox isDisabled>Disabled</Checkbox>
+      <Checkbox defaultSelected isDisabled>
+        Disabled checked
+      </Checkbox>
+      <Checkbox isIndeterminate>Indeterminate</Checkbox>
+      <Checkbox validationState="invalid">Error</Checkbox>
+    </Flex>
+  ),
+};
+
+/**
+ * The component supports two label positions `start` and `end`. Default size is `end`.
+ */
+export const LabelPosition: Story = {
+  render: () => (
+    <Flex direction="column" gap="1rem" wrap="wrap">
+      <Checkbox>Label Position — end</Checkbox>
+      <Checkbox labelPosition="start">Label Position — start</Checkbox>
+    </Flex>
+  ),
+};
+
+export const CustomIcon: Story = {
+  render: () => (
+    <Flex gap="1rem" wrap="wrap">
+      <Checkbox
+        defaultSelected
+        icon={(props) => {
+          return (
+            <svg fill="currentColor" viewBox="0 0 24 24" {...props}>
+              <path d="M17.8827 19.2968C16.1814 20.3755 14.1638 21.0002 12.0003 21.0002C6.60812 21.0002 2.12215 17.1204 1.18164 12.0002C1.61832 9.62282 2.81932 7.5129 4.52047 5.93457L1.39366 2.80777L2.80788 1.39355L22.6069 21.1925L21.1927 22.6068L17.8827 19.2968ZM5.9356 7.3497C4.60673 8.56015 3.6378 10.1672 3.22278 12.0002C4.14022 16.0521 7.7646 19.0002 12.0003 19.0002C13.5997 19.0002 15.112 18.5798 16.4243 17.8384L14.396 15.8101C13.7023 16.2472 12.8808 16.5002 12.0003 16.5002C9.51498 16.5002 7.50026 14.4854 7.50026 12.0002C7.50026 11.1196 7.75317 10.2981 8.19031 9.60442L5.9356 7.3497ZM12.9139 14.328L9.67246 11.0866C9.5613 11.3696 9.50026 11.6777 9.50026 12.0002C9.50026 13.3809 10.6196 14.5002 12.0003 14.5002C12.3227 14.5002 12.6309 14.4391 12.9139 14.328ZM20.8068 16.5925L19.376 15.1617C20.0319 14.2268 20.5154 13.1586 20.7777 12.0002C19.8603 7.94818 16.2359 5.00016 12.0003 5.00016C11.1544 5.00016 10.3329 5.11773 9.55249 5.33818L7.97446 3.76015C9.22127 3.26959 10.5793 3.00016 12.0003 3.00016C17.3924 3.00016 21.8784 6.87992 22.8189 12.0002C22.5067 13.6998 21.8038 15.2628 20.8068 16.5925ZM11.7229 7.50857C11.8146 7.50299 11.9071 7.50016 12.0003 7.50016C14.4855 7.50016 16.5003 9.51488 16.5003 12.0002C16.5003 12.0933 16.4974 12.1858 16.4919 12.2775L11.7229 7.50857Z" />
+            </svg>
+          );
+        }}
+      >
+        Option 1
+      </Checkbox>
+    </Flex>
+  ),
+};
diff --git a/app/client/packages/design-system/widgets/src/components/CheckboxGroup/stories/CheckboxGroup.stories.mdx b/app/client/packages/design-system/widgets/src/components/CheckboxGroup/stories/CheckboxGroup.stories.mdx
deleted file mode 100644
index ea13d4c672..0000000000
--- a/app/client/packages/design-system/widgets/src/components/CheckboxGroup/stories/CheckboxGroup.stories.mdx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { CheckboxGroup, Checkbox } from "@design-system/widgets";
-import { Canvas, Meta, Story, ArgsTable } from "@storybook/addon-docs";
-
-<Meta
-  title="Design-system/Widgets/CheckboxGroup"
-  component={CheckboxGroup}
-  args={{
-    label: "Checkbox Group",
-    defaultValue: ["value-1"],
-    children: (
-      <>
-        <Checkbox value="value-1">Value 1</Checkbox>
-        <Checkbox value="value-2">Value 2</Checkbox>
-      </>
-    ),
-  }}
-/>
-
-export const Template = (args) => <CheckboxGroup {...args} />;
-
-# Checkbox Group
-
-Checkbox Group is a group of checkboxes that can be selected together.
-
-<Canvas>
-  <Story name="Checkbox Group">{Template.bind({})}</Story>
-</Canvas>
-
-<ArgsTable story="Checkbox Group" of={CheckboxGroup} />
-
-## Orientation
-
-<Story
-  args={{
-    orientation: "vertical",
-  }}
-  name="Orientation - Vertical"
->
-  {Template.bind({})}
-</Story>
-<Story
-  args={{
-    orientation: "horizontal",
-  }}
-  name="Orientation - Horizontal"
->
-  {Template.bind({})}
-</Story>
-
-## Disabled
-
-<Story
-  args={{
-    isDisabled: true,
-  }}
-  name="Is Disabled"
->
-  {Template.bind({})}
-</Story>
-
-## Required
-
-<Story
-  args={{
-    isRequired: true,
-  }}
-  name="Is Required"
->
-  {Template.bind({})}
-</Story>
-
-## Invalid State
-
-<Story
-  args={{
-    validationState: "invalid",
-    errorMessage: "This is a error message",
-  }}
-  name="Invalid State"
->
-  {Template.bind({})}
-</Story>
diff --git a/app/client/packages/design-system/widgets/src/components/CheckboxGroup/stories/CheckboxGroup.stories.tsx b/app/client/packages/design-system/widgets/src/components/CheckboxGroup/stories/CheckboxGroup.stories.tsx
new file mode 100644
index 0000000000..fefbc6917f
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/CheckboxGroup/stories/CheckboxGroup.stories.tsx
@@ -0,0 +1,88 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import { CheckboxGroup, Flex, Checkbox } from "@design-system/widgets";
+
+/**
+ * Checkbox Group is a group of checkboxes that can be selected together.
+ */
+const meta: Meta<typeof CheckboxGroup> = {
+  component: CheckboxGroup,
+  title: "Design-system/Widgets/CheckboxGroup",
+};
+
+export default meta;
+type Story = StoryObj<typeof CheckboxGroup>;
+
+export const Main: Story = {
+  args: {
+    label: "Checkbox Group",
+    defaultValue: ["value-1"],
+  },
+  render: (args) => (
+    <CheckboxGroup {...args}>
+      <Checkbox value="value-1">Value 1</Checkbox>
+      <Checkbox value="value-2">Value 2</Checkbox>
+    </CheckboxGroup>
+  ),
+};
+
+/**
+ * The component supports two label orientations `vertical` and `horizontal`. Default size is `horizontal`.
+ */
+export const Orientation: Story = {
+  render: () => (
+    <Flex direction="column" gap="spacing-4">
+      <CheckboxGroup>
+        <Checkbox value="value-1">Value 1</Checkbox>
+        <Checkbox value="value-2">Value 2</Checkbox>
+      </CheckboxGroup>
+      <CheckboxGroup orientation="vertical">
+        <Checkbox value="value-1">Value 1</Checkbox>
+        <Checkbox value="value-2">Value 2</Checkbox>
+      </CheckboxGroup>
+    </Flex>
+  ),
+};
+
+export const Disabled: Story = {
+  args: {
+    label: "Checkbox Group",
+    defaultValue: ["value-1"],
+    isDisabled: true,
+  },
+  render: (args) => (
+    <CheckboxGroup {...args}>
+      <Checkbox value="value-1">Value 1</Checkbox>
+      <Checkbox value="value-2">Value 2</Checkbox>
+    </CheckboxGroup>
+  ),
+};
+
+export const Required: Story = {
+  args: {
+    label: "Checkbox Group",
+    defaultValue: ["value-1"],
+    isRequired: true,
+  },
+  render: (args) => (
+    <CheckboxGroup {...args}>
+      <Checkbox value="value-1">Value 1</Checkbox>
+      <Checkbox value="value-2">Value 2</Checkbox>
+    </CheckboxGroup>
+  ),
+};
+
+export const Invalid: Story = {
+  args: {
+    label: "Checkbox Group",
+    defaultValue: ["value-1"],
+    validationState: "invalid",
+    errorMessage: "This is a error message",
+  },
+  render: (args) => (
+    <CheckboxGroup {...args}>
+      <Checkbox value="value-1">Value 1</Checkbox>
+      <Checkbox value="value-2">Value 2</Checkbox>
+    </CheckboxGroup>
+  ),
+};
diff --git a/app/client/packages/design-system/widgets/src/components/Flex/stories/Flex.stories.mdx b/app/client/packages/design-system/widgets/src/components/Flex/stories/Flex.stories.mdx
deleted file mode 100644
index 33fc635355..0000000000
--- a/app/client/packages/design-system/widgets/src/components/Flex/stories/Flex.stories.mdx
+++ /dev/null
@@ -1,129 +0,0 @@
-import styles from "./styles.module.css";
-import { Flex, Text } from "@design-system/widgets";
-import { Canvas, Meta, Story, ArgsTable } from "@storybook/addon-docs";
-
-<Meta
-  title="Design-system/Widgets/Flex"
-  component={Flex}
-  args={{
-    children: "Flex",
-    gap: "spacing-6",
-  }}
-/>
-
-# Flex
-
-The Flex component can be used to layout its children in one dimension with [flexbox](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Flexible_Box_Layout/Basic_Concepts_of_Flexbox). Any React component can be used as a child, and Flex components can be nested to create more complex layouts.
-
-In addition to the properties widely supported by CSS, we also shim the [gap](https://developer.mozilla.org/en-US/docs/Web/CSS/gap) property, along with [rowGap](https://developer.mozilla.org/en-US/docs/Web/CSS/row-gap) and [columnGap](https://developer.mozilla.org/en-US/docs/Web/CSS/column-gap). These properties make it much easier to build layouts with consistent space between each item.
-The props of component can be defined with [sizing](/?path=/docs/design-system-theme-theme--sizing) and [spacing](http://localhost:6006/?path=/docs/design-system-theme-theme--spacing) dimension variables to ensure consistency across applications, and allow the layout to adapt to different devices automatically. In addition, these values can be autocompleted in many IDEs for convenience.
-
-export const Template = (args) => (
-  <Flex {...args}>
-    <div className={styles["demo-block"]} data-color="negative" />
-    <div className={styles["demo-block"]} data-color="positive" />
-    <div className={styles["demo-block"]} data-color="warning" />
-  </Flex>
-);
-
-<Canvas>
-  <Story name="Flex">{Template.bind({})}</Story>
-</Canvas>
-
-<ArgsTable story="Flex" of={Flex} />
-
-## Vertical stack with gap
-
-<Story name="Vertical stack">
-  <Flex direction="column" gap="spacing-2">
-    <div className={styles["demo-block"]} data-color="negative" />
-    <div className={styles["demo-block"]} data-color="positive" />
-    <div className={styles["demo-block"]} data-color="warning" />
-  </Flex>
-</Story>
-
-## Horizontal stack with gap
-
-<Story name="Horizontal stack">
-  <Flex gap="spacing-2">
-    <div className={styles["demo-block"]} data-color="negative" />
-    <div className={styles["demo-block"]} data-color="positive" />
-    <div className={styles["demo-block"]} data-color="warning" />
-  </Flex>
-</Story>
-
-## Nesting
-
-<Story name="Nesting">
-  <Flex direction="column" gap="spacing-2" width="100%">
-    <div className={styles["demo-block"]} data-color="accent" />
-    <Flex gap="spacing-2" height="sizing-40">
-      <div className={styles["demo-block"]} data-color="negative" />
-      <div className={styles["demo-block"]} data-color="positive" />
-      <div className={styles["demo-block"]} data-color="warning" />
-    </Flex>
-    <div className={styles["demo-block"]} data-color="warning" />
-  </Flex>
-</Story>
-
-## Responsive
-
-The component interface supports `Responsive` props. Using such props, we can easily create responsive interfaces.
-Specifying the props is based on the principle of **mobile first**, respectively, specifying `base` is applied for the smallest value, then breaking points are added.
-It should also be taken into account that the break points indicate the width of the parent component and not the user's viewport because we use [container queries](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_container_queries).
-To make everything work, we just need to add `isContainer` prop to the parent FLex component.
-
-**Usage example**: `<Flex isContainer direction={{ base: "column", "520px": "row" }}>...</Flex>`
-
-## Responsive cards
-
-<Story name="Responsive cards">
-  <Flex isContainer gap="spacing-2" width="100%" wrap>
-    {[...Array(12)].map(() => (
-      <Flex
-        flex="1"
-        minWidth={{
-          base: "44%",
-          "400px": "30%",
-          "680px": "22%",
-          "926px": "14%",
-        }}
-      >
-        <div className={styles["responsive-block"]} />
-      </Flex>
-    ))}
-  </Flex>
-</Story>
-
-## Responsive list
-
-<Story name="Responsive list">
-  <Flex
-    direction={{ base: "row", "520px": "column" }}
-    gap="spacing-6"
-    wrap
-    isContainer
-  >
-    {[...Array(4)].map(() => (
-      <Flex
-        direction={{ base: "column", "520px": "row" }}
-        flex={{ base: "0", "320px": "1", "520px": "none" }}
-        gap="spacing-4"
-        minWidth={{ base: "100%", "320px": "45%", "520px": "100%" }}
-      >
-        <Flex flex="1" maxWidth={{ base: "100%", "520px": "sizing-38" }}>
-          <div className={styles["responsive-block"]} />
-        </Flex>
-        <Flex direction="column" flex="1" gap="spacing-4">
-          <Text variant="subtitle">Title</Text>
-          <Text>
-            Lorem ipsum dolor sit amet, consectetur adipisicing elit. Autem
-            consequuntur explicabo quia veniam? Aliquid amet cum delectus
-            deleniti eligendi eum facilis, fugit in iusto nemo, porro quod
-            reiciendis sint velit?
-          </Text>
-        </Flex>
-      </Flex>
-    ))}
-  </Flex>
-</Story>
diff --git a/app/client/packages/design-system/widgets/src/components/Flex/stories/Flex.stories.tsx b/app/client/packages/design-system/widgets/src/components/Flex/stories/Flex.stories.tsx
new file mode 100644
index 0000000000..b81dbaf075
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Flex/stories/Flex.stories.tsx
@@ -0,0 +1,121 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import { Flex, Text } from "@design-system/widgets";
+import styles from "./styles.module.css";
+
+/**
+ * The Flex component can be used to layout its children in one dimension with [flexbox](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Flexible_Box_Layout/Basic_Concepts_of_Flexbox). Any React component can be used as a child, and Flex components can be nested to create more complex layouts.
+ *
+ * In addition to the properties widely supported by CSS, we also shim the [gap](https://developer.mozilla.org/en-US/docs/Web/CSS/gap) property, along with [rowGap](https://developer.mozilla.org/en-US/docs/Web/CSS/row-gap) and [columnGap](https://developer.mozilla.org/en-US/docs/Web/CSS/column-gap). These properties make it much easier to build layouts with consistent space between each item.
+ * The props of component can be defined with [sizing](/?path=/docs/design-system-theme-theme--sizing) and [spacing](http://localhost:6006/?path=/docs/design-system-theme-theme--spacing) dimension variables to ensure consistency across applications, and allow the layout to adapt to different devices automatically. In addition, these values can be autocompleted in many IDEs for convenience.
+ */
+const meta: Meta<typeof Flex> = {
+  component: Flex,
+  title: "Design-system/Widgets/Flex",
+};
+
+export default meta;
+type Story = StoryObj<typeof Flex>;
+
+export const Main: Story = {
+  args: {
+    children: "Flex",
+    gap: "spacing-6",
+  },
+  render: (args) => (
+    <Flex {...args}>
+      <div className={styles["demo-block"]} data-color="negative" />
+      <div className={styles["demo-block"]} data-color="positive" />
+      <div className={styles["demo-block"]} data-color="warning" />
+    </Flex>
+  ),
+};
+
+export const VerticalStack: Story = {
+  render: () => (
+    <Flex direction="column" gap="spacing-2">
+      <div className={styles["demo-block"]} data-color="negative" />
+      <div className={styles["demo-block"]} data-color="positive" />
+      <div className={styles["demo-block"]} data-color="warning" />
+    </Flex>
+  ),
+};
+
+export const HorizontalStack: Story = {
+  render: () => (
+    <Flex direction="column" gap="spacing-2" width="100%">
+      <div className={styles["demo-block"]} data-color="accent" />
+      <Flex gap="spacing-2" height="sizing-40">
+        <div className={styles["demo-block"]} data-color="negative" />
+        <div className={styles["demo-block"]} data-color="positive" />
+        <div className={styles["demo-block"]} data-color="warning" />
+      </Flex>
+      <div className={styles["demo-block"]} data-color="warning" />
+    </Flex>
+  ),
+};
+
+/**
+ *
+ * The component interface supports `Responsive` props. Using such props, we can easily create responsive interfaces.
+ * Specifying the props is based on the principle of **mobile first**, respectively, specifying `base` is applied for the smallest value, then breaking points are added.
+ * It should also be taken into account that the break points indicate the width of the parent component and not the user's viewport because we use [container queries](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_container_queries).
+ * To make everything work, we just need to add `isContainer` prop to the parent FLex component.
+ *
+ * **Usage example**: `<Flex isContainer direction={{ base: "column", "520px": "row" }}>...</Flex>`
+ */
+
+export const ResponsiveCard: Story = {
+  render: () => (
+    <Flex gap="spacing-2" isContainer width="100%" wrap>
+      {[...Array(12)].map((value) => (
+        <Flex
+          flex="1"
+          key={value}
+          minWidth={{
+            base: "44%",
+            "400px": "30%",
+            "680px": "22%",
+            "926px": "14%",
+          }}
+        >
+          <div className={styles["responsive-block"]} />
+        </Flex>
+      ))}
+    </Flex>
+  ),
+};
+
+export const ResponsiveList: Story = {
+  render: () => (
+    <Flex
+      direction={{ base: "row", "520px": "column" }}
+      gap="spacing-6"
+      isContainer
+      wrap
+    >
+      {[...Array(4)].map((value) => (
+        <Flex
+          direction={{ base: "column", "520px": "row" }}
+          flex={{ base: "0", "320px": "1", "520px": "none" }}
+          gap="spacing-4"
+          key={value}
+          minWidth={{ base: "100%", "320px": "45%", "520px": "100%" }}
+        >
+          <Flex flex="1" maxWidth={{ base: "100%", "520px": "sizing-38" }}>
+            <div className={styles["responsive-block"]} />
+          </Flex>
+          <Flex direction="column" flex="1" gap="spacing-4">
+            <Text variant="heading">Title</Text>
+            <Text>
+              Lorem ipsum dolor sit amet, consectetur adipisicing elit. Autem
+              consequuntur explicabo quia veniam? Aliquid amet cum delectus
+              deleniti eligendi eum facilis, fugit in iusto nemo, porro quod
+              reiciendis sint velit?
+            </Text>
+          </Flex>
+        </Flex>
+      ))}
+    </Flex>
+  ),
+};
diff --git a/app/client/packages/design-system/widgets/src/components/Icon/stories/Icon.stories.mdx b/app/client/packages/design-system/widgets/src/components/Icon/stories/Icon.stories.mdx
deleted file mode 100644
index 29d668ad0d..0000000000
--- a/app/client/packages/design-system/widgets/src/components/Icon/stories/Icon.stories.mdx
+++ /dev/null
@@ -1,84 +0,0 @@
-import { Flex, Icon, ICONS, SIZES } from "@design-system/widgets";
-import { Canvas, Meta, Story, ArgsTable } from "@storybook/blocks";
-
-<Meta
-  title="Design-system/Widgets/Icon"
-  component={Icon}
-  args={{
-    name: "brand-react",
-  }}
-/>
-
-export const Template = (args) => <Icon {...args} />;
-
-# Icon
-
-Icon is a component that just displays an icon.
-
-<Canvas>
-  <Story name="Icon">{Template.bind({})}</Story>
-</Canvas>
-
-<ArgsTable story="Icon" of={Icon} />
-
-# Sizes
-
-The Icon component comes with three sizes
-
-- small — 1rem = 16px
-- medium — 1.5rem = 24px
-- large — 2rem = 32px
-
-<Story name="Size">
-  <Flex gap="spacing-2">
-    {Object.keys(SIZES).map((size) => (
-      <Icon size={size} name="home" key={size} />
-    ))}
-  </Flex>
-</Story>
-
-## Custom Icon
-
-You can also pass a custom icon to the Icon component.
-
-<Story name="Custom Icon">
-  <Icon
-    icon={(props) => {
-      return (
-        <svg fill="currentColor" viewBox="0 0 24 24" {...props}>
-          <path d="M17.8827 19.2968C16.1814 20.3755 14.1638 21.0002 12.0003 21.0002C6.60812 21.0002 2.12215 17.1204 1.18164 12.0002C1.61832 9.62282 2.81932 7.5129 4.52047 5.93457L1.39366 2.80777L2.80788 1.39355L22.6069 21.1925L21.1927 22.6068L17.8827 19.2968ZM5.9356 7.3497C4.60673 8.56015 3.6378 10.1672 3.22278 12.0002C4.14022 16.0521 7.7646 19.0002 12.0003 19.0002C13.5997 19.0002 15.112 18.5798 16.4243 17.8384L14.396 15.8101C13.7023 16.2472 12.8808 16.5002 12.0003 16.5002C9.51498 16.5002 7.50026 14.4854 7.50026 12.0002C7.50026 11.1196 7.75317 10.2981 8.19031 9.60442L5.9356 7.3497ZM12.9139 14.328L9.67246 11.0866C9.5613 11.3696 9.50026 11.6777 9.50026 12.0002C9.50026 13.3809 10.6196 14.5002 12.0003 14.5002C12.3227 14.5002 12.6309 14.4391 12.9139 14.328ZM20.8068 16.5925L19.376 15.1617C20.0319 14.2268 20.5154 13.1586 20.7777 12.0002C19.8603 7.94818 16.2359 5.00016 12.0003 5.00016C11.1544 5.00016 10.3329 5.11773 9.55249 5.33818L7.97446 3.76015C9.22127 3.26959 10.5793 3.00016 12.0003 3.00016C17.3924 3.00016 21.8784 6.87992 22.8189 12.0002C22.5067 13.6998 21.8038 15.2628 20.8068 16.5925ZM11.7229 7.50857C11.8146 7.50299 11.9071 7.50016 12.0003 7.50016C14.4855 7.50016 16.5003 9.51488 16.5003 12.0002C16.5003 12.0933 16.4974 12.1858 16.4919 12.2775L11.7229 7.50857Z" />
-        </svg>
-      );
-    }}
-  />
-</Story>
-
-## All Icons
-
-<Story name="All Icons">
-  <div
-    style={{
-      display: "grid",
-      gridTemplateColumns: "repeat(auto-fit, minmax(16px, 1fr))",
-      gap: "10px",
-      width: "-webkit-fill-available",
-    }}
-  >
-    {Object.keys(ICONS).map((icon) => (
-      <div key={icon} style={{ height: 24, width: 24 }}>
-        <Icon name={icon} />
-      </div>
-    ))}
-  </div>
-</Story>
-
-## Filled
-
-For some icons, you can also pass a `filled` prop to the Icon component to get a filled variant. If there is no filled variant, it will just display the normal icon.
-
-<Story name="Filled Variant">
-  <Flex gap="spacing-2">
-    <Icon name="stars" />
-    <Icon name="stars" filled />
-  </Flex>
-</Story>
diff --git a/app/client/packages/design-system/widgets/src/components/Icon/stories/Icon.stories.tsx b/app/client/packages/design-system/widgets/src/components/Icon/stories/Icon.stories.tsx
new file mode 100644
index 0000000000..06da4f77d4
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Icon/stories/Icon.stories.tsx
@@ -0,0 +1,86 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import { Flex, Icon, ICONS, SIZES } from "@design-system/widgets";
+
+/**
+ * Icon is a component that just displays an icon.
+ */
+const meta: Meta<typeof Icon> = {
+  component: Icon,
+  title: "Design-system/Widgets/Icon",
+};
+
+export default meta;
+type Story = StoryObj<typeof Icon>;
+
+export const Main: Story = {
+  args: {
+    name: "brand-react",
+  },
+};
+
+/**
+ * The Icon component comes with three sizes
+ *
+ * - small — 1rem = 16px
+ * - medium — 1.5rem = 24px
+ * - large — 2rem = 32px
+ */
+export const Sizes: Story = {
+  render: () => (
+    <Flex gap="spacing-2">
+      {Object.keys(SIZES).map((size) => (
+        <Icon key={size} name="home" size={size as keyof typeof SIZES} />
+      ))}
+    </Flex>
+  ),
+};
+
+/**
+ * You can also pass a custom icon to the Icon component.
+ */
+export const CustomIcon: Story = {
+  render: () => (
+    <Icon
+      icon={(props) => {
+        return (
+          <svg fill="currentColor" viewBox="0 0 24 24" {...props}>
+            <path d="M17.8827 19.2968C16.1814 20.3755 14.1638 21.0002 12.0003 21.0002C6.60812 21.0002 2.12215 17.1204 1.18164 12.0002C1.61832 9.62282 2.81932 7.5129 4.52047 5.93457L1.39366 2.80777L2.80788 1.39355L22.6069 21.1925L21.1927 22.6068L17.8827 19.2968ZM5.9356 7.3497C4.60673 8.56015 3.6378 10.1672 3.22278 12.0002C4.14022 16.0521 7.7646 19.0002 12.0003 19.0002C13.5997 19.0002 15.112 18.5798 16.4243 17.8384L14.396 15.8101C13.7023 16.2472 12.8808 16.5002 12.0003 16.5002C9.51498 16.5002 7.50026 14.4854 7.50026 12.0002C7.50026 11.1196 7.75317 10.2981 8.19031 9.60442L5.9356 7.3497ZM12.9139 14.328L9.67246 11.0866C9.5613 11.3696 9.50026 11.6777 9.50026 12.0002C9.50026 13.3809 10.6196 14.5002 12.0003 14.5002C12.3227 14.5002 12.6309 14.4391 12.9139 14.328ZM20.8068 16.5925L19.376 15.1617C20.0319 14.2268 20.5154 13.1586 20.7777 12.0002C19.8603 7.94818 16.2359 5.00016 12.0003 5.00016C11.1544 5.00016 10.3329 5.11773 9.55249 5.33818L7.97446 3.76015C9.22127 3.26959 10.5793 3.00016 12.0003 3.00016C17.3924 3.00016 21.8784 6.87992 22.8189 12.0002C22.5067 13.6998 21.8038 15.2628 20.8068 16.5925ZM11.7229 7.50857C11.8146 7.50299 11.9071 7.50016 12.0003 7.50016C14.4855 7.50016 16.5003 9.51488 16.5003 12.0002C16.5003 12.0933 16.4974 12.1858 16.4919 12.2775L11.7229 7.50857Z" />
+          </svg>
+        );
+      }}
+    />
+  ),
+};
+
+/**
+ * For some icons, you can also pass a `filled` prop to the Icon component to get a filled variant. If there is no filled variant, it will just display the normal icon.
+ */
+
+export const Filled: Story = {
+  render: () => (
+    <Flex gap="spacing-2">
+      <Icon name="stars" />
+      <Icon filled name="stars" />
+    </Flex>
+  ),
+};
+
+export const AllIcons: Story = {
+  render: () => (
+    <div
+      style={{
+        display: "grid",
+        gridTemplateColumns: "repeat(auto-fit, minmax(16px, 1fr))",
+        gap: "10px",
+        width: "-webkit-fill-available",
+      }}
+    >
+      {Object.keys(ICONS).map((icon) => (
+        <div key={icon} style={{ height: 24, width: 24 }}>
+          <Icon name={icon as keyof typeof ICONS} />
+        </div>
+      ))}
+    </div>
+  ),
+};
diff --git a/app/client/packages/design-system/widgets/src/components/IconButton/stories/IconButton.stories.mdx b/app/client/packages/design-system/widgets/src/components/IconButton/stories/IconButton.stories.mdx
deleted file mode 100644
index 7057760268..0000000000
--- a/app/client/packages/design-system/widgets/src/components/IconButton/stories/IconButton.stories.mdx
+++ /dev/null
@@ -1,101 +0,0 @@
-import { Flex, IconButton, SIZES } from "@design-system/widgets";
-import { Canvas, Meta, Story, ArgsTable } from "@storybook/blocks";
-
-<Meta
-  title="Design-system/Widgets/IconButton"
-  component={IconButton}
-  args={{
-    icon: "plus",
-  }}
-/>
-
-export const Template = (args) => <IconButton {...args} />;
-
-# IconButton
-
-Icon Button is a button component that only contains an icon.
-
-<Canvas>
-  <Story name="IconButton">{Template.bind({})}</Story>
-</Canvas>
-
-<ArgsTable story="IconButton" of={IconButton} />
-
-## Variants
-
-Just like Button component, There are 3 variants of the icon button component.
-
-<Story name="Filled">{Template.bind({})}</Story>
-
-<Story
-  name="Outlined"
-  args={{
-    variant: "outlined",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-<Story
-  name="Ghost"
-  args={{
-    variant: "ghost",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-## Semantic
-
-`IconButton` component has 3 visual style variants and 5 semantic color options, similar to `Button` component.
-
-<Story name="Semantic">
-  <Flex gap="spacing-2" wrap="wrap">
-    {["filled", "outlined", "ghost"].map((variant) =>
-      ["accent", "neutral", "positive", "negative", "warning"].map((color) => (
-        <div key={`${variant}-${color}`}>
-          <IconButton variant={variant} color={color} icon="plus" />
-        </div>
-      )),
-    )}
-  </Flex>
-</Story>
-
-## Size
-
-`IconButton` component has 3 size options. `small`, `medium`, `large`.
-
-<Story name="Size">
-  <Flex gap="spacing-2">
-    {Object.keys(SIZES)
-      .filter((size) => !["large"].includes(size))
-      .map((size) => (
-        <div key={size}>
-          <IconButton size={size} icon="plus" />
-        </div>
-      ))}
-  </Flex>
-</Story>
-
-## Disabled
-
-<Story
-  name="Disabled State"
-  args={{
-    isDisabled: true,
-  }}
->
-  {Template.bind({})}
-</Story>
-
-## Loading
-
-<Story
-  name="Loading State"
-  args={{
-    isLoading: true,
-    onPress: () => alert("on pressed"),
-  }}
->
-  {Template.bind({})}
-</Story>
diff --git a/app/client/packages/design-system/widgets/src/components/IconButton/stories/IconButton.stories.tsx b/app/client/packages/design-system/widgets/src/components/IconButton/stories/IconButton.stories.tsx
new file mode 100644
index 0000000000..c9babf0e93
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/IconButton/stories/IconButton.stories.tsx
@@ -0,0 +1,88 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import {
+  Flex,
+  IconButton,
+  SIZES,
+  BUTTON_VARIANTS,
+  COLORS,
+} from "@design-system/widgets";
+
+/**
+ * Icon Button is a button component that only contains an icon.
+ */
+const meta: Meta<typeof IconButton> = {
+  component: IconButton,
+  title: "Design-system/Widgets/IconButton",
+};
+
+export default meta;
+type Story = StoryObj<typeof IconButton>;
+
+export const Main: Story = {
+  args: {
+    icon: "star",
+  },
+};
+
+/**
+ * Just like Button component, There are 3 variants of the icon button component.
+ */
+export const Variants: Story = {
+  render: () => (
+    <Flex gap="spacing-4" wrap="wrap">
+      {Object.values(BUTTON_VARIANTS).map((variant) => (
+        <IconButton icon="star" key={`${variant}`} variant={variant} />
+      ))}
+    </Flex>
+  ),
+};
+
+/**
+ * `IconButton` component has 3 visual style variants and 5 semantic color options, similar to `Button` component.
+ */
+export const Semantic: Story = {
+  render: () => (
+    <Flex gap="1rem" wrap="wrap">
+      {Object.values(BUTTON_VARIANTS).map((variant) =>
+        Object.values(COLORS).map((color) => (
+          <IconButton
+            color={color}
+            icon="star"
+            key={`${variant}-${color}`}
+            variant={variant}
+          />
+        )),
+      )}
+    </Flex>
+  ),
+};
+
+/**
+ * The component supports two sizes `small` and `medium`. Default size is `medium`.
+ */
+export const Sizes: Story = {
+  render: () => (
+    <Flex alignItems="start" gap="spacing-2">
+      {Object.keys(SIZES)
+        .filter((size) => !["large"].includes(size))
+        .map((size) => (
+          <IconButton icon="star" key={size} size={size} />
+        ))}
+    </Flex>
+  ),
+};
+
+export const Disabled: Story = {
+  args: {
+    isDisabled: true,
+    icon: "star",
+  },
+};
+
+export const Loading: Story = {
+  args: {
+    isLoading: true,
+    icon: "star",
+  },
+};
diff --git a/app/client/packages/design-system/widgets/src/components/Menu/src/Item.tsx b/app/client/packages/design-system/widgets/src/components/Menu/src/Item.tsx
index f14f0820ff..a727192b26 100644
--- a/app/client/packages/design-system/widgets/src/components/Menu/src/Item.tsx
+++ b/app/client/packages/design-system/widgets/src/components/Menu/src/Item.tsx
@@ -1,3 +1,4 @@
+import type { ReactNode } from "react";
 import type { ReactElement } from "react";
 import { Item as HeadlessItem } from "@design-system/headless";
 import type { ItemProps as HeadlessItemProps } from "@react-types/shared";
@@ -6,13 +7,14 @@ import type { IconProps } from "../../Icon";
 import type { COLORS } from "../../../shared";
 import type { ButtonProps } from "../../Button";
 
-interface ItemProps<T> extends HeadlessItemProps<T> {
+interface ItemProps<T> extends Omit<HeadlessItemProps<T>, "children"> {
   color?: keyof typeof COLORS;
   variant?: ButtonProps["variant"];
   icon?: IconProps["name"];
   iconPosition?: "start" | "end";
   isLoading?: boolean;
   isSeparator?: boolean;
+  children?: ReactNode;
 }
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
diff --git a/app/client/packages/design-system/widgets/src/components/Menu/stories/Menu.stories.mdx b/app/client/packages/design-system/widgets/src/components/Menu/stories/Menu.stories.mdx
deleted file mode 100644
index 0551de46f0..0000000000
--- a/app/client/packages/design-system/widgets/src/components/Menu/stories/Menu.stories.mdx
+++ /dev/null
@@ -1,66 +0,0 @@
-import { COLORS } from "@design-system/widgets";
-import { Button, Menu, MenuList, Item } from "@design-system/widgets";
-import { Canvas, Meta, Story, ArgsTable } from "@storybook/addon-docs";
-
-<Meta title="Design-system/Widgets/Menu" component={Menu} />
-
-export const Template = (args) => {
-  return (
-    <Menu {...args} disabledKeys={["cut"]} onAction={(key) => console.log(key)}>
-      <Button>My trigger</Button>
-      <MenuList>
-        <Item key="copy">Copy</Item>
-        <Item key="cut">Cut</Item>
-        <Item key="paste">Paste</Item>
-      </MenuList>
-    </Menu>
-  );
-};
-
-# Menu
-
-A menu displays a list of actions or options that a user can choose.
-
-Additional information about functionality of the component can be found in the [headless component story](/?path=/docs/design-system-headless-menu--docs).
-
-<Canvas>
-  <Story name="Menu">{Template.bind({})}</Story>
-</Canvas>
-
-## Menu props
-
-<ArgsTable story="Menu" of={Menu} />
-
-## MenuList props
-
-<ArgsTable of={MenuList} />
-
-## Item props
-
-Item props are not pulled up in the ArgsTable, the data can be found [here](https://react-spectrum.adobe.com/react-aria/Menu.html#item).
-
-## Color
-
-<Story name="Color">
-  <Menu>
-    <Button>My trigger</Button>
-    <MenuList>
-      {Object.values(COLORS).map((color) => (
-        <Item color={color}>{color}</Item>
-      ))}
-    </MenuList>
-  </Menu>
-</Story>
-
-## Icon
-
-<Story name="Icon">
-  <Menu>
-    <Button>My trigger</Button>
-    <MenuList disabledKeys={["cut"]}>
-      <Item key="copy">{"Copy"}</Item>
-      <Item key="cut">{"Cut"}</Item>
-      <Item key="delete">{"Delete"}</Item>
-    </MenuList>
-  </Menu>
-</Story>
diff --git a/app/client/packages/design-system/widgets/src/components/Menu/stories/Menu.stories.tsx b/app/client/packages/design-system/widgets/src/components/Menu/stories/Menu.stories.tsx
new file mode 100644
index 0000000000..dc9f96e44d
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Menu/stories/Menu.stories.tsx
@@ -0,0 +1,49 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import { Button, Menu, MenuList, Item, COLORS } from "@design-system/widgets";
+
+/**
+ * A menu displays a list of actions or options that a user can choose.
+ *
+ * Additional information about functionality of the component can be found in the [headless component story](/?path=/docs/design-system-headless-menu--docs).
+ *
+ * Item props are not pulled up in the ArgTypes, the data can be found [here](https://react-spectrum.adobe.com/react-aria/Menu.html#item).
+ */
+const meta: Meta<typeof Menu> = {
+  component: Menu,
+  title: "Design-system/Widgets/Menu",
+};
+
+export default meta;
+type Story = StoryObj<typeof Menu>;
+
+export const Main: Story = {
+  render: (args) => (
+    <Menu {...args} disabledKeys={["cut"]} onAction={(key) => alert(key)}>
+      <Button>Press me</Button>
+      <MenuList>
+        <Item key="copy">Copy</Item>
+        <Item key="cut">Cut</Item>
+        <Item key="paste">Paste</Item>
+      </MenuList>
+    </Menu>
+  ),
+};
+
+/**
+ * Just like Button component, There are 3 variants of the icon button component.
+ */
+export const ItemColor: Story = {
+  render: () => (
+    <Menu>
+      <Button>Press me</Button>
+      <MenuList>
+        {Object.values(COLORS).map((color) => (
+          <Item color={color} key={color}>
+            {color}
+          </Item>
+        ))}
+      </MenuList>
+    </Menu>
+  ),
+};
diff --git a/app/client/packages/design-system/widgets/src/components/Modal/stories/Modal.stories.mdx b/app/client/packages/design-system/widgets/src/components/Modal/stories/Modal.stories.mdx
deleted file mode 100644
index 1a75960ef2..0000000000
--- a/app/client/packages/design-system/widgets/src/components/Modal/stories/Modal.stories.mdx
+++ /dev/null
@@ -1,58 +0,0 @@
-import {
-  Modal,
-  ModalHeader,
-  ModalFooter,
-  ModalContent,
-} from "@design-system/widgets";
-import { Canvas, Meta, Story, ArgsTable } from "@storybook/addon-docs";
-import { SimpleModal } from "./SimpleModal";
-import { ModalExamples } from "./ModalExamples";
-import { CustomModal } from "./CustomModal";
-
-<Meta title="Design-system/Widgets/Modal" component={Modal} />
-
-export const Template = (args) => {
-  return <SimpleModal {...args} />;
-};
-
-# Modal
-
-A modal is a floating element that displays information that requires immediate attention, appearing over the page content and blocking interactions with the page until it is dismissed.
-
-Modal developed on basis of Popover headless component. Additional information about functionality of Modal component can be found in the [Popover story](/docs/design-system-headless-popover--docs).
-
-<Canvas>
-  <Story name="Modal">{Template.bind({})}</Story>
-</Canvas>
-
-## Modal props
-
-<ArgsTable story="Modal" of={Modal} />
-
-## ModalContent props
-
-<ArgsTable of={ModalContent} />
-
-## ModalHeader props
-
-<ArgsTable of={ModalHeader} />
-
-## ModalBody props
-
-`ModalBody` component has no props, it is responsible for the correct layout and supports the built-in browser scroll.
-
-## ModalFooter props
-
-<ArgsTable of={ModalFooter} />
-
-# ModalExamples
-
-<Canvas>
-  <Story name="Modal Examples">{<ModalExamples />}</Story>
-</Canvas>
-
-# Custom Modal
-
-<Canvas>
-  <Story name="Custom Modal">{<CustomModal />}</Story>
-</Canvas>
diff --git a/app/client/packages/design-system/widgets/src/components/Modal/stories/Modal.stories.tsx b/app/client/packages/design-system/widgets/src/components/Modal/stories/Modal.stories.tsx
new file mode 100644
index 0000000000..9f1e8af0db
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Modal/stories/Modal.stories.tsx
@@ -0,0 +1,39 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import { Modal } from "@design-system/widgets";
+import { ModalHeader, ModalFooter, ModalContent } from "@design-system/widgets";
+import { SimpleModal } from "./SimpleModal";
+import { ModalExamples } from "./ModalExamples";
+import { CustomModal as CustomModalExample } from "./CustomModal";
+
+/**
+ * A modal is a floating element that displays information that requires immediate attention, appearing over the page content and blocking interactions with the page until it is dismissed.
+ *
+ * Modal developed on basis of Popover headless component. Additional information about functionality of Modal component can be found in the [Popover story](/docs/design-system-headless-popover--docs).
+ */
+const meta: Meta<typeof Modal> = {
+  component: Modal,
+  title: "Design-system/Widgets/Modal",
+  subcomponents: {
+    //@ts-expect-error: don't need props to pass here
+    ModalHeader,
+    //@ts-expect-error: don't need props to pass here
+    ModalFooter,
+    //@ts-expect-error: don't need props to pass here
+    ModalContent,
+  },
+  render: () => <SimpleModal />,
+};
+
+export default meta;
+type Story = StoryObj<typeof Modal>;
+
+export const Main: Story = {};
+
+export const ModalExample: Story = {
+  render: () => <ModalExamples />,
+};
+
+export const CustomModal: Story = {
+  render: () => <CustomModalExample />,
+};
diff --git a/app/client/packages/design-system/widgets/src/components/RadioGroup/stories/RadioGroup.stories.mdx b/app/client/packages/design-system/widgets/src/components/RadioGroup/stories/RadioGroup.stories.mdx
deleted file mode 100644
index 1eb3d4ea5b..0000000000
--- a/app/client/packages/design-system/widgets/src/components/RadioGroup/stories/RadioGroup.stories.mdx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { RadioGroup, Radio } from "@design-system/widgets";
-import { Canvas, Meta, Story, ArgsTable } from "@storybook/addon-docs";
-
-<Meta
-  title="Design-system/Widgets/RadioGroup"
-  component={RadioGroup}
-  args={{
-    label: "Radio Group",
-    defaultValue: "value-1",
-    children: (
-      <>
-        <Radio value="value-1">Value 1</Radio>
-        <Radio value="value-2">Value 2</Radio>
-      </>
-    ),
-  }}
-/>
-
-export const Template = (args) => <RadioGroup {...args} />;
-
-# Radio Group
-
-Radio group is a component that allows users to select one option from a set of options.
-
-<Canvas>
-  <Story name="Radio Group">{Template.bind({})}</Story>
-</Canvas>
-
-<ArgsTable story="Radio Group" of={RadioGroup} />
-
-# Orientation
-
-<Story
-  args={{
-    orientation: "vertical",
-  }}
-  name="Orientation - Vertical"
->
-  {Template.bind({})}
-</Story>
-<Story
-  args={{
-    orientation: "horizontal",
-  }}
-  name="Orientation - Horizontal"
->
-  {Template.bind({})}
-</Story>
-
-# Is Disabled
-
-<Story
-  args={{
-    isDisabled: true,
-  }}
-  name="Is Disabled"
->
-  {Template.bind({})}
-</Story>
-
-# Is Required
-
-<Story
-  args={{
-    isRequired: true,
-  }}
-  name="Is Required"
->
-  {Template.bind({})}
-</Story>
-
-# Invalid State
-
-<Story
-  args={{
-    validationState: "invalid",
-    errorMessage: "This is a error message",
-  }}
-  name="Invalid State"
->
-  {Template.bind({})}
-</Story>
diff --git a/app/client/packages/design-system/widgets/src/components/RadioGroup/stories/RadioGroup.stories.tsx b/app/client/packages/design-system/widgets/src/components/RadioGroup/stories/RadioGroup.stories.tsx
new file mode 100644
index 0000000000..7b2670ecec
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/RadioGroup/stories/RadioGroup.stories.tsx
@@ -0,0 +1,87 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import { RadioGroup, Radio, Flex } from "@design-system/widgets";
+
+/**
+ * Radio group is a component that allows users to select one option from a set of options.
+ */
+const meta: Meta<typeof RadioGroup> = {
+  component: RadioGroup,
+  title: "Design-system/Widgets/RadioGroup",
+};
+
+export default meta;
+type Story = StoryObj<typeof RadioGroup>;
+
+export const Main: Story = {
+  args: {
+    label: "Radio Group",
+    defaultValue: "value-1",
+  },
+  render: (args) => (
+    <RadioGroup {...args}>
+      <Radio value="value-1">Value 1</Radio>
+      <Radio value="value-2">Value 2</Radio>
+    </RadioGroup>
+  ),
+};
+
+/**
+ * The component supports two label orientations `vertical` and `horizontal`. Default size is `horizontal`.
+ */
+export const Orientation: Story = {
+  render: () => (
+    <Flex direction="column" gap="spacing-4">
+      <RadioGroup>
+        <Radio value="value-1">Value 1</Radio>
+        <Radio value="value-2">Value 2</Radio>
+      </RadioGroup>
+      <RadioGroup orientation="vertical">
+        <Radio value="value-1">Value 1</Radio>
+        <Radio value="value-2">Value 2</Radio>
+      </RadioGroup>
+    </Flex>
+  ),
+};
+
+export const Disabled: Story = {
+  args: {
+    label: "Radio Group",
+    defaultValue: "value-1",
+    isDisabled: true,
+  },
+  render: (args) => (
+    <RadioGroup {...args}>
+      <Radio value="value-1">Value 1</Radio>
+      <Radio value="value-2">Value 2</Radio>
+    </RadioGroup>
+  ),
+};
+
+export const Required: Story = {
+  args: {
+    label: "Radio Group",
+    defaultValue: "value-1",
+    isRequired: true,
+  },
+  render: (args) => (
+    <RadioGroup {...args}>
+      <Radio value="value-1">Value 1</Radio>
+      <Radio value="value-2">Value 2</Radio>
+    </RadioGroup>
+  ),
+};
+
+export const Invalid: Story = {
+  args: {
+    label: "Radio Group",
+    validationState: "invalid",
+    errorMessage: "This is a error message",
+  },
+  render: (args) => (
+    <RadioGroup {...args}>
+      <Radio value="value-1">Value 1</Radio>
+      <Radio value="value-2">Value 2</Radio>
+    </RadioGroup>
+  ),
+};
diff --git a/app/client/packages/design-system/widgets/src/components/Select/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Select/src/styles.module.css
index 2f5ff969e6..871b47ec31 100644
--- a/app/client/packages/design-system/widgets/src/components/Select/src/styles.module.css
+++ b/app/client/packages/design-system/widgets/src/components/Select/src/styles.module.css
@@ -77,7 +77,8 @@
   z-index: var(--z-index-99);
   box-shadow: var(--box-shadow-1);
   min-inline-size: var(--trigger-width);
-  max-height: var(--sizing-150);
+  max-height: inherit;
+  min-height: unset;
   overflow-y: auto;
 }
 
diff --git a/app/client/packages/design-system/widgets/src/components/Select/stories/Select.stories.mdx b/app/client/packages/design-system/widgets/src/components/Select/stories/Select.stories.mdx
deleted file mode 100644
index ce849d7401..0000000000
--- a/app/client/packages/design-system/widgets/src/components/Select/stories/Select.stories.mdx
+++ /dev/null
@@ -1,96 +0,0 @@
-import { Canvas, Meta, Story, ArgsTable } from "@storybook/addon-docs";
-import { Select, Button, Flex, SIZES } from "@design-system/widgets";
-
-export const items = [
-  { key: 1, name: "Aerospace", icon: "rocket" },
-  { key: 2, name: "Mechanical", icon: "settings" },
-  { key: 3, name: "Civil" },
-  { key: 4, name: "Biomedical" },
-  { key: 5, name: "Nuclear" },
-  { key: 6, name: "Industrial" },
-  { key: 7, name: "Chemical" },
-  { key: 8, name: "Agricultural" },
-  { key: 9, name: "Electrical" },
-];
-
-<Meta
-  title="Design-system/Widgets/Select"
-  component={Select}
-  args={{
-    items: items,
-  }}
-/>
-
-export const Template = (args) => (
-  <Flex width="sizing-60">
-    <Select {...args} />
-  </Flex>
-);
-
-# Select
-
-A select displays a collapsible list of options and allows a user to select one of them.
-
-<Canvas>
-  <Story name="Select">{Template.bind({})}</Story>
-</Canvas>
-
-<ArgsTable story="Select" of={Select} />
-
-## Size
-
-<Story name="Size">
-  <Flex direction="column" gap="spacing-2" width="sizing-60">
-    {Object.keys(SIZES)
-      .filter((size) => !["large"].includes(size))
-      .map((size) => (
-        <Select placeholder={size} items={items} size={size} />
-      ))}
-  </Flex>
-</Story>
-
-## Loading
-
-<Story
-  name="Loading"
-  args={{
-    placeholder: "Loading",
-    isLoading: true,
-  }}
->
-  {Template.bind({})}
-</Story>
-
-## Validation
-
-<Story name="Validation">
-  <form
-    onSubmit={(e) => {
-      e.preventDefault();
-      alert("Form submitted");
-    }}
-  >
-    <Flex gap="spacing-2" direction="column" width="sizing-60">
-      <Select
-        label="Validation"
-        isRequired
-        description="description"
-        items={items}
-      />
-      <Button type="submit">Submit</Button>
-    </Flex>
-  </form>
-</Story>
-
-## Contextual Help Text
-
-<Story
-  name="Contextual Help Text"
-  args={{
-    label: "Label",
-    placeholder: "Contextual Help Text",
-    contextualHelp: "This is a contextual help text",
-  }}
->
-  {Template.bind({})}
-</Story>
diff --git a/app/client/packages/design-system/widgets/src/components/Select/stories/Select.stories.tsx b/app/client/packages/design-system/widgets/src/components/Select/stories/Select.stories.tsx
new file mode 100644
index 0000000000..d43b975a4c
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Select/stories/Select.stories.tsx
@@ -0,0 +1,91 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import { Select, Button, Flex, SIZES } from "@design-system/widgets";
+import type { SelectItem } from "../src/types";
+
+/**
+ * A select displays a collapsible list of options and allows a user to select one of them.
+ */
+const meta: Meta<typeof Select> = {
+  component: Select,
+  title: "Design-system/Widgets/Select",
+};
+
+export default meta;
+type Story = StoryObj<typeof Select>;
+
+const items: SelectItem[] = [
+  { key: 1, name: "Aerospace", icon: "rocket" },
+  { key: 2, name: "Mechanical", icon: "settings" },
+  { key: 3, name: "Civil" },
+  { key: 4, name: "Biomedical" },
+  { key: 5, name: "Nuclear" },
+  { key: 6, name: "Industrial" },
+  { key: 7, name: "Chemical" },
+  { key: 8, name: "Agricultural" },
+  { key: 9, name: "Electrical" },
+];
+
+export const Main: Story = {
+  args: {
+    items: items,
+  },
+  render: (args) => (
+    <Flex width="sizing-60">
+      <Select {...args} />
+    </Flex>
+  ),
+};
+
+/**
+ * The component supports two sizes `small` and `medium`. Default size is `medium`.
+ */
+export const Sizes: Story = {
+  render: () => (
+    <Flex direction="column" gap="spacing-4" width="sizing-60">
+      {Object.keys(SIZES)
+        .filter((size) => !["large"].includes(size))
+        .map((size) => (
+          <Select items={items} key={size} placeholder={size} size={size} />
+        ))}
+    </Flex>
+  ),
+};
+
+export const Loading: Story = {
+  args: {
+    placeholder: "Loading",
+    isLoading: true,
+    items: items,
+  },
+};
+
+export const Validation: Story = {
+  render: () => (
+    <form
+      onSubmit={(e) => {
+        e.preventDefault();
+        alert("Form submitted");
+      }}
+    >
+      <Flex direction="column" gap="spacing-2" width="sizing-60">
+        <Select
+          description="description"
+          isRequired
+          items={items}
+          label="Validation"
+        />
+        <Button type="submit">Submit</Button>
+      </Flex>
+    </form>
+  ),
+};
+
+export const ContextualHelp: Story = {
+  args: {
+    label: "Label",
+    placeholder: "Contextual Help Text",
+    contextualHelp: "This is a contextual help text",
+    items: items,
+  },
+};
diff --git a/app/client/packages/design-system/widgets/src/components/Switch/stories/Switch.stories.mdx b/app/client/packages/design-system/widgets/src/components/Switch/stories/Switch.stories.mdx
deleted file mode 100644
index 73c791a5d4..0000000000
--- a/app/client/packages/design-system/widgets/src/components/Switch/stories/Switch.stories.mdx
+++ /dev/null
@@ -1,92 +0,0 @@
-import { Switch } from "@design-system/widgets";
-import { Canvas, Meta, Story, ArgsTable } from "@storybook/addon-docs";
-
-<Meta
-  title="Design-system/widgets/Switch"
-  component={Switch}
-  args={{
-    children: "Toggle me",
-  }}
-/>
-
-export const Template = (args) => <Switch {...args} />;
-
-# Switch
-
-Switch is a component that allows the user to select one or more options from a set.
-
-<Canvas>
-  <Story name="Switch">{Template.bind({})}</Story>
-</Canvas>
-
-<ArgsTable story="Switch" of={Switch} />
-
-### States
-
-<Story
-  name="State - unchecked"
-  args={{
-    children: "Unchecked",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-<Story
-  name="State - Default Checked"
-  args={{
-    defaultSelected: true,
-    children: "Checked",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-<Story
-  name="State - Disabled"
-  args={{
-    defaultSelected: true,
-    children: "Disabled",
-    isDisabled: true,
-  }}
->
-  {Template.bind({})}
-</Story>
-
-<Story
-  name="State - Disabled unchecked"
-  args={{
-    children: "Disabled unchecked",
-    isDisabled: true,
-  }}
->
-  {Template.bind({})}
-</Story>
-
-### Label Position
-
-<Story
-  parameters={{
-    width: 250,
-  }}
-  name="Label Position - Start"
-  args={{
-    labelPosition: "start",
-    children: "Label Position - Start",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-<Story
-  parameters={{
-    width: 250,
-  }}
-  name="Label Position - End"
-  args={{
-    labelPosition: "end",
-    children: "Label Position - End",
-  }}
->
-  {Template.bind({})}
-</Story>
diff --git a/app/client/packages/design-system/widgets/src/components/Switch/stories/Switch.stories.tsx b/app/client/packages/design-system/widgets/src/components/Switch/stories/Switch.stories.tsx
new file mode 100644
index 0000000000..4e68a885d1
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Switch/stories/Switch.stories.tsx
@@ -0,0 +1,46 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import { Switch, Flex } from "@design-system/widgets";
+
+/**
+ * Switch is a component that allows the user to select one or more options from a set.
+ */
+const meta: Meta<typeof Switch> = {
+  component: Switch,
+  title: "Design-system/Widgets/Switch",
+};
+
+export default meta;
+type Story = StoryObj<typeof Switch>;
+
+export const Main: Story = {
+  args: {
+    children: "Toggle me",
+  },
+};
+
+export const States: Story = {
+  render: () => (
+    <Flex direction="column" gap="spacing-4">
+      <Switch>Unchecked</Switch>
+      <Switch defaultSelected>Checked</Switch>
+      <Switch isDisabled>Disabled</Switch>
+      <Switch defaultSelected isDisabled>
+        Disabled checked
+      </Switch>
+      <Switch validationState="invalid">Error</Switch>
+    </Flex>
+  ),
+};
+
+/**
+ * The component supports two label positions `start` and `end`. Default size is `start`.
+ */
+export const LabelPosition: Story = {
+  render: () => (
+    <Flex direction="column" gap="spacing-4">
+      <Switch>Label Position — end</Switch>
+      <Switch labelPosition="end">Label Position — start</Switch>
+    </Flex>
+  ),
+};
diff --git a/app/client/packages/design-system/widgets/src/components/SwitchGroup/stories/SwitchGroup.stories.mdx b/app/client/packages/design-system/widgets/src/components/SwitchGroup/stories/SwitchGroup.stories.mdx
deleted file mode 100644
index 0cfbf83765..0000000000
--- a/app/client/packages/design-system/widgets/src/components/SwitchGroup/stories/SwitchGroup.stories.mdx
+++ /dev/null
@@ -1,83 +0,0 @@
-import { Switch, SwitchGroup } from "@design-system/widgets";
-import { Canvas, Meta, Story, ArgsTable } from "@storybook/addon-docs";
-
-<Meta
-  title="Design-system/widgets/SwitchGroup"
-  component={SwitchGroup}
-  args={{
-    label: "Switch Group",
-    defaultValue: ["value-1"],
-    children: (
-      <>
-        <Switch value="value-1">Value 1</Switch>
-        <Switch value="value-2">Value 2</Switch>
-      </>
-    ),
-  }}
-/>
-
-export const Template = (args) => <SwitchGroup {...args} />;
-
-# Switch Group
-
-Switch Group is a group of checkboxes that can be selected together.
-
-<Canvas>
-  <Story name="Switch Group">{Template.bind({})}</Story>
-</Canvas>
-
-<ArgsTable story="Switch Group" of={SwitchGroup} />
-
-# Orientation
-
-<Story
-  args={{
-    orientation: "vertical",
-  }}
-  name="Orientation - Vertical"
->
-  {Template.bind({})}
-</Story>
-
-<Story
-  args={{
-    orientation: "horizontal",
-  }}
-  name="Orientation - Horizontal"
->
-  {Template.bind({})}
-</Story>
-
-# Is Disabled
-
-<Story
-  args={{
-    isDisabled: true,
-  }}
-  name="Is Disabled"
->
-  {Template.bind({})}
-</Story>
-
-# Is Required
-
-<Story
-  args={{
-    isRequired: true,
-  }}
-  name="Is Required"
->
-  {Template.bind({})}
-</Story>
-
-# Invalid State
-
-<Story
-  args={{
-    validationState: "invalid",
-    errorMessage: "This is a error message",
-  }}
-  name="Invalid State"
->
-  {Template.bind({})}
-</Story>
diff --git a/app/client/packages/design-system/widgets/src/components/SwitchGroup/stories/SwitchGroup.stories.tsx b/app/client/packages/design-system/widgets/src/components/SwitchGroup/stories/SwitchGroup.stories.tsx
new file mode 100644
index 0000000000..8874b6f0c4
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/SwitchGroup/stories/SwitchGroup.stories.tsx
@@ -0,0 +1,88 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import { SwitchGroup, Flex, Switch } from "@design-system/widgets";
+
+/**
+ * Switch Group is a group of Switches that can be selected together.
+ */
+const meta: Meta<typeof SwitchGroup> = {
+  component: SwitchGroup,
+  title: "Design-system/Widgets/SwitchGroup",
+};
+
+export default meta;
+type Story = StoryObj<typeof SwitchGroup>;
+
+export const Main: Story = {
+  args: {
+    label: "Switch Group",
+    defaultValue: ["value-1"],
+  },
+  render: (args) => (
+    <SwitchGroup {...args}>
+      <Switch value="value-1">Value 1</Switch>
+      <Switch value="value-2">Value 2</Switch>
+    </SwitchGroup>
+  ),
+};
+
+/**
+ * The component supports two label orientations `vertical` and `horizontal`. Default size is `horizontal`.
+ */
+export const Orientation: Story = {
+  render: () => (
+    <Flex direction="column" gap="spacing-4">
+      <SwitchGroup>
+        <Switch value="value-1">Value 1</Switch>
+        <Switch value="value-2">Value 2</Switch>
+      </SwitchGroup>
+      <SwitchGroup optionsLabelPosition="start" orientation="vertical">
+        <Switch value="value-1">Value 1</Switch>
+        <Switch value="value-2">Value 2</Switch>
+      </SwitchGroup>
+    </Flex>
+  ),
+};
+
+export const Disabled: Story = {
+  args: {
+    label: "Switch Group",
+    defaultValue: ["value-1"],
+    isDisabled: true,
+  },
+  render: (args) => (
+    <SwitchGroup {...args}>
+      <Switch value="value-1">Value 1</Switch>
+      <Switch value="value-2">Value 2</Switch>
+    </SwitchGroup>
+  ),
+};
+
+export const Required: Story = {
+  args: {
+    label: "Switch Group",
+    defaultValue: ["value-1"],
+    isRequired: true,
+  },
+  render: (args) => (
+    <SwitchGroup {...args}>
+      <Switch value="value-1">Value 1</Switch>
+      <Switch value="value-2">Value 2</Switch>
+    </SwitchGroup>
+  ),
+};
+
+export const Invalid: Story = {
+  args: {
+    label: "Switch Group",
+    defaultValue: ["value-1"],
+    validationState: "invalid",
+    errorMessage: "This is a error message",
+  },
+  render: (args) => (
+    <SwitchGroup {...args}>
+      <Switch value="value-1">Value 1</Switch>
+      <Switch value="value-2">Value 2</Switch>
+    </SwitchGroup>
+  ),
+};
diff --git a/app/client/packages/design-system/widgets/src/components/TagGroup/src/Tag.tsx b/app/client/packages/design-system/widgets/src/components/TagGroup/src/Tag.tsx
index 11f2bbb25e..0de4220619 100644
--- a/app/client/packages/design-system/widgets/src/components/TagGroup/src/Tag.tsx
+++ b/app/client/packages/design-system/widgets/src/components/TagGroup/src/Tag.tsx
@@ -24,7 +24,7 @@ function Tag({ children, ...props }: HeadlessTagProps) {
           <span>{children}</span>
           {allowsRemoving && (
             <HeadlessButton slot="remove">
-              <Icon name="cross" />
+              <Icon name="x" />
             </HeadlessButton>
           )}
         </>
diff --git a/app/client/packages/design-system/widgets/src/components/TagGroup/src/TagGroup.tsx b/app/client/packages/design-system/widgets/src/components/TagGroup/src/TagGroup.tsx
index dc30e230f4..bb90da5ee2 100644
--- a/app/client/packages/design-system/widgets/src/components/TagGroup/src/TagGroup.tsx
+++ b/app/client/packages/design-system/widgets/src/components/TagGroup/src/TagGroup.tsx
@@ -14,7 +14,7 @@ import { Text } from "../../Text";
 import styles from "./styles.module.css";
 import { getTypographyClassName } from "@design-system/theming";
 
-interface TagGroupProps<T>
+export interface TagGroupProps<T>
   extends Omit<HeadlessTagGroupProps, "children">,
     Pick<HeadlessTagListProps<T>, "items" | "children" | "renderEmptyState"> {
   label?: string;
diff --git a/app/client/packages/design-system/widgets/src/components/TagGroup/stories/TagGroup.stories.mdx b/app/client/packages/design-system/widgets/src/components/TagGroup/stories/TagGroup.stories.mdx
deleted file mode 100644
index 8827f3c08b..0000000000
--- a/app/client/packages/design-system/widgets/src/components/TagGroup/stories/TagGroup.stories.mdx
+++ /dev/null
@@ -1,157 +0,0 @@
-import { TagGroup, Tag } from "@design-system/widgets";
-import { Canvas, Meta, Story, ArgsTable } from "@storybook/addon-docs";
-
-<Meta
-  title="Design-system/Widgets/TagGroup"
-  component={TagGroup}
-  args={{
-    onRemove: undefined,
-    children: (
-      <>
-        <Tag id="value-1">Value 1</Tag>
-        <Tag id="value-2">Value 2</Tag>
-        <Tag id="value-3">Value 3</Tag>
-        <Tag id="value-4">Value 4</Tag>
-      </>
-    ),
-  }}
-/>
-
-export const Template = (args) => <TagGroup {...args} />;
-
-# Tag Group
-
-Tag Group is a group of checkboxes that can be selected together.
-
-<Canvas>
-  <Story name="Tag Group">{Template.bind({})}</Story>
-</Canvas>
-
-## Props ( Tag Group )
-
-<ArgsTable of={TagGroup} />
-
-## Props ( Tag )
-
-<ArgsTable of={Tag} />
-
-# Single Selection Mode
-
-Tag Group can be configured to allow only one selection at a time with the `selectionMode` prop.
-
-<Canvas>
-  <Story
-    name="Single Selection Mode"
-    args={{
-      selectionMode: "single",
-    }}
-  >
-    {Template.bind({})}
-  </Story>
-</Canvas>
-
-# Multiple Selection Mode
-
-Tag Group can be configured to allow multiple selections at a time with the `selectionMode` prop with value `multiple`.
-
-<Canvas>
-  <Story
-    name="Multiple Selection Mode"
-    args={{
-      selectionMode: "multiple",
-    }}
-  >
-    {Template.bind({})}
-  </Story>
-</Canvas>
-
-## Removing Tags
-
-Tags can be removed with the `onRemove` prop. The Tag will render a close icon when this prop is provided on the TagGroup.
-
-<Canvas>
-  <Story
-    name="Removing Tags"
-    args={{
-      onRemove: (id) => {
-        console.log(id);
-      },
-    }}
-  >
-    {Template.bind({})}
-  </Story>
-</Canvas>
-
-## Disabled Tags
-
-Tags can be disabled with the `disabledKeys` prop.
-
-<Canvas>
-  <Story
-    name="Disabled Tags"
-    args={{
-      selectionMode: "multiple",
-      disabledKeys: ["value-2"],
-    }}
-  >
-    {Template.bind({})}
-  </Story>
-</Canvas>
-
-## Empty State
-
-<Canvas>
-  <Story
-    name="Empty State"
-    args={{
-      renderEmptyState: () => "No categories.",
-      children: undefined,
-    }}
-  >
-    {Template.bind({})}
-  </Story>
-</Canvas>
-
-## With Label
-
-<Canvas>
-  <Story
-    name="With Label"
-    args={{
-      label: "Categories",
-      selectionMode: "multiple",
-    }}
-  >
-    {Template.bind({})}
-  </Story>
-</Canvas>
-
-## With Description
-
-<Canvas>
-  <Story
-    name="With Description"
-    args={{
-      label: "Categories",
-      description: "Select one or more categories.",
-      selectionMode: "multiple",
-    }}
-  >
-    {Template.bind({})}
-  </Story>
-</Canvas>
-
-## With Error
-
-<Canvas>
-  <Story
-    name="With Error"
-    args={{
-      label: "Categories",
-      selectionMode: "multiple",
-      errorMessage: "Please select at least one category.",
-    }}
-  >
-    {Template.bind({})}
-  </Story>
-</Canvas>
diff --git a/app/client/packages/design-system/widgets/src/components/TagGroup/stories/TagGroup.stories.tsx b/app/client/packages/design-system/widgets/src/components/TagGroup/stories/TagGroup.stories.tsx
new file mode 100644
index 0000000000..2d747957e6
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/TagGroup/stories/TagGroup.stories.tsx
@@ -0,0 +1,104 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import { TagGroup, Tag } from "@design-system/widgets";
+import type { TagGroupProps } from "../src/TagGroup";
+
+/**
+ * Tag Group is a group of checkboxes that can be selected together.
+ */
+const meta: Meta<typeof TagGroup> = {
+  component: TagGroup,
+  title: "Design-system/Widgets/TagGroup",
+  subcomponents: {
+    Tag,
+  },
+};
+
+export default meta;
+type Story = StoryObj<typeof TagGroup>;
+
+const TagGroupExample = (args: TagGroupProps<object>) => (
+  <TagGroup {...args}>
+    <Tag id="value-1">Value 1</Tag>
+    <Tag id="value-2">Value 2</Tag>
+    <Tag id="value-3">Value 3</Tag>
+    <Tag id="value-4">Value 4</Tag>
+  </TagGroup>
+);
+
+export const Main: Story = {
+  render: (args) => <TagGroupExample {...args} />,
+};
+
+/**
+ * Tag Group can be configured to allow only one selection at a time with the `selectionMode` prop.
+ */
+export const SingleSelection: Story = {
+  args: { selectionMode: "single" },
+  render: (args) => <TagGroupExample {...args} />,
+};
+
+/**
+ * Tag Group can be configured to allow multiple selections at a time with the `selectionMode` prop with value `multiple`.
+ */
+export const MultipleSelection: Story = {
+  args: { selectionMode: "multiple" },
+  render: (args) => <TagGroupExample {...args} />,
+};
+
+/**
+ * Tags can be removed with the `onRemove` prop. The Tag will render a close icon when this prop is provided on the TagGroup.
+ */
+export const RemovingTags: Story = {
+  args: {
+    onRemove: (id) => {
+      alert(id);
+    },
+  },
+  render: (args) => <TagGroupExample {...args} />,
+};
+
+/**
+ * Tags can be disabled with the `disabledKeys` prop.
+ */
+export const DisabledTags: Story = {
+  args: {
+    selectionMode: "multiple",
+    disabledKeys: ["value-2"],
+  },
+  render: (args) => <TagGroupExample {...args} />,
+};
+
+export const EmptyState: Story = {
+  args: {
+    renderEmptyState: () => "No categories.",
+    children: undefined,
+  },
+  render: (args) => <TagGroupExample {...args} />,
+};
+
+export const WithLabel: Story = {
+  args: {
+    label: "Categories",
+    selectionMode: "multiple",
+  },
+  render: (args) => <TagGroupExample {...args} />,
+};
+
+export const WithDescription: Story = {
+  args: {
+    label: "Categories",
+    description: "Select one or more categories.",
+    selectionMode: "multiple",
+  },
+  render: (args) => <TagGroupExample {...args} />,
+};
+
+export const WithError: Story = {
+  args: {
+    label: "Categories",
+    selectionMode: "multiple",
+    errorMessage: "Please select at least one category.",
+  },
+  render: (args) => <TagGroupExample {...args} />,
+};
diff --git a/app/client/packages/design-system/widgets/src/components/Text/stories/Text.stories.mdx b/app/client/packages/design-system/widgets/src/components/Text/stories/Text.stories.mdx
deleted file mode 100644
index c9e87d51a9..0000000000
--- a/app/client/packages/design-system/widgets/src/components/Text/stories/Text.stories.mdx
+++ /dev/null
@@ -1,93 +0,0 @@
-import {
-  TYPOGRAPHY_VARIANTS,
-  TYPOGRAPHY_FONT_WEIGHTS,
-} from "@design-system/theming";
-import { Text, Flex, COLORS } from "@design-system/widgets";
-import { Canvas, Meta, Story, ArgsTable } from "@storybook/addon-docs";
-
-<Meta
-  title="Design-system/Widgets/Text"
-  component={Text}
-  args={{
-    children:
-      "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged.",
-  }}
-/>
-
-export const Template = (args) => <Text {...args} />;
-
-# Text
-
-Text is a component that renders a capsized text.
-
-<Canvas>
-  <Story name="Text">{Template.bind({})}</Story>
-</Canvas>
-
-<ArgsTable of={Text} story="Text" />
-
-## Line clamp
-
-<Story
-  name="Line clamp"
-  parameters={{
-    width: 300,
-  }}
-  args={{
-    lineClamp: 2,
-  }}
->
-  {Template.bind({})}
-</Story>
-
-## Variant
-
-<Story name="Variant">
-  <Flex
-    flex="1"
-    gap="spacing-6"
-    alignItems="center"
-    justifyContent="start"
-    direction="row-reverse"
-  >
-    {Object.values(TYPOGRAPHY_VARIANTS).map((variant) => (
-      <Text variant={variant}>aA</Text>
-    ))}
-  </Flex>
-</Story>
-
-## Color
-
-<Story name="Color">
-  <Flex
-    flex="1"
-    gap="spacing-6"
-    alignItems="center"
-    justifyContent="start"
-    direction="row-reverse"
-  >
-    {Object.values(COLORS).map((color) => (
-      <Text variant="heading" color={color}>
-        aA
-      </Text>
-    ))}
-  </Flex>
-</Story>
-
-## Font weight
-
-<Story name="FontWeight">
-  <Flex
-    flex="1"
-    gap="spacing-6"
-    alignItems="center"
-    justifyContent="start"
-    direction="row-reverse"
-  >
-    {Object.values(TYPOGRAPHY_FONT_WEIGHTS).map((fontWeight) => (
-      <Text variant="heading" fontWeight={fontWeight}>
-        aA
-      </Text>
-    ))}
-  </Flex>
-</Story>
diff --git a/app/client/packages/design-system/widgets/src/components/Text/stories/Text.stories.tsx b/app/client/packages/design-system/widgets/src/components/Text/stories/Text.stories.tsx
new file mode 100644
index 0000000000..e7c07d25df
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Text/stories/Text.stories.tsx
@@ -0,0 +1,90 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import {
+  TYPOGRAPHY_VARIANTS,
+  TYPOGRAPHY_FONT_WEIGHTS,
+} from "@design-system/theming";
+import { Text, Flex, COLORS } from "@design-system/widgets";
+
+/**
+ * Text is a component that renders a capsized text.
+ */
+const meta: Meta<typeof Text> = {
+  component: Text,
+  title: "Design-system/Widgets/Text",
+};
+
+export default meta;
+type Story = StoryObj<typeof Text>;
+
+export const Main: Story = {
+  args: {
+    children:
+      "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged.",
+  },
+};
+
+export const LineClamp: Story = {
+  parameters: {
+    width: 300,
+  },
+  args: {
+    lineClamp: 1,
+    children:
+      "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged.",
+  },
+};
+
+export const Variant: Story = {
+  render: () => (
+    <Flex
+      alignItems="center"
+      direction="row-reverse"
+      flex="1"
+      gap="spacing-6"
+      justifyContent="start"
+    >
+      {Object.values(TYPOGRAPHY_VARIANTS).map((variant) => (
+        <Text key={variant} variant={variant}>
+          {variant}
+        </Text>
+      ))}
+    </Flex>
+  ),
+};
+
+export const Color: Story = {
+  render: () => (
+    <Flex
+      alignItems="center"
+      direction="row-reverse"
+      flex="1"
+      gap="spacing-6"
+      justifyContent="start"
+    >
+      {Object.values(COLORS).map((color) => (
+        <Text color={color} key={color}>
+          {color}
+        </Text>
+      ))}
+    </Flex>
+  ),
+};
+
+export const FontWeight: Story = {
+  render: () => (
+    <Flex
+      alignItems="center"
+      direction="row-reverse"
+      flex="1"
+      gap="spacing-6"
+      justifyContent="start"
+    >
+      {Object.values(TYPOGRAPHY_FONT_WEIGHTS).map((fontWeight) => (
+        <Text fontWeight={fontWeight} key={fontWeight}>
+          {fontWeight}
+        </Text>
+      ))}
+    </Flex>
+  ),
+};
diff --git a/app/client/packages/design-system/widgets/src/components/TextArea/stories/TextArea.stories.mdx b/app/client/packages/design-system/widgets/src/components/TextArea/stories/TextArea.stories.mdx
deleted file mode 100644
index 6144422e17..0000000000
--- a/app/client/packages/design-system/widgets/src/components/TextArea/stories/TextArea.stories.mdx
+++ /dev/null
@@ -1,95 +0,0 @@
-import { Canvas, Meta, Story, ArgsTable } from "@storybook/addon-docs";
-
-import { TextArea } from "@design-system/widgets";
-
-<Meta
-  title="Design-system/widgets/TextArea"
-  component={TextArea}
-  args={{
-    label: "Label",
-    placeholder: "Placeholder",
-  }}
-/>
-
-export const Template = (args) => <TextArea {...args} />;
-
-# TextArea
-
-TextArea is a component that is similar to the native textarea element, but with a few extra features.
-
-<Canvas>
-  <Story name="TextArea">{Template.bind({})}</Story>
-</Canvas>
-
-<ArgsTable of={TextArea} story="TextArea" />
-
-## Description
-
-<Story
-  name="Description"
-  args={{
-    placeholder: "Description",
-    description: "This is a description",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-## Disabled
-
-<Story
-  name="Disabled"
-  args={{
-    placeholder: "Disabled",
-    isDisabled: true,
-  }}
->
-  {Template.bind({})}
-</Story>
-
-## Validation
-
-<Story
-  name="Validation"
-  args={{
-    placeholder: "Validation",
-    validationState: "invalid",
-    errorMessage: "This field is required",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-## Required and Optional
-
-<Story
-  name="Required - Icon"
-  args={{
-    placeholder: "Required - Icon Indicator",
-    isRequired: true,
-  }}
->
-  {Template.bind({})}
-</Story>
-
-<Story
-  name="Required - Label"
-  args={{
-    placeholder: "Required - Label Indicator",
-    isRequired: true,
-    necessityIndicator: "label",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-<Story
-  name="Optional - Label"
-  args={{
-    placeholder: "Required - Label Indicator",
-    isRequired: false,
-    necessityIndicator: "label",
-  }}
->
-  {Template.bind({})}
-</Story>
diff --git a/app/client/packages/design-system/widgets/src/components/TextArea/stories/TextArea.stories.tsx b/app/client/packages/design-system/widgets/src/components/TextArea/stories/TextArea.stories.tsx
new file mode 100644
index 0000000000..6946ae6d22
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/TextArea/stories/TextArea.stories.tsx
@@ -0,0 +1,65 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import { TextArea, Flex } from "@design-system/widgets";
+
+/**
+ * TextArea is a component that is similar to the native textarea element, but with a few extra features.
+ */
+const meta: Meta<typeof TextArea> = {
+  component: TextArea,
+  title: "Design-system/Widgets/TextArea",
+};
+
+export default meta;
+type Story = StoryObj<typeof TextArea>;
+
+export const Main: Story = {
+  args: {
+    label: "Label",
+    placeholder: "Placeholder",
+  },
+};
+
+export const Description: Story = {
+  args: {
+    placeholder: "Description",
+    description: "This is a description",
+  },
+};
+
+export const Disabled: Story = {
+  args: {
+    placeholder: "Disabled",
+    isDisabled: true,
+  },
+};
+
+export const Validation: Story = {
+  args: {
+    placeholder: "Validation",
+    validationState: "invalid",
+    errorMessage: "This field is required",
+  },
+};
+
+export const RequiredIndicator: Story = {
+  render: () => (
+    <Flex direction="column" gap="spacing-4" width="100%">
+      <TextArea isRequired label="Required - Icon Indicator" />
+      <TextArea
+        isRequired
+        label="Required - Label Indicator"
+        necessityIndicator="label"
+      />
+      <TextArea label="Required - Label Indicator" necessityIndicator="label" />
+    </Flex>
+  ),
+};
+
+export const ContextualHelp: Story = {
+  args: {
+    label: "Label",
+    placeholder: "Contextual Help Text",
+    contextualHelp: "This is a contextual help text",
+  },
+};
diff --git a/app/client/packages/design-system/widgets/src/components/TextInput/stories/TextInput.stories.mdx b/app/client/packages/design-system/widgets/src/components/TextInput/stories/TextInput.stories.mdx
deleted file mode 100644
index 4254a202f8..0000000000
--- a/app/client/packages/design-system/widgets/src/components/TextInput/stories/TextInput.stories.mdx
+++ /dev/null
@@ -1,264 +0,0 @@
-import {
-  Flex,
-  Icon,
-  SIZES,
-  Button,
-  Menu,
-  MenuList,
-  Item,
-} from "@design-system/widgets";
-import { TextInput } from "@design-system/widgets";
-import { Canvas, Meta, Story, ArgsTable } from "@storybook/addon-docs";
-
-<Meta
-  title="Design-system/widgets/TextInput"
-  component={TextInput}
-  args={{
-    label: "Label",
-    placeholder: "Placeholder",
-  }}
-/>
-
-export const Template = (args) => <TextInput {...args} />;
-
-# TextInput
-
-TextInput is a component that allows users to input text.
-
-<Canvas>
-  <Story name="TextInput">{Template.bind({})}</Story>
-</Canvas>
-
-<ArgsTable of={TextInput} story="TextInput" />
-
-## Default Value
-
-<Story
-  name="Default Value"
-  args={{
-    placeholder: "Default Value",
-    defaultValue: "Default Value",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-## Description
-
-<Story
-  name="Description"
-  args={{
-    placeholder: "Description",
-    description: "This is a description",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-## Size
-
-<Story name="Size">
-  <Flex direction="column" gap="spacing-2">
-    {Object.keys(SIZES)
-      .filter((size) => !["large"].includes(size))
-      .map((size) => (
-        <TextInput
-          placeholder={size}
-          size={size}
-          startIcon={<Icon name="user" />}
-          key={size}
-          prefix={<Icon name="user" size={size} />}
-        />
-      ))}
-  </Flex>
-</Story>
-
-## Prefix and Suffix
-
-We can use icon strings or even components, such as menus, as a prefix and suffix.
-
-<Story
-  name="Prefix"
-  args={{
-    placeholder: "Start Visual",
-    prefix: "$",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-<Story
-  name="Suffix"
-  args={{
-    placeholder: "End Visual",
-    suffix: "minutes",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-<Story
-  name="Prefix and Suffix"
-  args={{
-    placeholder: "End Visual",
-    prefix: <Icon name="user" />,
-    suffix: <Icon name="user" />,
-  }}
->
-  {Template.bind({})}
-</Story>
-
-<Story
-  name="Prefix menu"
-  args={{
-    placeholder: "End Visual",
-    prefix: (
-      <Menu disabledKeys={["cut"]} onAction={(key) => console.log(key)}>
-        <Button color="neutral" variant="ghost" icon="chevron-down" />
-        <MenuList>
-          <Item key="copy">Copy</Item>
-          <Item key="cut">Cut</Item>
-          <Item key="paste">Paste</Item>
-        </MenuList>
-      </Menu>
-    ),
-  }}
->
-  {Template.bind({})}
-</Story>
-
-## Type Password
-
-The icon button for input type password type occupies the same slot as the suffix and has priority.
-
-<Story
-  name="Type Password"
-  args={{
-    label: "Password",
-    placeholder: "Type Password",
-    type: "password",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-## Loading
-
-Loading indicator for input occupies the same slot as the password icon and suffix and has priority.
-
-<Story
-  name="Loading"
-  args={{
-    placeholder: "Loading",
-    isLoading: true,
-  }}
->
-  {Template.bind({})}
-</Story>
-
-## Disabled
-
-<Story
-  name="Disabled"
-  args={{
-    placeholder: "Disabled",
-    isDisabled: true,
-  }}
->
-  {Template.bind({})}
-</Story>
-
-## Readonly
-
-<Story
-  name="Readonly"
-  args={{
-    placeholder: "Readonly",
-    readonly: true,
-  }}
->
-  {Template.bind({})}
-</Story>
-
-## Validation
-
-<Story
-  name="Validation"
-  args={{
-    placeholder: "Validation",
-    validationState: "invalid",
-    errorMessage: "This field is required",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-## Required and Optional
-
-<Story
-  name="Required - Icon"
-  args={{
-    placeholder: "Required - Icon Indicator",
-    isRequired: true,
-  }}
->
-  {Template.bind({})}
-</Story>
-
-<Story
-  name="Required - Label"
-  args={{
-    placeholder: "Required - Label Indicator",
-    isRequired: true,
-    necessityIndicator: "label",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-<Story
-  name="Optional - Label"
-  args={{
-    placeholder: "Required - Label Indicator",
-    isRequired: false,
-    necessityIndicator: "label",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-## Contextual Help Text
-
-<Story
-  name="Contextual Help Text"
-  args={{
-    placeholder: "Contextual Help Text",
-    contextualHelp: "This is a contextual help text",
-  }}
->
-  {Template.bind({})}
-</Story>
-
-## On Value Change
-
-<Story
-  name="On Change"
-  args={{
-    placeholder: "On Value Change",
-    onChange: (value) => console.log(value),
-  }}
->
-  {Template.bind({})}
-</Story>
-
-## On Focus Change
-
-<Story
-  name="On Focus Change"
-  args={{
-    placeholder: "On Focus Change",
-    onFocusChange: (value) => console.log(value),
-  }}
->
-  {Template.bind({})}
-</Story>
diff --git a/app/client/packages/design-system/widgets/src/components/TextInput/stories/TextInput.stories.tsx b/app/client/packages/design-system/widgets/src/components/TextInput/stories/TextInput.stories.tsx
new file mode 100644
index 0000000000..3cd8e6e1d5
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/TextInput/stories/TextInput.stories.tsx
@@ -0,0 +1,157 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import {
+  Flex,
+  Icon,
+  SIZES,
+  Button,
+  Menu,
+  MenuList,
+  Item,
+  TextInput,
+} from "@design-system/widgets";
+
+/**
+ * TextInput is a component that allows users to input text.
+ */
+const meta: Meta<typeof TextInput> = {
+  component: TextInput,
+  title: "Design-system/Widgets/TextInput",
+};
+
+export default meta;
+type Story = StoryObj<typeof TextInput>;
+
+export const Main: Story = {
+  args: {
+    placeholder: "Write something...",
+  },
+};
+
+export const Description: Story = {
+  args: {
+    placeholder: "Description",
+    description: "This is a description",
+  },
+};
+
+export const Sizes: Story = {
+  render: () => (
+    <Flex alignItems="start" gap="spacing-4">
+      {Object.keys(SIZES)
+        .filter((size) => !["large"].includes(size))
+        .map((size) => (
+          <TextInput
+            key={size}
+            placeholder={size}
+            prefix={<Icon name="user" size={size as keyof typeof SIZES} />}
+            size={size}
+          />
+        ))}
+    </Flex>
+  ),
+};
+
+export const PrefixAndSuffix: Story = {
+  render: () => (
+    <Flex direction="column" gap="spacing-4">
+      <TextInput placeholder="prefix" prefix="$" />
+      <TextInput placeholder="suffix" suffix="$" />
+      <TextInput
+        placeholder="prefix and suffix"
+        prefix={<Icon name="user" />}
+        suffix={<Icon name="user" />}
+      />
+      <TextInput
+        placeholder="component as prefix"
+        prefix={
+          <Menu disabledKeys={["cut"]} onAction={(key) => alert(key)}>
+            <Button color="neutral" icon="chevron-down" variant="ghost" />
+            <MenuList>
+              <Item key="copy">Copy</Item>
+              <Item key="cut">Cut</Item>
+              <Item key="paste">Paste</Item>
+            </MenuList>
+          </Menu>
+        }
+      />
+    </Flex>
+  ),
+};
+
+/**
+ * The icon button for input type password type occupies the same slot as the suffix and has priority.
+ */
+export const TypePassword: Story = {
+  args: {
+    label: "Password",
+    placeholder: "Type Password",
+    type: "password",
+  },
+};
+
+/**
+ * Loading indicator for input occupies the same slot as the password icon and suffix and has priority.
+ */
+
+export const Loading: Story = {
+  args: {
+    placeholder: "Loading",
+    isLoading: true,
+  },
+};
+
+export const Disabled: Story = {
+  args: {
+    placeholder: "Disabled",
+    isDisabled: true,
+  },
+};
+
+export const Readonly: Story = {
+  args: {
+    label: "Readonly",
+    isReadOnly: true,
+  },
+};
+
+export const Validation: Story = {
+  render: () => (
+    <form
+      onSubmit={(e) => {
+        e.preventDefault();
+        alert("Form submitted");
+      }}
+    >
+      <Flex direction="column" gap="spacing-2" width="sizing-60">
+        <TextInput description="description" isRequired label="Validation" />
+        <Button type="submit">Submit</Button>
+      </Flex>
+    </form>
+  ),
+};
+
+export const RequiredIndicator: Story = {
+  render: () => (
+    <Flex direction="column" gap="spacing-4" width="100%">
+      <TextInput isRequired label="Required - Icon Indicator" />
+      <TextInput
+        isRequired
+        label="Required - Label Indicator"
+        necessityIndicator="label"
+      />
+      <TextInput
+        label="Required - Label Indicator"
+        necessityIndicator="label"
+      />
+    </Flex>
+  ),
+};
+
+export const ContextualHelp: Story = {
+  args: {
+    label: "Label",
+    placeholder: "Contextual Help Text",
+    contextualHelp: "This is a contextual help text",
+  },
+};
diff --git a/app/client/packages/design-system/widgets/src/components/Tooltip/stories/Tooltip.stories.mdx b/app/client/packages/design-system/widgets/src/components/Tooltip/stories/Tooltip.stories.mdx
deleted file mode 100644
index 53e0c5f71d..0000000000
--- a/app/client/packages/design-system/widgets/src/components/Tooltip/stories/Tooltip.stories.mdx
+++ /dev/null
@@ -1,94 +0,0 @@
-import {
-  Button,
-  ActionGroup,
-  Item,
-  TooltipRoot,
-  TooltipTrigger,
-  TooltipContent,
-  Tooltip,
-} from "@design-system/widgets";
-import { Canvas, Meta, Story, ArgsTable } from "@storybook/addon-docs";
-
-<Meta
-  title="Design-system/Widgets/Tooltip"
-  component={TooltipRoot}
-  args={{
-    open: undefined,
-    onOpenChange: undefined,
-  }}
-/>
-
-export const Template = (args) => {
-  return (
-    <TooltipRoot {...args}>
-      <TooltipTrigger>
-        <Button>My trigger</Button>
-      </TooltipTrigger>
-      <TooltipContent>My tooltip</TooltipContent>
-    </TooltipRoot>
-  );
-};
-
-# Tooltip
-
-A tooltip is a small pop-up that appears when a user places their cursor over an element such as a link or button. Tooltips can be used to provide users with additional information about an element without having to clutter up the UI with additional text.
-
-<Canvas>
-  <Story name="Tooltip">{Template.bind({})}</Story>
-</Canvas>
-
-<ArgsTable story="Tooltip" of={Tooltip} />
-
-# Placement
-
-The placement of the tooltip can be changed by passing the `placement` prop.
-
-<Story name="Tooltip placement">
-  <ActionGroup>
-    <TooltipRoot placement="left">
-      <TooltipTrigger>
-        <Item variant="outlined">Left</Item>
-      </TooltipTrigger>
-      <TooltipContent>My tooltip</TooltipContent>
-    </TooltipRoot>
-    <TooltipRoot placement="top">
-      <TooltipTrigger>
-        <Item variant="outlined">Top</Item>
-      </TooltipTrigger>
-      <TooltipContent>My tooltip</TooltipContent>
-    </TooltipRoot>
-    <TooltipRoot placement="bottom">
-      <TooltipTrigger>
-        <Item variant="outlined">Bottom</Item>
-      </TooltipTrigger>
-      <TooltipContent>My tooltip</TooltipContent>
-    </TooltipRoot>
-    <TooltipRoot placement="right">
-      <TooltipTrigger>
-        <Item variant="outlined">Right</Item>
-      </TooltipTrigger>
-      <TooltipContent>My tooltip</TooltipContent>
-    </TooltipRoot>
-  </ActionGroup>
-</Story>
-
-# Disabled
-
-If the trigger is disabled, the tooltip will still be displayed.
-
-<Story name="Tooltip disabled">
-  <TooltipRoot>
-    <TooltipTrigger>
-      <Button isDisabled>My trigger</Button>
-    </TooltipTrigger>
-    <TooltipContent>My tooltip</TooltipContent>
-  </TooltipRoot>
-</Story>
-
-# Tooltip Component
-
-<Story name="Tooltip Component">
-  <Tooltip tooltip="Tooltip">
-    <Button>My trigger</Button>
-  </Tooltip>
-</Story>
diff --git a/app/client/packages/design-system/widgets/src/components/Tooltip/stories/Tooltip.stories.tsx b/app/client/packages/design-system/widgets/src/components/Tooltip/stories/Tooltip.stories.tsx
new file mode 100644
index 0000000000..11cec1e7c1
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/components/Tooltip/stories/Tooltip.stories.tsx
@@ -0,0 +1,47 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import {
+  Button,
+  TooltipRoot,
+  TooltipTrigger,
+  TooltipContent,
+  Tooltip,
+} from "@design-system/widgets";
+
+/**
+ * A tooltip is a small pop-up that appears when a user places their cursor over an element such as a link or button. Tooltips can be used to provide users with additional information about an element without having to clutter up the UI with additional text.
+ */
+const meta: Meta<typeof Tooltip> = {
+  component: Tooltip,
+  title: "Design-system/Widgets/Tooltip",
+  subcomponents: {
+    //@ts-expect-error: don't need props to pass here
+    TooltipRoot,
+    TooltipTrigger,
+    TooltipContent,
+  },
+  args: {
+    tooltip: "My tooltip",
+  },
+  render: (args) => (
+    <Tooltip {...args}>
+      <Button>My trigger</Button>
+    </Tooltip>
+  ),
+};
+
+export default meta;
+type Story = StoryObj<typeof Tooltip>;
+
+export const Main: Story = {};
+
+/**
+ * If the trigger is disabled, the tooltip will still be displayed.
+ */
+export const Disabled: Story = {
+  render: () => (
+    <Tooltip tooltip="My tooltip">
+      <Button isDisabled>My trigger</Button>
+    </Tooltip>
+  ),
+};
diff --git a/app/client/packages/design-system/widgets/src/testing/ColorGrid.stories.mdx b/app/client/packages/design-system/widgets/src/testing/ColorGrid.stories.mdx
deleted file mode 100644
index 3c8794497f..0000000000
--- a/app/client/packages/design-system/widgets/src/testing/ColorGrid.stories.mdx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Meta, Canvas, Story } from "@storybook/addon-docs";
-import { ColorGrid } from "./ColorGrid";
-
-<Meta title="Design-system/Widgets testing" />
-
-export const Template = (args, { globals: { colorMode } }) => (
-  <ColorGrid {...args} colorMode={colorMode}>
-    {(color) => (
-      <>
-        {color.seed}
-        <br />
-        {color.derived}
-      </>
-    )}
-  </ColorGrid>
-);
-
-<Canvas>
-  <Story
-    name="Test Colors"
-    args={{
-      source: "oklch",
-      size: "small",
-      steps: 8,
-      colorSpace: "oklch",
-      variant: "primary",
-      isHovered: false,
-      isActive: false,
-      isFocused: false,
-      isDisabled: false,
-    }}
-    argTypes={{
-      source: {
-        options: ["oklch", "hex", "appsmith"],
-        control: { type: "radio" },
-      },
-      size: {
-        options: ["small", "big"],
-        control: { type: "radio" },
-        if: { arg: "source", neq: "appsmith" },
-      },
-      colorSpace: {
-        options: ["oklch", "hex"],
-        control: { type: "radio" },
-      },
-      steps: {
-        if: { arg: "source", neq: "appsmith" },
-      },
-      variant: {
-        options: ["primary", "secondary", "tertiary"],
-        control: { type: "radio" },
-      },
-    }}
-  >
-    {Template.bind({})}
-  </Story>
-</Canvas>
diff --git a/app/client/packages/design-system/widgets/src/testing/ColorGrid.stories.tsx b/app/client/packages/design-system/widgets/src/testing/ColorGrid.stories.tsx
new file mode 100644
index 0000000000..25bb636e70
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/testing/ColorGrid.stories.tsx
@@ -0,0 +1,57 @@
+import React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
+import { ColorGrid } from "./ColorGrid";
+
+const meta: Meta<typeof ColorGrid> = {
+  component: ColorGrid,
+  title: "Testing/ColorGrid",
+  args: {
+    source: "oklch",
+    size: "small",
+    steps: 8,
+    colorSpace: "oklch",
+    variant: "primary",
+    isHovered: false,
+    isActive: false,
+    isFocused: false,
+    isDisabled: false,
+  },
+  argTypes: {
+    source: {
+      options: ["oklch", "hex", "appsmith"],
+      control: { type: "radio" },
+    },
+    size: {
+      options: ["small", "big"],
+      control: { type: "radio" },
+      if: { arg: "source", neq: "appsmith" },
+    },
+    colorSpace: {
+      options: ["oklch", "hex"],
+      control: { type: "radio" },
+    },
+    steps: {
+      if: { arg: "source", neq: "appsmith" },
+    },
+    variant: {
+      options: ["primary", "secondary", "tertiary"],
+      control: { type: "radio" },
+    },
+  },
+  render: (args, { globals: { colorMode } }) => (
+    <ColorGrid {...args} colorMode={colorMode}>
+      {(color: { seed: string; derived: string }) => (
+        <>
+          {color.seed}
+          <br />
+          {color.derived}
+        </>
+      )}
+    </ColorGrid>
+  ),
+};
+
+export default meta;
+type Story = StoryObj<typeof ColorGrid>;
+
+export const Main: Story = {};
diff --git a/app/client/packages/design-system/widgets/src/testing/CompareTokens.stories.mdx b/app/client/packages/design-system/widgets/src/testing/CompareTokens.stories.mdx
deleted file mode 100644
index 6fe5dff232..0000000000
--- a/app/client/packages/design-system/widgets/src/testing/CompareTokens.stories.mdx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Canvas, Meta, Story } from "@storybook/addon-docs";
-import { CompareTokens } from "./CompareTokens";
-
-<Meta title="Design-system/Widgets testing" />
-
-export const Template = () => <CompareTokens />;
-
-<Canvas>
-  <Story name="Compare Tokens">{Template.bind({})}</Story>
-</Canvas>
diff --git a/app/client/packages/design-system/widgets/src/testing/CompareTokens.stories.ts b/app/client/packages/design-system/widgets/src/testing/CompareTokens.stories.ts
new file mode 100644
index 0000000000..34de7ac9de
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/testing/CompareTokens.stories.ts
@@ -0,0 +1,12 @@
+import type { Meta, StoryObj } from "@storybook/react";
+import { CompareTokens } from "./CompareTokens";
+
+const meta: Meta<typeof CompareTokens> = {
+  component: CompareTokens,
+  title: "Testing/CompareTokens",
+};
+
+export default meta;
+type Story = StoryObj<typeof CompareTokens>;
+
+export const Main: Story = {};
diff --git a/app/client/packages/design-system/widgets/src/testing/ComplexForm.stories.mdx b/app/client/packages/design-system/widgets/src/testing/ComplexForm.stories.mdx
deleted file mode 100644
index 3ef9350244..0000000000
--- a/app/client/packages/design-system/widgets/src/testing/ComplexForm.stories.mdx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Canvas, Meta, Story } from "@storybook/addon-docs";
-import { ComplexForm } from "./ComplexForm";
-
-<Meta title="Design-system/Widgets testing" />
-
-export const Template = (args) => <ComplexForm {...args} />;
-
-<Canvas>
-  <Story name="Complex Form">{Template.bind({})}</Story>
-</Canvas>
diff --git a/app/client/packages/design-system/widgets/src/testing/ComplexForm.stories.ts b/app/client/packages/design-system/widgets/src/testing/ComplexForm.stories.ts
new file mode 100644
index 0000000000..d6c9873124
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/testing/ComplexForm.stories.ts
@@ -0,0 +1,12 @@
+import type { Meta, StoryObj } from "@storybook/react";
+import { ComplexForm } from "./ComplexForm";
+
+const meta: Meta<typeof ComplexForm> = {
+  component: ComplexForm,
+  title: "Testing/ComplexForm",
+};
+
+export default meta;
+type Story = StoryObj<typeof ComplexForm>;
+
+export const Main: Story = {};
diff --git a/app/client/packages/design-system/widgets/src/testing/Elevation.stories.mdx b/app/client/packages/design-system/widgets/src/testing/Elevation.stories.mdx
deleted file mode 100644
index e9ca6c0756..0000000000
--- a/app/client/packages/design-system/widgets/src/testing/Elevation.stories.mdx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Canvas, Meta, Story } from "@storybook/addon-docs";
-import { Elevation } from "./Elevation";
-
-<Meta title="Design-system/Widgets testing" />
-
-export const Template = (args) => <Elevation {...args} />;
-
-<Canvas>
-  <Story name="Elevation">{Template.bind({})}</Story>
-</Canvas>
diff --git a/app/client/packages/design-system/widgets/src/testing/Elevation.stories.ts b/app/client/packages/design-system/widgets/src/testing/Elevation.stories.ts
new file mode 100644
index 0000000000..2d9007955f
--- /dev/null
+++ b/app/client/packages/design-system/widgets/src/testing/Elevation.stories.ts
@@ -0,0 +1,12 @@
+import type { Meta, StoryObj } from "@storybook/react";
+import { Elevation } from "./Elevation";
+
+const meta: Meta<typeof Elevation> = {
+  component: Elevation,
+  title: "Testing/Elevation",
+};
+
+export default meta;
+type Story = StoryObj<typeof Elevation>;
+
+export const Main: Story = {};
diff --git a/app/client/packages/storybook/.gitignore b/app/client/packages/storybook/.gitignore
new file mode 100755
index 0000000000..13b95358d5
--- /dev/null
+++ b/app/client/packages/storybook/.gitignore
@@ -0,0 +1,4 @@
+storybook-static/*
+build-storybook.log
+chromatic.log
+chromatic-diagnostics.json
diff --git a/app/client/packages/storybook/.storybook/addons/theming/ThemingPopup.tsx b/app/client/packages/storybook/.storybook/addons/theming/ThemingPopup.tsx
index bfbb89d131..390763d835 100644
--- a/app/client/packages/storybook/.storybook/addons/theming/ThemingPopup.tsx
+++ b/app/client/packages/storybook/.storybook/addons/theming/ThemingPopup.tsx
@@ -11,7 +11,8 @@ interface PanelProps {
 }
 
 const Wrapper = styled.div`
-  position: relative;
+  position: fixed;
+  z-index: 999;
   padding: 10px;
   display: flex;
   flex-direction: column;
diff --git a/app/client/packages/storybook/.storybook/main.ts b/app/client/packages/storybook/.storybook/main.ts
index 259125f4ab..4eee3f743f 100644
--- a/app/client/packages/storybook/.storybook/main.ts
+++ b/app/client/packages/storybook/.storybook/main.ts
@@ -1,47 +1,13 @@
-import { mergeConfig } from "vite";
-import svgr from "vite-plugin-svgr";
-import postcssNesting from "postcss-nesting";
-import postcssImport from "postcss-import";
-import postcssAtRulesVariables from "postcss-at-rules-variables";
-import postcssEach from "postcss-each";
-import postcssModulesValues from "postcss-modules-values";
-import * as glob from "glob";
-import * as path from "path";
+import type { StorybookConfig } from "@storybook/react-vite";
 
-const dsDir = path.resolve(__dirname, "../../design-system");
-
-function getStories() {
-  if (process.env.CHROMATIC) {
-    return ["../../design-system/**/*.chromatic.stories.@(js|jsx|ts|tsx)"];
-  }
-
-  return glob
-    .sync(`${dsDir}/**/*.stories.@(js|jsx|ts|tsx|mdx)`, { nosort: true })
-    .filter((storyPath) => !storyPath.includes("chromatic"));
-}
-
-module.exports = {
-  async viteFinal(config, { configType }) {
-    return mergeConfig(config, {
-      define: { "process.env": {} },
-      plugins: [svgr()],
-      css: {
-        postcss: {
-          plugins: [
-            postcssNesting,
-            postcssImport,
-            postcssAtRulesVariables,
-            postcssEach,
-            postcssModulesValues,
-          ],
-        },
-      },
-    });
-  },
-
-  stories: getStories(),
+const config: StorybookConfig = {
+  stories: [
+    "../../design-system/**/*.mdx",
+    "../../design-system/**/*.stories.@(ts|tsx)",
+  ],
 
   addons: [
+    "@chromatic-com/storybook",
     "@storybook/addon-a11y",
     "@storybook/addon-viewport",
     "@storybook/addon-docs",
@@ -53,9 +19,7 @@ module.exports = {
     "./addons/theming/manager.ts",
   ],
 
-  framework: {
-    name: "@storybook/react-vite",
-  },
+  framework: "@storybook/react-vite",
 
   typescript: {
     reactDocgen: "react-docgen-typescript",
@@ -77,3 +41,5 @@ module.exports = {
     autodocs: true,
   },
 };
+
+export default config;
diff --git a/app/client/packages/storybook/chromatic.config.json b/app/client/packages/storybook/chromatic.config.json
new file mode 100644
index 0000000000..62fee45644
--- /dev/null
+++ b/app/client/packages/storybook/chromatic.config.json
@@ -0,0 +1,4 @@
+{
+  "projectId": "Project:64c89da059b7d62ad3a60544",
+  "zip": true
+}
diff --git a/app/client/packages/storybook/package.json b/app/client/packages/storybook/package.json
index cbcaa2d24e..ae12cf9631 100644
--- a/app/client/packages/storybook/package.json
+++ b/app/client/packages/storybook/package.json
@@ -7,36 +7,32 @@
   "scripts": {
     "lint": "yarn g:lint",
     "storybook": "storybook dev -p 6006",
-    "build": "storybook build",
+    "build-storybook": "storybook build",
     "chromatic": "CHROMATIC=1 storybook dev -p 6006"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "^7.6.12",
-    "@storybook/addon-controls": "^7.6.12",
-    "@storybook/addon-docs": "^7.6.12",
-    "@storybook/addon-measure": "^7.6.12",
-    "@storybook/addon-outline": "^7.6.12",
-    "@storybook/addon-toolbars": "^7.6.12",
-    "@storybook/addon-viewport": "^7.6.12",
-    "@storybook/blocks": "^7.6.12",
-    "@storybook/builder-vite": "^7.6.12",
-    "@storybook/components": "^7.6.12",
-    "@storybook/manager-api": "^7.6.12",
-    "@storybook/preset-create-react-app": "^7.6.12",
-    "@storybook/react-vite": "^7.6.12",
-    "@storybook/theming": "^7.6.12",
+    "@chromatic-com/storybook": "^1.3.3",
+    "@storybook/addon-a11y": "^8.0.8",
+    "@storybook/addon-controls": "^8.0.8",
+    "@storybook/addon-docs": "^8.0.8",
+    "@storybook/addon-measure": "^8.0.8",
+    "@storybook/addon-outline": "^8.0.8",
+    "@storybook/addon-toolbars": "^8.0.8",
+    "@storybook/addon-viewport": "^8.0.8",
+    "@storybook/blocks": "^8.0.8",
+    "@storybook/builder-vite": "^8.0.8",
+    "@storybook/components": "^8.0.8",
+    "@storybook/manager-api": "^8.0.8",
+    "@storybook/preset-create-react-app": "^8.0.8",
+    "@storybook/react-vite": "^8.0.8",
+    "@storybook/theming": "^8.0.8",
+    "@vitejs/plugin-react": "^4.2.1",
     "babel-loader": "9.1.2",
-    "chromatic": "^6.20.0",
-    "postcss": "*",
-    "postcss-at-rules-variables": "*",
-    "postcss-each": "*",
-    "postcss-import": "*",
-    "postcss-loader": "*",
-    "postcss-modules-values": "*",
+    "chromatic": "^11.3.0",
     "react-docgen-typescript": "^2.2.2",
-    "storybook": "^7.6.12",
-    "vite": "^4.5.2",
-    "vite-plugin-svgr": "^3.2.0"
+    "storybook": "^8.0.8",
+    "vite": "^5.2.9",
+    "vite-plugin-svgr": "^4.2.0"
   },
   "dependencies": {
     "@design-system/headless": "workspace:^",
diff --git a/app/client/packages/storybook/vite.config.js b/app/client/packages/storybook/vite.config.js
new file mode 100644
index 0000000000..aa2b79deb2
--- /dev/null
+++ b/app/client/packages/storybook/vite.config.js
@@ -0,0 +1,23 @@
+import { defineConfig } from "vite";
+import react from "@vitejs/plugin-react";
+import svgr from "vite-plugin-svgr";
+import postcssNesting from "postcss-nesting";
+import postcssImport from "postcss-import";
+import postcssAtRulesVariables from "postcss-at-rules-variables";
+import postcssEach from "postcss-each";
+import postcssModulesValues from "postcss-modules-values";
+
+export default defineConfig({
+  plugins: [react(), svgr()],
+  css: {
+    postcss: {
+      plugins: [
+        postcssNesting,
+        postcssImport,
+        postcssAtRulesVariables,
+        postcssEach,
+        postcssModulesValues,
+      ],
+    },
+  },
+});
diff --git a/app/client/public/index.html b/app/client/public/index.html
index b4ec35d3dc..2009c6e672 100755
--- a/app/client/public/index.html
+++ b/app/client/public/index.html
@@ -22,6 +22,7 @@
         // could return either boolean or string based on value
         const parseConfig = (config) => {
           if (
+            (config.startsWith("{") && config.startsWith("}")) ||
             config.indexOf("__") === 0 ||
             config.indexOf("$") === 0 ||
             config.indexOf("%") === 0
@@ -37,9 +38,9 @@
 
           return result;
         };
-        const CLOUD_HOSTING = parseConfig("__APPSMITH_CLOUD_HOSTING__");
-        const ZIPY_KEY = parseConfig("__APPSMITH_ZIPY_SDK_KEY__");
-        const AIRGAPPED = parseConfig("__APPSMITH_AIRGAP_ENABLED__");
+        const CLOUD_HOSTING = parseConfig('{{env "APPSMITH_CLOUD_HOSTING"}}');
+        const ZIPY_KEY = parseConfig('{{env "APPSMITH_ZIPY_SDK_KEY"}}');
+        const AIRGAPPED = parseConfig('{{env "APPSMITH_AIRGAP_ENABLED"}}');
       </script>
     <script>
         window.__APPSMITH_CHUNKS_TO_PRELOAD =
@@ -75,7 +76,7 @@
         head && head.appendChild(script);
       }
 
-    
+
     </script>
   </head>
 
@@ -159,13 +160,13 @@
     <script type="text/javascript">
       const LOG_LEVELS = ["debug", "error"];
       const CONFIG_LOG_LEVEL_INDEX = LOG_LEVELS.indexOf(
-        parseConfig("__APPSMITH_CLIENT_LOG_LEVEL__"),
+        parseConfig('{{env "APPSMITH_CLIENT_LOG_LEVEL"}}'),
       );
 
       const INTERCOM_APP_ID =
         parseConfig("%REACT_APP_INTERCOM_APP_ID%") ||
-        parseConfig("__APPSMITH_INTERCOM_APP_ID__");
-      const DISABLE_INTERCOM = parseConfig("__APPSMITH_DISABLE_INTERCOM__");
+        parseConfig('{{env "APPSMITH_INTERCOM_APP_ID"}}');
+      const DISABLE_INTERCOM = parseConfig('{{env "APPSMITH_DISABLE_INTERCOM"}}');
 
       // Initialize the Intercom library
       if (INTERCOM_APP_ID.length && !DISABLE_INTERCOM) {
@@ -204,40 +205,40 @@
         })();
       }
 
-      window.SENTRY_CONFIG = parseConfig("__APPSMITH_SENTRY_DSN__");
+      window.SENTRY_CONFIG = parseConfig('{{env "APPSMITH_SENTRY_DSN"}}');
       window.APPSMITH_FEATURE_CONFIGS = {
         sentry: {
-          dsn: parseConfig("__APPSMITH_SENTRY_DSN__"),
-          release: parseConfig("__APPSMITH_SENTRY_RELEASE__"),
-          environment: parseConfig("__APPSMITH_SENTRY_ENVIRONMENT__"),
+          dsn: parseConfig('{{env "APPSMITH_SENTRY_DSN"}}'),
+          release: parseConfig('{{env "APPSMITH_SENTRY_RELEASE"}}'),
+          environment: parseConfig('{{env "APPSMITH_SENTRY_ENVIRONMENT"}}'),
         },
         smartLook: {
-          id: parseConfig("__APPSMITH_SMART_LOOK_ID__"),
+          id: parseConfig('{{env "APPSMITH_SMART_LOOK_ID"}}'),
         },
         segment: {
-          apiKey: parseConfig("__APPSMITH_SEGMENT_KEY__"),
-          ceKey: parseConfig("__APPSMITH_SEGMENT_CE_KEY__"),
+          apiKey: parseConfig('{{env "APPSMITH_SEGMENT_KEY"}}'),
+          ceKey: parseConfig('{{env "APPSMITH_SEGMENT_CE_KEY"}}'),
         },
         newRelic:{
-          enableNewRelic: parseConfig("__APPSMITH_NEW_RELIC_ACCOUNT_ENABLE__"),
-          accountId: parseConfig("__APPSMITH_NEW_RELIC_ACCOUNT_ID__"),
-          applicationId: parseConfig("__APPSMITH_NEW_RELIC_APPLICATION_ID__"),
-          browserAgentlicenseKey: parseConfig("__APPSMITH_NEW_RELIC_BROWSER_AGENT_LICENSE_KEY__"),
-          browserAgentEndpoint: parseConfig("__APPSMITH_NEW_RELIC_BROWSER_AGENT_ENDPOINT__"),
-          otlpLicenseKey: parseConfig("__APPSMITH_NEW_RELIC_OTLP_LICENSE_KEY__"),
+          enableNewRelic: parseConfig('{{env "APPSMITH_NEW_RELIC_ACCOUNT_ENABLE"}}'),
+          accountId: parseConfig('{{env "APPSMITH_NEW_RELIC_ACCOUNT_ID"}}'),
+          applicationId: parseConfig('{{env "APPSMITH_NEW_RELIC_APPLICATION_ID"}}'),
+          browserAgentlicenseKey: parseConfig('{{env "APPSMITH_NEW_RELIC_BROWSER_AGENT_LICENSE_KEY"}}'),
+          browserAgentEndpoint: parseConfig('{{env "APPSMITH_NEW_RELIC_BROWSER_AGENT_ENDPOINT"}}'),
+          otlpLicenseKey: parseConfig('{{env "APPSMITH_NEW_RELIC_OTLP_LICENSE_KEY"}}'),
           //OTLP following the naming convention of Sdk initialisation
-          otlpServiceName: parseConfig("__APPSMITH_NEW_RELIC_OTEL_SERVICE_NAME__"),
-          otlpEndpoint:parseConfig("__APPSMITH_NEW_RELIC_OTEL_EXPORTER_OTLP_ENDPOINT__"),
+          otlpServiceName: parseConfig('{{env "APPSMITH_NEW_RELIC_OTEL_SERVICE_NAME"}}'),
+          otlpEndpoint:parseConfig('{{env "APPSMITH_NEW_RELIC_OTEL_EXPORTER_OTLP_ENDPOINT"}}'),
 
         },
         fusioncharts: {
-          licenseKey: parseConfig("__APPSMITH_FUSIONCHARTS_LICENSE_KEY__"),
+          licenseKey: parseConfig('{{env "APPSMITH_FUSIONCHARTS_LICENSE_KEY"}}'),
         },
-        enableMixpanel: parseConfig("__APPSMITH_SEGMENT_KEY__"),
+        enableMixpanel: parseConfig('{{env "APPSMITH_SEGMENT_KEY"}}'),
         algolia: {
-          apiId: parseConfig("__APPSMITH_ALGOLIA_API_ID__"),
-          apiKey: parseConfig("__APPSMITH_ALGOLIA_API_KEY__"),
-          indexName: parseConfig("__APPSMITH_ALGOLIA_SEARCH_INDEX_NAME__"),
+          apiId: parseConfig('{{env "APPSMITH_ALGOLIA_API_ID"}}'),
+          apiKey: parseConfig('{{env "APPSMITH_ALGOLIA_API_KEY"}}'),
+          indexName: parseConfig('{{env "APPSMITH_ALGOLIA_SEARCH_INDEX_NAME"}}'),
         },
         logLevel:
           CONFIG_LOG_LEVEL_INDEX > -1
@@ -245,25 +246,25 @@
             : LOG_LEVELS[1],
         cloudHosting: CLOUD_HOSTING,
         appVersion: {
-          id: parseConfig("__APPSMITH_VERSION_ID__"),
-          sha: parseConfig("__APPSMITH_VERSION_SHA__"),
-          releaseDate: parseConfig("__APPSMITH_VERSION_RELEASE_DATE__"),
+          id: parseConfig('{{env "APPSMITH_VERSION_ID"}}'),
+          sha: parseConfig('{{env "APPSMITH_VERSION_SHA"}}'),
+          releaseDate: parseConfig('{{env "APPSMITH_VERSION_RELEASE_DATE"}}'),
         },
         intercomAppID: INTERCOM_APP_ID,
-        mailEnabled: parseConfig("__APPSMITH_MAIL_ENABLED__"),
+        mailEnabled: parseConfig('{{env "APPSMITH_MAIL_ENABLED"}}'),
         cloudServicesBaseUrl:
-          parseConfig("__APPSMITH_CLOUD_SERVICES_BASE_URL__") ||
+          parseConfig('{{env "APPSMITH_CLOUD_SERVICES_BASE_URL"}}') ||
           "https://cs.appsmith.com",
-        googleRecaptchaSiteKey: parseConfig("__APPSMITH_RECAPTCHA_SITE_KEY__"),
-        hideWatermark: parseConfig("__APPSMITH_HIDE_WATERMARK__"),
+        googleRecaptchaSiteKey: parseConfig('{{env "APPSMITH_RECAPTCHA_SITE_KEY"}}'),
+        hideWatermark: parseConfig('{{env "APPSMITH_HIDE_WATERMARK"}}'),
         disableIframeWidgetSandbox: parseConfig(
-          "__APPSMITH_DISABLE_IFRAME_WIDGET_SANDBOX__",
+          '{{env "APPSMITH_DISABLE_IFRAME_WIDGET_SANDBOX"}}',
         ),
         customerPortalUrl:
-          parseConfig("__APPSMITH_CUSTOMER_PORTAL_URL__") ||
+          parseConfig('{{env "APPSMITH_CUSTOMER_PORTAL_URL"}}') ||
           "https://customer.appsmith.com",
         pricingUrl:
-          parseConfig("__APPSMITH_PRICING_URL__") ||
+          parseConfig('{{env "APPSMITH_PRICING_URL"}}') ||
           "https://www.appsmith.com/pricing",
       };
     </script>
diff --git a/app/client/src/AppErrorBoundry.tsx b/app/client/src/AppErrorBoundry.tsx
index 45ce37dbd1..c195bc8c5e 100644
--- a/app/client/src/AppErrorBoundry.tsx
+++ b/app/client/src/AppErrorBoundry.tsx
@@ -3,7 +3,7 @@ import styled from "styled-components";
 import AppCrashImage from "assets/images/404-image.png";
 import * as Sentry from "@sentry/react";
 import log from "loglevel";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { Button } from "design-system";
 
 const Wrapper = styled.div`
diff --git a/app/client/src/actions/autoLayoutActions.ts b/app/client/src/actions/autoLayoutActions.ts
index a2b5e9f457..4bcd9b38b2 100644
--- a/app/client/src/actions/autoLayoutActions.ts
+++ b/app/client/src/actions/autoLayoutActions.ts
@@ -3,7 +3,7 @@ import type { LayoutSystemTypes } from "layoutSystems/types";
 import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
 import type {
   CONVERSION_STATES,
-  SnapShotDetails,
+  SnapshotDetails,
 } from "reducers/uiReducers/layoutConversionReducer";
 
 /**
@@ -46,11 +46,11 @@ export const setLayoutConversionStateAction = (
 };
 
 export const updateSnapshotDetails = (
-  snapShotDetails: SnapShotDetails | undefined,
+  snapshotDetails: SnapshotDetails | undefined,
 ) => {
   return {
     type: ReduxActionTypes.UPDATE_SNAPSHOT_DETAILS,
-    payload: snapShotDetails,
+    payload: snapshotDetails,
   };
 };
 export function updateWidgetDimensionAction(
diff --git a/app/client/src/actions/gitSyncActions.ts b/app/client/src/actions/gitSyncActions.ts
index 6ad11513f2..29032f6435 100644
--- a/app/client/src/actions/gitSyncActions.ts
+++ b/app/client/src/actions/gitSyncActions.ts
@@ -473,6 +473,13 @@ export const updateGitProtectedBranchesInit = (payload: {
   };
 };
 
+export const setShowBranchPopupAction = (show: boolean) => {
+  return {
+    type: ReduxActionTypes.GIT_SHOW_BRANCH_POPUP,
+    payload: { show },
+  };
+};
+
 export const toggleAutocommitEnabledInit = () => ({
   type: ReduxActionTypes.GIT_TOGGLE_AUTOCOMMIT_ENABLED_INIT,
 });
diff --git a/app/client/src/actions/ideActions.ts b/app/client/src/actions/ideActions.ts
index 4d9fe685a5..605423fabf 100644
--- a/app/client/src/actions/ideActions.ts
+++ b/app/client/src/actions/ideActions.ts
@@ -16,15 +16,6 @@ export const restoreIDEEditorViewMode = () => {
   };
 };
 
-export const setIdeEditorPagesActiveStatus = (active: boolean) => {
-  return {
-    type: ReduxActionTypes.SET_IDE_EDITOR_PAGES_ACTIVE_STATUS,
-    payload: {
-      pagesActive: active,
-    },
-  };
-};
-
 export const setJSTabs = (tabs: string[]) => {
   return {
     type: ReduxActionTypes.SET_IDE_JS_TABS,
diff --git a/app/client/src/actions/jsActionActions.ts b/app/client/src/actions/jsActionActions.ts
index 0e1144c001..7a564de0f7 100644
--- a/app/client/src/actions/jsActionActions.ts
+++ b/app/client/src/actions/jsActionActions.ts
@@ -168,6 +168,13 @@ export const closeJSActionTab = (payload: { id: string }) => {
   };
 };
 
+export const closeJsActionTabSuccess = (payload: { id: string }) => {
+  return {
+    type: ReduxActionTypes.CLOSE_JS_ACTION_TAB_SUCCESS,
+    payload,
+  };
+};
+
 export default {
   fetchJSCollections,
   deleteJSCollection,
diff --git a/app/client/src/actions/pageActions.tsx b/app/client/src/actions/pageActions.tsx
index 6c7a7e63ed..71037cc7ca 100644
--- a/app/client/src/actions/pageActions.tsx
+++ b/app/client/src/actions/pageActions.tsx
@@ -12,7 +12,7 @@ import {
   ReplayReduxActionTypes,
 } from "@appsmith/constants/ReduxActionConstants";
 import type { DynamicPath } from "utils/DynamicBindingUtils";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import type { WidgetOperation } from "widgets/BaseWidget";
 import type {
   FetchPageRequest,
diff --git a/app/client/src/actions/pluginActionActions.ts b/app/client/src/actions/pluginActionActions.ts
index da56226e1c..1feca1837f 100644
--- a/app/client/src/actions/pluginActionActions.ts
+++ b/app/client/src/actions/pluginActionActions.ts
@@ -408,6 +408,13 @@ export const closeQueryActionTab = (payload: { id: string }) => {
   };
 };
 
+export const closeQueryActionTabSuccess = (payload: { id: string }) => {
+  return {
+    type: ReduxActionTypes.CLOSE_QUERY_ACTION_TAB_SUCCESS,
+    payload,
+  };
+};
+
 export default {
   createAction: createActionRequest,
   fetchActions,
diff --git a/app/client/src/actions/widgetActions.tsx b/app/client/src/actions/widgetActions.tsx
index 0d16591262..5effb4cbf9 100644
--- a/app/client/src/actions/widgetActions.tsx
+++ b/app/client/src/actions/widgetActions.tsx
@@ -144,6 +144,13 @@ export const groupWidgets = () => {
   };
 };
 
+export const openPartialExportModal = (payload: boolean) => {
+  return {
+    type: ReduxActionTypes.PARTIAL_EXPORT_MODAL_OPEN,
+    payload,
+  };
+};
+
 export const partialExportWidgets = (params: PartialExportParams) => {
   return {
     type: ReduxActionTypes.PARTIAL_EXPORT_INIT,
diff --git a/app/client/src/ce/actions/applicationActions.ts b/app/client/src/ce/actions/applicationActions.ts
index c556b98598..d37e29f03a 100644
--- a/app/client/src/ce/actions/applicationActions.ts
+++ b/app/client/src/ce/actions/applicationActions.ts
@@ -161,6 +161,13 @@ export const importApplication = (appDetails: ImportApplicationRequest) => {
   };
 };
 
+export const openPartialImportModal = (payload: boolean) => {
+  return {
+    type: ReduxActionTypes.PARTIAL_IMPORT_MODAL_OPEN,
+    payload,
+  };
+};
+
 export const importPartialApplication = (appPartialDetails: {
   applicationFile: File;
 }) => {
diff --git a/app/client/src/ce/api/ApiUtils.ts b/app/client/src/ce/api/ApiUtils.ts
index 46586826f9..b7e139a6db 100644
--- a/app/client/src/ce/api/ApiUtils.ts
+++ b/app/client/src/ce/api/ApiUtils.ts
@@ -21,7 +21,7 @@ import { AUTH_LOGIN_URL } from "constants/routes";
 import { getCurrentGitBranch } from "selectors/gitSyncSelectors";
 import getQueryParamsObject from "utils/getQueryParamsObject";
 import { UserCancelledActionExecutionError } from "sagas/ActionExecution/errorUtils";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getAppsmithConfigs } from "@appsmith/configs";
 import * as Sentry from "@sentry/react";
 import { CONTENT_TYPE_HEADER_KEY } from "constants/ApiEditorConstants/CommonApiConstants";
diff --git a/app/client/src/ce/constants/ReduxActionConstants.tsx b/app/client/src/ce/constants/ReduxActionConstants.tsx
index 95dafbb317..3ff8c1f60c 100644
--- a/app/client/src/ce/constants/ReduxActionConstants.tsx
+++ b/app/client/src/ce/constants/ReduxActionConstants.tsx
@@ -139,6 +139,7 @@ const ActionTypes = {
   GIT_RESET_AUTOCOMMIT_PROGRESS: "GIT_RESET_AUTOCOMMIT_PROGRESS",
   GIT_GET_METADATA_INIT: "GIT_GET_METADATA_INIT",
   GIT_GET_METADATA_SUCCESS: "GIT_GET_METADATA_SUCCESS",
+  GIT_SHOW_BRANCH_POPUP: "GIT_SHOW_BRANCH_POPUP",
 
   GIT_SET_SETTINGS_MODAL_OPEN: "GIT_SET_SETTINGS_MODAL_OPEN",
 
@@ -396,8 +397,10 @@ const ActionTypes = {
   INVITED_USER_SIGNUP_INIT: "INVITED_USER_SIGNUP_INIT",
   DISABLE_WIDGET_DRAG: "DISABLE_WIDGET_DRAG",
   SELECT_WIDGET_INIT: "SELECT_WIDGET_INIT",
+  PARTIAL_IMPORT_MODAL_OPEN: "PARTIAL_IMPORT_MODAL_OPEN",
   PARTIAL_IMPORT_INIT: "PARTIAL_IMPORT_INIT",
   PARTIAL_IMPORT_SUCCESS: "PARTIAL_IMPORT_SUCCESS",
+  PARTIAL_EXPORT_MODAL_OPEN: "PARTIAL_EXPORT_MODAL_OPEN",
   PARTIAL_EXPORT_INIT: "PARTIAL_EXPORT_INIT",
   PARTIAL_EXPORT_SUCCESS: "PARTIAL_EXPORT_SUCCESS",
   FOCUS_WIDGET: "FOCUS_WIDGET",
@@ -904,7 +907,6 @@ const ActionTypes = {
   SEARCH_WORKSPACE_ENTITIES_RESET: "SEARCH_WORKSPACE_ENTITIES_RESET",
   SET_IDE_EDITOR_VIEW_MODE: "SET_IDE_EDITOR_VIEW_MODE",
   RESTORE_IDE_EDITOR_VIEW_MODE: "RESTORE_IDE_EDITOR_VIEW_MODE",
-  SET_IDE_EDITOR_PAGES_ACTIVE_STATUS: "SET_IDE_EDITOR_PAGES_ACTIVE_STATUS",
   SWITCH_ENVIRONMENT_SUCCESS: "SWITCH_ENVIRONMENT_SUCCESS",
   SET_DATASOURCE_PREVIEW_SELECTED_TABLE_NAME:
     "SET_DATASOURCE_PREVIEW_SELECTED_TABLE_NAME",
@@ -924,7 +926,9 @@ const ActionTypes = {
   CREATE_NEW_JS_FROM_ACTION_CREATOR: "CREATE_NEW_JS_FROM_ACTION_CREATOR",
   CREATE_NEW_QUERY_FROM_ACTION_CREATOR: "CREATE_NEW_QUERY_FROM_ACTION_CREATOR",
   CLOSE_JS_ACTION_TAB: "CLOSE_JS_ACTION_TAB",
+  CLOSE_JS_ACTION_TAB_SUCCESS: "CLOSE_JS_ACTION_TAB_SUCCESS",
   CLOSE_QUERY_ACTION_TAB: "CLOSE_QUERY_ACTION_TAB",
+  CLOSE_QUERY_ACTION_TAB_SUCCESS: "CLOSE_QUERY_ACTION_TAB_SUCCESS",
 };
 
 export const ReduxActionTypes = {
diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts
index da1d45825d..c1440e7466 100644
--- a/app/client/src/ce/constants/messages.ts
+++ b/app/client/src/ce/constants/messages.ts
@@ -612,8 +612,6 @@ export const JS_EXECUTION_FAILURE = () => "JS Function execution failed";
 export const JS_EXECUTION_FAILURE_TOASTER = () =>
   "There was an error while executing function";
 export const JS_SETTINGS_ONPAGELOAD = () => "Run function on page load (Beta)";
-export const JS_EXECUTION_SUCCESS_TOASTER = (actionName: string) =>
-  `${actionName} ran successfully`;
 export const JS_SETTINGS_ONPAGELOAD_SUBTEXT = () =>
   "Will refresh data every time page is reloaded";
 export const JS_SETTINGS_CONFIRM_EXECUTION = () =>
@@ -1111,9 +1109,6 @@ export const BRANCH_PROTECTION_RULE_3 = () =>
   "You can still pull the latest changes and create new branches to edit the app.";
 export const BRANCH_PROTECTION_CHANGE_RULE = () =>
   "You can remove protection on your default branch in Git settings.";
-export const BRANCH_TOOLTIP_TITLE = () => "🚫 This is a protected branch";
-export const BRANCH_TOOLTIP_MESSAGE = () =>
-  "Please create a new branch or checkout an existing one to edit the app.";
 export const GO_TO_SETTINGS = () => "Go to settings";
 export const NOW_PROTECT_BRANCH = () =>
   "You can now protect your default branch.";
@@ -1123,6 +1118,15 @@ export const UPDATE_DEFAULT_BRANCH_SUCCESS = (branchName: string) =>
   `Updated default branch ${!!branchName ? `to ${branchName}` : ""}`;
 export const CONTACT_ADMIN_FOR_GIT = () =>
   "Please contact your workspace admin to connect your app to a git repo";
+export const BRANCH_PROTECTION_CALLOUT_MSG = () =>
+  "The branch is protected; please switch to or create a new branch to edit the app.";
+export const BRANCH_PROTECTION_CALLOUT_CREATE_BRANCH = () =>
+  "Create new branch";
+export const BRANCH_PROTECTION_CALLOUT_UNPROTECT = () => "Unprotect branch";
+export const BRANCH_PROTECTION_CALLOUT_UNPROTECT_LOADING = () =>
+  "Unprotecting branch ...";
+export const BRANCH_PROTECTION_PROTECTED = () => "Protected";
+
 // Git Branch Protection end
 
 export const GENERAL = () => "General";
@@ -1531,6 +1535,7 @@ export const QUERY_CONFIRMATION_MODAL_MESSAGE = () =>
 export const ENTITY_EXPLORER_TITLE = () => "NAVIGATION";
 export const MULTI_SELECT_PROPERTY_PANE_MESSAGE = () =>
   `Select a widget to see it's properties`;
+export const WIDGET_MULTI_SELECT = () => "Multiple selected";
 export const WIDGET_DEPRECATION_MESSAGE = (widgetName: string) =>
   `Drag the latest ${widgetName} to unlock new features and prevent end-of-life headaches for this widget.`;
 
@@ -2309,13 +2314,13 @@ export const EDITOR_PANE_TEXTS = {
   js_blank_state_description: () =>
     "Use JS to transform your data or write business logic",
   widget_blank_state_description: () =>
-    "Drag & drop widgets to create your app",
+    "Drag & drop UI elements to create your app",
   query_add_button: () => "New query / API",
   js_add_button: () => "New JS object",
   js_blank_object_item: () => "Blank JS object",
-  widget_add_button: () => "New widget",
+  widget_add_button: () => "New UI element",
   query_create_tab_title: () => "Create new query / API",
-  widgets_create_tab_title: () => "Drag & drop a widget",
+  widgets_create_tab_title: () => "Drag & drop UI elements",
   js_create_tab_title: () => "Create JS object",
   queries_create_from_existing: () => "From existing datasource",
   queries_create_new: () => "New API",
@@ -2448,7 +2453,9 @@ export const CUSTOM_WIDGET_FEATURE = {
 };
 
 export const WIDGET_PANEL_EMPTY_MESSAGE = () =>
-  "We couldn’t find any widgets called";
+  "We couldn’t find any UI elements called";
+
+export const UI_ELEMENT_PANEL_SEARCH_TEXT = () => "Search UI elements";
 
 export const HTTP_PROTOCOL_INPUT_PLACEHOLDER = () => `Select HTTP Protocol`;
 
diff --git a/app/client/src/ce/hooks/datasourceEditorHooks.tsx b/app/client/src/ce/hooks/datasourceEditorHooks.tsx
index 7b754d869c..b2795eb614 100644
--- a/app/client/src/ce/hooks/datasourceEditorHooks.tsx
+++ b/app/client/src/ce/hooks/datasourceEditorHooks.tsx
@@ -9,7 +9,7 @@ import {
   GENERATE_NEW_PAGE_BUTTON_TEXT,
   createMessage,
 } from "@appsmith/constants/messages";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import history from "utils/history";
 import { generateTemplateFormURL } from "@appsmith/RouteBuilder";
 import {
diff --git a/app/client/src/ce/navigation/FocusElements/AppIDE.ts b/app/client/src/ce/navigation/FocusElements/AppIDE.ts
index e6b94fcf44..7cf132efa1 100644
--- a/app/client/src/ce/navigation/FocusElements/AppIDE.ts
+++ b/app/client/src/ce/navigation/FocusElements/AppIDE.ts
@@ -59,9 +59,9 @@ import { FocusEntity, identifyEntityFromPath } from "navigation/FocusEntity";
 import { SelectionRequestType } from "sagas/WidgetSelectUtils";
 import { getExplorerWidth } from "selectors/explorerSelector";
 import {
-  getFirstJSObject,
   getJSPaneConfigSelectedTab,
   getJsPaneDebuggerState,
+  getLastJSTab,
 } from "selectors/jsPaneSelectors";
 import {
   getFocusablePropertyPaneField,
@@ -69,7 +69,7 @@ import {
   getSelectedPropertyPanel,
 } from "selectors/propertyPaneSelectors";
 import {
-  getFirstQuery,
+  getLastQueryTab,
   getQueryPaneConfigSelectedTabIndex,
   getQueryPaneDebuggerState,
 } from "selectors/queryPaneSelectors";
@@ -254,14 +254,13 @@ export const AppIDEFocusElements: FocusElementsConfigList = {
       selector: getQueryTabs,
       setter: setQueryTabs,
       defaultValue: [],
-      persist: true,
     },
     {
       type: FocusElementConfigType.URL,
       name: FocusElement.SelectedQuery,
       selector: identifyEntityFromPath,
       setter: setSelectedQuery,
-      defaultValue: getFirstQuery,
+      defaultValue: getLastQueryTab,
     },
   ],
   [FocusEntity.JS_OBJECT_LIST]: [
@@ -270,7 +269,7 @@ export const AppIDEFocusElements: FocusElementsConfigList = {
       name: FocusElement.SelectedJSObject,
       selector: identifyEntityFromPath,
       setter: setSelectedJSObject,
-      defaultValue: getFirstJSObject,
+      defaultValue: getLastJSTab,
     },
     {
       type: FocusElementConfigType.Redux,
@@ -278,7 +277,6 @@ export const AppIDEFocusElements: FocusElementsConfigList = {
       selector: getJSTabs,
       setter: setJSTabs,
       defaultValue: [],
-      persist: true,
     },
   ],
   [FocusEntity.WIDGET_LIST]: [
diff --git a/app/client/src/ce/pages/Applications/CreateNewAppFromTemplateModal/index.tsx b/app/client/src/ce/pages/Applications/CreateNewAppFromTemplateModal/index.tsx
index 77304e7609..b557f5b90e 100644
--- a/app/client/src/ce/pages/Applications/CreateNewAppFromTemplateModal/index.tsx
+++ b/app/client/src/ce/pages/Applications/CreateNewAppFromTemplateModal/index.tsx
@@ -33,7 +33,7 @@ import {
   templatesCountSelector,
 } from "selectors/templatesSelectors";
 import styled from "styled-components";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { StartWithTemplatesHeader } from "../StartWithTemplatesWrapper";
 
 interface CreateNewAppFromTemplatesModalProps {
diff --git a/app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx b/app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx
index 7599c32c27..34a34dc3ad 100644
--- a/app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx
+++ b/app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx
@@ -18,7 +18,7 @@ import { getApplicationsOfWorkspace } from "@appsmith/selectors/selectedWorkspac
 import { default as React, useEffect } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import styled from "styled-components";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import history from "utils/history";
 import { builderURL } from "@appsmith/RouteBuilder";
 import { getDatasource, getPlugin } from "@appsmith/selectors/entitiesSelector";
diff --git a/app/client/src/ce/pages/Applications/index.tsx b/app/client/src/ce/pages/Applications/index.tsx
index 4c60950206..56dd724ed0 100644
--- a/app/client/src/ce/pages/Applications/index.tsx
+++ b/app/client/src/ce/pages/Applications/index.tsx
@@ -122,7 +122,7 @@ import SharedUserList from "pages/common/SharedUserList";
 import GitSyncModal from "pages/Editor/gitSync/GitSyncModal";
 import ReconnectDatasourceModal from "pages/Editor/gitSync/ReconnectDatasourceModal";
 import RepoLimitExceededErrorModal from "pages/Editor/gitSync/RepoLimitExceededErrorModal";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { useIsMobileDevice } from "utils/hooks/useDeviceDetect";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import CreateNewAppFromTemplatesWrapper from "./CreateNewAppFromTemplateModal/CreateNewAppFromTemplatesWrapper";
diff --git a/app/client/src/ce/pages/Editor/Explorer/hooks.tsx b/app/client/src/ce/pages/Editor/Explorer/hooks.tsx
index d8057cbf7f..3807fd7a11 100644
--- a/app/client/src/ce/pages/Editor/Explorer/hooks.tsx
+++ b/app/client/src/ce/pages/Editor/Explorer/hooks.tsx
@@ -130,17 +130,15 @@ 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],
   );
@@ -256,9 +254,8 @@ 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/ce/pages/Editor/IDE/EditorPane/JS/hooks.ts b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/hooks.ts
index ec41864db1..0499216965 100644
--- a/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/hooks.ts
+++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/JS/hooks.ts
@@ -16,7 +16,6 @@ import JSEditor from "pages/Editor/JSEditor";
 import AddJS from "pages/Editor/IDE/EditorPane/JS/Add";
 import { ADD_PATH } from "@appsmith/constants/routes/appRoutes";
 import ListJS from "pages/Editor/IDE/EditorPane/JS/List";
-import { BlankStateContainer } from "pages/Editor/IDE/EditorPane/JS/BlankStateContainer";
 import { useCurrentEditorState } from "pages/Editor/IDE/hooks";
 import history from "utils/history";
 import { FocusEntity, identifyEntityFromPath } from "navigation/FocusEntity";
@@ -105,7 +104,7 @@ export const useJSSegmentRoutes = (path: string): UseRoutes => {
       },
       {
         key: "JSEmpty",
-        component: BlankStateContainer,
+        component: ListJS,
         exact: true,
         path: [path],
       },
diff --git a/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/hooks.ts b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/hooks.ts
index 931083070f..450ddfd7de 100644
--- a/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/hooks.ts
+++ b/app/client/src/ce/pages/Editor/IDE/EditorPane/Query/hooks.ts
@@ -38,7 +38,6 @@ import type { AppState } from "@appsmith/reducers";
 import keyBy from "lodash/keyBy";
 import { getPluginEntityIcon } from "pages/Editor/Explorer/ExplorerIcons";
 import type { ListItemProps } from "design-system";
-import { BlankStateContainer } from "pages/Editor/IDE/EditorPane/Query/BlankStateContainer";
 import { useCurrentEditorState } from "pages/Editor/IDE/hooks";
 import CurlImportEditor from "pages/Editor/APIEditor/CurlImportEditor";
 
@@ -160,7 +159,7 @@ export const useQuerySegmentRoutes = (path: string): UseRoutes => {
       },
       {
         key: "QueryEmpty",
-        component: BlankStateContainer,
+        component: ListQuery,
         exact: true,
         path: [path],
       },
diff --git a/app/client/src/ce/pages/workspace/InviteUsersForm.tsx b/app/client/src/ce/pages/workspace/InviteUsersForm.tsx
index 2b8ec4249d..a35f8e0671 100644
--- a/app/client/src/ce/pages/workspace/InviteUsersForm.tsx
+++ b/app/client/src/ce/pages/workspace/InviteUsersForm.tsx
@@ -26,7 +26,7 @@ import {
   CUSTOM_ROLE_TEXT,
 } from "@appsmith/constants/messages";
 import { isEmail } from "utils/formhelpers";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import type { SelectOptionProps } from "design-system";
 import { Callout, Checkbox } from "design-system";
 import {
diff --git a/app/client/src/ce/reducers/uiReducers/applicationsReducer.tsx b/app/client/src/ce/reducers/uiReducers/applicationsReducer.tsx
index f13ad3b2f0..62029d9dee 100644
--- a/app/client/src/ce/reducers/uiReducers/applicationsReducer.tsx
+++ b/app/client/src/ce/reducers/uiReducers/applicationsReducer.tsx
@@ -52,8 +52,10 @@ export const initialState: ApplicationsReduxState = {
     isFetchingAllUsers: false,
   },
   partialImportExport: {
+    isExportModalOpen: false,
     isExporting: false,
     isExportDone: false,
+    isImportModalOpen: false,
     isImporting: false,
     isImportDone: false,
   },
@@ -267,6 +269,7 @@ export const handlers = {
     ...state,
     partialImportExport: {
       ...state.partialImportExport,
+      isImportModalOpen: false,
       isImporting: false,
       isImportDone: true,
     },
@@ -277,6 +280,7 @@ export const handlers = {
     ...state,
     partialImportExport: {
       ...state.partialImportExport,
+      isImportModalOpen: false,
       isImporting: false,
       isImportDone: true,
     },
@@ -656,6 +660,26 @@ export const handlers = {
       currentApplicationIdForCreateNewApp: undefined,
     };
   },
+  [ReduxActionTypes.PARTIAL_IMPORT_MODAL_OPEN]: (
+    state: ApplicationsReduxState,
+    action: ReduxAction<boolean>,
+  ) => ({
+    ...state,
+    partialImportExport: {
+      ...state.partialImportExport,
+      isImportModalOpen: action.payload,
+    },
+  }),
+  [ReduxActionTypes.PARTIAL_EXPORT_MODAL_OPEN]: (
+    state: ApplicationsReduxState,
+    action: ReduxAction<boolean>,
+  ) => ({
+    ...state,
+    partialImportExport: {
+      ...state.partialImportExport,
+      isExportModalOpen: action.payload,
+    },
+  }),
   [ReduxActionTypes.PARTIAL_EXPORT_INIT]: (state: ApplicationsReduxState) => ({
     ...state,
     partialImportExport: {
@@ -670,6 +694,7 @@ export const handlers = {
     ...state,
     partialImportExport: {
       ...state.partialImportExport,
+      isExportModalOpen: false,
       isExporting: false,
       isExportDone: true,
     },
@@ -680,6 +705,7 @@ export const handlers = {
     ...state,
     partialImportExport: {
       ...state.partialImportExport,
+      isExportModalOpen: false,
       isExporting: false,
       isExportDone: true,
     },
@@ -736,8 +762,10 @@ export interface ApplicationsReduxState {
   };
   currentApplicationIdForCreateNewApp?: string;
   partialImportExport: {
+    isExportModalOpen: boolean;
     isExporting: boolean;
     isExportDone: boolean;
+    isImportModalOpen: boolean;
     isImporting: boolean;
     isImportDone: boolean;
   };
diff --git a/app/client/src/ce/sagas/ApplicationSagas.tsx b/app/client/src/ce/sagas/ApplicationSagas.tsx
index a67f66f829..8f7697be74 100644
--- a/app/client/src/ce/sagas/ApplicationSagas.tsx
+++ b/app/client/src/ce/sagas/ApplicationSagas.tsx
@@ -57,7 +57,7 @@ import {
   updateApplicationThemeSettingAction,
   fetchAllApplicationsOfWorkspace,
 } from "@appsmith/actions/applicationActions";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import {
   createMessage,
   ERROR_IMPORTING_APPLICATION_TO_WORKSPACE,
diff --git a/app/client/src/ce/sagas/JSActionSagas.ts b/app/client/src/ce/sagas/JSActionSagas.ts
index 280e7e4de9..18a5cc7772 100644
--- a/app/client/src/ce/sagas/JSActionSagas.ts
+++ b/app/client/src/ce/sagas/JSActionSagas.ts
@@ -13,6 +13,7 @@ import {
 } from "actions/pluginActionActions";
 import type { JSAction, JSCollection } from "entities/JSCollection";
 import {
+  closeJsActionTabSuccess,
   copyJSCollectionError,
   copyJSCollectionSuccess,
   createJSCollectionSuccess,
@@ -58,7 +59,7 @@ import type { CreateJSCollectionRequest } from "@appsmith/api/JSActionAPI";
 import * as log from "loglevel";
 import { builderURL, jsCollectionIdURL } from "@appsmith/RouteBuilder";
 import type { EventLocation } from "@appsmith/utils/analyticsUtilTypes";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import {
   checkAndLogErrorsIfCyclicDependency,
   getFromServerWhenNoPrefetchedResult,
@@ -320,6 +321,7 @@ export function* deleteJSCollectionSaga(
         },
       });
       yield put(deleteJSCollectionSuccess({ id }));
+      yield put(closeJsActionTabSuccess({ id }));
 
       const widgets: CanvasWidgetsReduxState = yield select(getWidgets);
 
@@ -493,5 +495,8 @@ export function* closeJSActionTabSaga(
   actionPayload: ReduxAction<{ id: string }>,
 ) {
   const id = actionPayload.payload.id;
+  const currentUrl = window.location.pathname;
+  yield call(FocusRetention.handleRemoveFocusHistory, currentUrl);
   yield call(handleJSEntityRedirect, id);
+  yield put(closeJsActionTabSuccess({ id }));
 }
diff --git a/app/client/src/ce/sagas/NavigationSagas.ts b/app/client/src/ce/sagas/NavigationSagas.ts
index a7547c2304..17b898fef8 100644
--- a/app/client/src/ce/sagas/NavigationSagas.ts
+++ b/app/client/src/ce/sagas/NavigationSagas.ts
@@ -2,7 +2,7 @@ import { fork, put, select, call } from "redux-saga/effects";
 import type { RouteChangeActionPayload } from "actions/focusHistoryActions";
 import { FocusEntity, identifyEntityFromPath } from "navigation/FocusEntity";
 import log from "loglevel";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getRecentEntityIds } from "selectors/globalSearchSelectors";
 import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
 import { getCurrentThemeDetails } from "selectors/themeSelectors";
diff --git a/app/client/src/ce/sagas/PageSagas.tsx b/app/client/src/ce/sagas/PageSagas.tsx
index 28896754fe..6e82fc8cfc 100644
--- a/app/client/src/ce/sagas/PageSagas.tsx
+++ b/app/client/src/ce/sagas/PageSagas.tsx
@@ -100,7 +100,7 @@ import log from "loglevel";
 import { migrateIncorrectDynamicBindingPathLists } from "utils/migrations/IncorrectDynamicBindingPathLists";
 import * as Sentry from "@sentry/react";
 import { ERROR_CODES } from "@appsmith/constants/ApiConstants";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import DEFAULT_TEMPLATE from "templates/default";
 
 import { getAppMode } from "@appsmith/selectors/applicationSelectors";
diff --git a/app/client/src/ce/sagas/SuperUserSagas.tsx b/app/client/src/ce/sagas/SuperUserSagas.tsx
index 0ef6294012..303b4a7170 100644
--- a/app/client/src/ce/sagas/SuperUserSagas.tsx
+++ b/app/client/src/ce/sagas/SuperUserSagas.tsx
@@ -24,7 +24,7 @@ import { getCurrentUser } from "selectors/usersSelectors";
 import { EMAIL_SETUP_DOC } from "constants/ThirdPartyConstants";
 import { getCurrentTenant } from "@appsmith/actions/tenantActions";
 import { toast } from "design-system";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import {
   MIGRATION_STATUS,
   RESTART_POLL_INTERVAL,
diff --git a/app/client/src/ce/sagas/analyticsSaga.ts b/app/client/src/ce/sagas/analyticsSaga.ts
index e2bbbcb537..cba8509da8 100644
--- a/app/client/src/ce/sagas/analyticsSaga.ts
+++ b/app/client/src/ce/sagas/analyticsSaga.ts
@@ -1,6 +1,5 @@
 import { getCurrentUser } from "selectors/usersSelectors";
 import { getInstanceId } from "@appsmith/selectors/tenantSelectors";
-import { getAppsmithConfigs } from "@appsmith/configs";
 import { call, select } from "redux-saga/effects";
 import type { APP_MODE } from "entities/App";
 import {
@@ -10,16 +9,11 @@ import {
 import type { TriggerMeta } from "@appsmith/sagas/ActionExecution/ActionExecutionSagas";
 import { TriggerKind } from "constants/AppsmithActionConstants/ActionConstants";
 import { isArray } from "lodash";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getAppMode } from "@appsmith/selectors/entitiesSelector";
 import type { AppState } from "@appsmith/reducers";
 import { getWidget } from "sagas/selectors";
-
-export function getUserSource() {
-  const { cloudHosting } = getAppsmithConfigs();
-  const source = cloudHosting ? "cloud" : "ce";
-  return source;
-}
+import { getUserSource } from "@appsmith/utils/AnalyticsUtil";
 
 export interface UserAndAppDetails {
   pageId: string;
diff --git a/app/client/src/ce/sagas/tenantSagas.tsx b/app/client/src/ce/sagas/tenantSagas.tsx
index 9bf9969bd0..626e5de72f 100644
--- a/app/client/src/ce/sagas/tenantSagas.tsx
+++ b/app/client/src/ce/sagas/tenantSagas.tsx
@@ -12,7 +12,7 @@ import { safeCrashAppRequest } from "actions/errorActions";
 import { ERROR_CODES } from "@appsmith/constants/ApiConstants";
 import { defaultBrandingConfig as CE_defaultBrandingConfig } from "@appsmith/reducers/tenantReducer";
 import { toast } from "design-system";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getFromServerWhenNoPrefetchedResult } from "sagas/helper";
 
 // On CE we don't expose tenant config so this shouldn't make any API calls and should just return necessary permissions for the user
diff --git a/app/client/src/ce/sagas/userSagas.tsx b/app/client/src/ce/sagas/userSagas.tsx
index 0ce8d7d41a..216637e6c0 100644
--- a/app/client/src/ce/sagas/userSagas.tsx
+++ b/app/client/src/ce/sagas/userSagas.tsx
@@ -40,7 +40,7 @@ import {
   fetchProductAlertFailure,
   fetchFeatureFlagsInit,
 } from "actions/userActions";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { INVITE_USERS_TO_WORKSPACE_FORM } from "@appsmith/constants/forms";
 import PerformanceTracker, {
   PerformanceTransactionName,
diff --git a/app/client/src/ce/selectors/entitiesSelector.ts b/app/client/src/ce/selectors/entitiesSelector.ts
index 310f0a6a90..316a452700 100644
--- a/app/client/src/ce/selectors/entitiesSelector.ts
+++ b/app/client/src/ce/selectors/entitiesSelector.ts
@@ -1357,8 +1357,9 @@ 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 d74c446251..10d102d976 100644
--- a/app/client/src/ce/selectors/tenantSelectors.tsx
+++ b/app/client/src/ce/selectors/tenantSelectors.tsx
@@ -49,8 +49,11 @@ export const getIsFormLoginEnabled = (state: AppState): boolean =>
 export const getInstanceId = (state: AppState): string =>
   state.tenant?.instanceId;
 
-// eslint-disable-next-line
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 export const shouldShowLicenseBanner = (state: AppState) => false;
 
 export const getHideWatermark = (state: AppState): boolean =>
   state.tenant?.tenantConfiguration?.hideWatermark;
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export const isFreePlan = (state: AppState) => true;
diff --git a/app/client/src/utils/AnalyticsUtil.tsx b/app/client/src/ce/utils/AnalyticsUtil.tsx
similarity index 94%
rename from app/client/src/utils/AnalyticsUtil.tsx
rename to app/client/src/ce/utils/AnalyticsUtil.tsx
index 28823a1c99..0249c56dbc 100644
--- a/app/client/src/utils/AnalyticsUtil.tsx
+++ b/app/client/src/ce/utils/AnalyticsUtil.tsx
@@ -8,6 +8,11 @@ import { ANONYMOUS_USERNAME } from "constants/userConstants";
 import { sha256 } from "js-sha256";
 import type { EventName } from "@appsmith/utils/analyticsUtilTypes";
 
+export function getUserSource() {
+  const { cloudHosting, segment } = getAppsmithConfigs();
+  const source = cloudHosting || segment.apiKey ? "cloud" : "ce";
+  return source;
+}
 declare global {
   interface Window {
     // Zipy is added via script tags in index.html
@@ -18,7 +23,7 @@ declare global {
   }
 }
 
-const parentContextTypeTokens = ["pkg", "workflow"];
+export const parentContextTypeTokens = ["pkg", "workflow"];
 
 /**
  * Function to check the current URL and return the parent context.
@@ -27,7 +32,7 @@ const parentContextTypeTokens = ["pkg", "workflow"];
  * @param location current location object based on URL
  * @returns object {id, type} where type is either pkg or workflow and id is the id of the pkg or workflow
  */
-function getParentContextFromURL(location: Location) {
+export function getParentContextFromURL(location: Location) {
   const pathSplit = location.pathname.split("/");
   let type = parentContextTypeTokens[0];
   const editorIndex = pathSplit.findIndex((path) =>
@@ -42,7 +47,7 @@ function getParentContextFromURL(location: Location) {
   }
 }
 
-function getApplicationId(location: Location) {
+export function getApplicationId(location: Location) {
   const pathSplit = location.pathname.split("/");
   const applicationsIndex = pathSplit.findIndex(
     (path) => path === "applications",
@@ -170,13 +175,13 @@ class AnalyticsUtil {
     const appId = getApplicationId(windowDoc.location);
     const { appVersion, segment } = getAppsmithConfigs();
     if (userData) {
+      const source = getUserSource();
       let user: any = {};
       if (segment.apiKey) {
         user = {
           userId: userData.username,
           email: userData.email,
           appId,
-          source: "cloud",
         };
       } else {
         const userId = userData.username;
@@ -186,12 +191,12 @@ class AnalyticsUtil {
         }
         user = {
           userId: AnalyticsUtil.cachedAnonymoustId,
-          source: "ce",
         };
       }
       finalEventData = {
         ...eventData,
-        userData: user.userId === ANONYMOUS_USERNAME ? undefined : user,
+        userData:
+          user.userId === ANONYMOUS_USERNAME ? undefined : { ...user, source },
       };
     }
     finalEventData = {
@@ -214,13 +219,14 @@ class AnalyticsUtil {
     const windowDoc: any = window;
     const userId = userData.username;
     if (windowDoc.analytics) {
+      const source = getUserSource();
       // This flag is only set on Appsmith Cloud. In this case, we get more detailed analytics of the user
       if (segment.apiKey) {
         const userProperties = {
+          userId: userId,
+          source,
           email: userData.email,
           name: userData.name,
-          userId: userId,
-          source: "cloud",
           emailVerified: userData.emailVerified,
         };
         AnalyticsUtil.user = userData;
@@ -234,7 +240,7 @@ class AnalyticsUtil {
         }
         const userProperties = {
           userId: AnalyticsUtil.cachedAnonymoustId,
-          source: "ce",
+          source,
           ...(sendAdditionalData
             ? {
                 id: AnalyticsUtil.cachedAnonymoustId,
diff --git a/app/client/src/components/BottomBar/ManualUpgrades.tsx b/app/client/src/components/BottomBar/ManualUpgrades.tsx
index d9a26823fd..90d04be592 100644
--- a/app/client/src/components/BottomBar/ManualUpgrades.tsx
+++ b/app/client/src/components/BottomBar/ManualUpgrades.tsx
@@ -25,7 +25,7 @@ import {
 import styled from "styled-components";
 import { createMessage, CLEAN_URL_UPDATE } from "@appsmith/constants/messages";
 import { useLocation } from "react-router";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import classNames from "classnames";
 
 const StyledList = styled.ul`
diff --git a/app/client/src/components/designSystems/appsmith/BaseButton.tsx b/app/client/src/components/designSystems/appsmith/BaseButton.tsx
index 3b5cbbc63d..58b74049d9 100644
--- a/app/client/src/components/designSystems/appsmith/BaseButton.tsx
+++ b/app/client/src/components/designSystems/appsmith/BaseButton.tsx
@@ -125,27 +125,27 @@ const StyledButton = styled((props) => (
             ? theme.colors.button.warning.primary.bgColor
             : "none"
           : buttonStyle === ButtonStyleTypes.DANGER
-          ? buttonVariant === ButtonVariantTypes.PRIMARY
-            ? theme.colors.button.danger.primary.bgColor
-            : "none"
-          : buttonStyle === ButtonStyleTypes.INFO
-          ? buttonVariant === ButtonVariantTypes.PRIMARY
-            ? theme.colors.button.info.primary.bgColor
-            : "none"
-          : buttonStyle === ButtonStyleTypes.SECONDARY
-          ? buttonVariant === ButtonVariantTypes.PRIMARY
-            ? theme.colors.button.secondary.primary.bgColor
-            : "none"
-          : buttonStyle === ButtonStyleTypes.CUSTOM
-          ? getCustomBackgroundColor(
-              theme,
-              prevButtonStyle,
-              buttonVariant,
-              buttonColor,
-            )
-          : buttonVariant === ButtonVariantTypes.PRIMARY
-          ? theme.colors.button.primary.primary.bgColor
-          : "none"
+            ? buttonVariant === ButtonVariantTypes.PRIMARY
+              ? theme.colors.button.danger.primary.bgColor
+              : "none"
+            : buttonStyle === ButtonStyleTypes.INFO
+              ? buttonVariant === ButtonVariantTypes.PRIMARY
+                ? theme.colors.button.info.primary.bgColor
+                : "none"
+              : buttonStyle === ButtonStyleTypes.SECONDARY
+                ? buttonVariant === ButtonVariantTypes.PRIMARY
+                  ? theme.colors.button.secondary.primary.bgColor
+                  : "none"
+                : buttonStyle === ButtonStyleTypes.CUSTOM
+                  ? getCustomBackgroundColor(
+                      theme,
+                      prevButtonStyle,
+                      buttonVariant,
+                      buttonColor,
+                    )
+                  : buttonVariant === ButtonVariantTypes.PRIMARY
+                    ? theme.colors.button.primary.primary.bgColor
+                    : "none"
       } !important;
     }
 
@@ -155,34 +155,34 @@ const StyledButton = styled((props) => (
           ? buttonVariant === ButtonVariantTypes.SECONDARY
             ? theme.colors.button.warning.secondary.hoverColor
             : buttonVariant === ButtonVariantTypes.TERTIARY
-            ? theme.colors.button.warning.tertiary.hoverColor
-            : theme.colors.button.warning.primary.hoverColor
+              ? theme.colors.button.warning.tertiary.hoverColor
+              : theme.colors.button.warning.primary.hoverColor
           : buttonStyle === ButtonStyleTypes.DANGER
-          ? buttonVariant === ButtonVariantTypes.PRIMARY
-            ? theme.colors.button.danger.primary.hoverColor
-            : theme.colors.button.danger.secondary.hoverColor
-          : buttonStyle === ButtonStyleTypes.INFO
-          ? buttonVariant === ButtonVariantTypes.PRIMARY
-            ? theme.colors.button.info.primary.hoverColor
-            : theme.colors.button.info.secondary.hoverColor
-          : buttonStyle === ButtonStyleTypes.SECONDARY
-          ? buttonVariant === ButtonVariantTypes.SECONDARY
-            ? theme.colors.button.secondary.secondary.hoverColor
-            : buttonVariant === ButtonVariantTypes.TERTIARY
-            ? theme.colors.button.secondary.tertiary.hoverColor
-            : theme.colors.button.secondary.primary.hoverColor
-          : buttonStyle === ButtonStyleTypes.CUSTOM
-          ? getCustomHoverColor(
-              theme,
-              prevButtonStyle,
-              buttonVariant,
-              buttonColor,
-            )
-          : buttonVariant === ButtonVariantTypes.SECONDARY
-          ? theme.colors.button.primary.secondary.hoverColor
-          : buttonVariant === ButtonVariantTypes.TERTIARY
-          ? theme.colors.button.primary.tertiary.hoverColor
-          : theme.colors.button.primary.primary.hoverColor
+            ? buttonVariant === ButtonVariantTypes.PRIMARY
+              ? theme.colors.button.danger.primary.hoverColor
+              : theme.colors.button.danger.secondary.hoverColor
+            : buttonStyle === ButtonStyleTypes.INFO
+              ? buttonVariant === ButtonVariantTypes.PRIMARY
+                ? theme.colors.button.info.primary.hoverColor
+                : theme.colors.button.info.secondary.hoverColor
+              : buttonStyle === ButtonStyleTypes.SECONDARY
+                ? buttonVariant === ButtonVariantTypes.SECONDARY
+                  ? theme.colors.button.secondary.secondary.hoverColor
+                  : buttonVariant === ButtonVariantTypes.TERTIARY
+                    ? theme.colors.button.secondary.tertiary.hoverColor
+                    : theme.colors.button.secondary.primary.hoverColor
+                : buttonStyle === ButtonStyleTypes.CUSTOM
+                  ? getCustomHoverColor(
+                      theme,
+                      prevButtonStyle,
+                      buttonVariant,
+                      buttonColor,
+                    )
+                  : buttonVariant === ButtonVariantTypes.SECONDARY
+                    ? theme.colors.button.primary.secondary.hoverColor
+                    : buttonVariant === ButtonVariantTypes.TERTIARY
+                      ? theme.colors.button.primary.tertiary.hoverColor
+                      : theme.colors.button.primary.primary.hoverColor
       } !important;
       border-color: var(--appsmith-input-focus-border-color) !important;
     }
@@ -197,19 +197,19 @@ const StyledButton = styled((props) => (
         ? buttonStyle === ButtonStyleTypes.WARNING
           ? `1px solid ${theme.colors.button.warning.secondary.borderColor}`
           : buttonStyle === ButtonStyleTypes.DANGER
-          ? `1px solid ${theme.colors.button.danger.secondary.borderColor}`
-          : buttonStyle === ButtonStyleTypes.INFO
-          ? `1px solid ${theme.colors.button.info.secondary.borderColor}`
-          : buttonStyle === ButtonStyleTypes.SECONDARY
-          ? `1px solid ${theme.colors.button.secondary.secondary.borderColor}`
-          : buttonStyle === ButtonStyleTypes.CUSTOM
-          ? `1px solid ${getCustomBorderColor(
-              theme,
-              prevButtonStyle,
-              buttonVariant,
-              buttonColor,
-            )}`
-          : `1px solid ${theme.colors.button.primary.secondary.borderColor}`
+            ? `1px solid ${theme.colors.button.danger.secondary.borderColor}`
+            : buttonStyle === ButtonStyleTypes.INFO
+              ? `1px solid ${theme.colors.button.info.secondary.borderColor}`
+              : buttonStyle === ButtonStyleTypes.SECONDARY
+                ? `1px solid ${theme.colors.button.secondary.secondary.borderColor}`
+                : buttonStyle === ButtonStyleTypes.CUSTOM
+                  ? `1px solid ${getCustomBorderColor(
+                      theme,
+                      prevButtonStyle,
+                      buttonVariant,
+                      buttonColor,
+                    )}`
+                  : `1px solid ${theme.colors.button.primary.secondary.borderColor}`
         : "none"
     } !important;
 
@@ -228,21 +228,21 @@ const StyledButton = styled((props) => (
             ? getCustomTextColor(theme, buttonColor, prevButtonStyle)
             : `${theme.colors.button.primary.primary.textColor}`
           : buttonStyle === ButtonStyleTypes.WARNING
-          ? `${theme.colors.button.warning.secondary.textColor}`
-          : buttonStyle === ButtonStyleTypes.DANGER
-          ? `${theme.colors.button.danger.secondary.textColor}`
-          : buttonStyle === ButtonStyleTypes.INFO
-          ? `${theme.colors.button.info.secondary.textColor}`
-          : buttonStyle === ButtonStyleTypes.SECONDARY
-          ? `${theme.colors.button.secondary.secondary.textColor}`
-          : buttonStyle === ButtonStyleTypes.CUSTOM
-          ? getCustomBackgroundColor(
-              theme,
-              prevButtonStyle,
-              ButtonVariantTypes.PRIMARY,
-              buttonColor,
-            )
-          : `${theme.colors.button.primary.secondary.textColor}`
+            ? `${theme.colors.button.warning.secondary.textColor}`
+            : buttonStyle === ButtonStyleTypes.DANGER
+              ? `${theme.colors.button.danger.secondary.textColor}`
+              : buttonStyle === ButtonStyleTypes.INFO
+                ? `${theme.colors.button.info.secondary.textColor}`
+                : buttonStyle === ButtonStyleTypes.SECONDARY
+                  ? `${theme.colors.button.secondary.secondary.textColor}`
+                  : buttonStyle === ButtonStyleTypes.CUSTOM
+                    ? getCustomBackgroundColor(
+                        theme,
+                        prevButtonStyle,
+                        ButtonVariantTypes.PRIMARY,
+                        buttonColor,
+                      )
+                    : `${theme.colors.button.primary.secondary.textColor}`
       } !important;
     }
   `}
@@ -256,22 +256,23 @@ const StyledButton = styled((props) => (
           boxShadowColor || theme.colors.button.boxShadow.default.variant1
         }`
       : boxShadow === ButtonBoxShadowTypes.VARIANT2
-      ? `3px 3px 4px ${
-          boxShadowColor || theme.colors.button.boxShadow.default.variant2
-        }`
-      : boxShadow === ButtonBoxShadowTypes.VARIANT3
-      ? `0px 1px 3px ${
-          boxShadowColor || theme.colors.button.boxShadow.default.variant3
-        }`
-      : boxShadow === ButtonBoxShadowTypes.VARIANT4
-      ? `2px 2px 0px ${
-          boxShadowColor || theme.colors.button.boxShadow.default.variant4
-        }`
-      : boxShadow === ButtonBoxShadowTypes.VARIANT5
-      ? `-2px -2px 0px ${
-          boxShadowColor || theme.colors.button.boxShadow.default.variant5
-        }`
-      : "none"} !important;
+        ? `3px 3px 4px ${
+            boxShadowColor || theme.colors.button.boxShadow.default.variant2
+          }`
+        : boxShadow === ButtonBoxShadowTypes.VARIANT3
+          ? `0px 1px 3px ${
+              boxShadowColor || theme.colors.button.boxShadow.default.variant3
+            }`
+          : boxShadow === ButtonBoxShadowTypes.VARIANT4
+            ? `2px 2px 0px ${
+                boxShadowColor || theme.colors.button.boxShadow.default.variant4
+              }`
+            : boxShadow === ButtonBoxShadowTypes.VARIANT5
+              ? `-2px -2px 0px ${
+                  boxShadowColor ||
+                  theme.colors.button.boxShadow.default.variant5
+                }`
+              : "none"} !important;
 `;
 
 interface ButtonStyleProps {
diff --git a/app/client/src/components/designSystems/appsmith/header/DeployLinkButton.tsx b/app/client/src/components/designSystems/appsmith/header/DeployLinkButton.tsx
index 96eefe33c8..1a54859547 100644
--- a/app/client/src/components/designSystems/appsmith/header/DeployLinkButton.tsx
+++ b/app/client/src/components/designSystems/appsmith/header/DeployLinkButton.tsx
@@ -5,7 +5,7 @@ import { useSelector, useDispatch } from "react-redux";
 import { getIsGitConnected } from "selectors/gitSyncSelectors";
 import { setIsGitSyncModalOpen } from "actions/gitSyncActions";
 import { GitSyncModalTab } from "entities/GitSync";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import {
   CONNECT_TO_GIT_OPTION,
   CURRENT_DEPLOY_PREVIEW_OPTION,
diff --git a/app/client/src/components/editorComponents/ActionCreator/index.tsx b/app/client/src/components/editorComponents/ActionCreator/index.tsx
index 351a60306b..e44b10de81 100644
--- a/app/client/src/components/editorComponents/ActionCreator/index.tsx
+++ b/app/client/src/components/editorComponents/ActionCreator/index.tsx
@@ -12,7 +12,7 @@ import { useSelector } from "react-redux";
 import { selectEvaluationVersion } from "@appsmith/selectors/applicationSelectors";
 import { generateReactKey } from "../../../utils/generators";
 import { useApisQueriesAndJsActionOptions } from "./helpers";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getActionTypeLabel } from "./viewComponents/ActionBlockTree/utils";
 import { AppsmithFunction } from "./constants";
 
diff --git a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx
index 4619233f24..9a8ed830be 100644
--- a/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx
+++ b/app/client/src/components/editorComponents/ActionCreator/viewComponents/Action/ActionTree.tsx
@@ -9,7 +9,7 @@ import type { TActionBlock, VariantType } from "../../types";
 import { chainableFns } from "../../utils";
 import ActionCard from "./ActionCard";
 import ActionSelector from "./ActionSelector";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getActionTypeLabel } from "../ActionBlockTree/utils";
 import classNames from "classnames";
 import type { AdditionalDynamicDataTree } from "utils/autocomplete/customTreeTypeDefCreator";
diff --git a/app/client/src/components/editorComponents/ActionRightPane/Connections.tsx b/app/client/src/components/editorComponents/ActionRightPane/Connections.tsx
index c55de05104..1fb7927df0 100644
--- a/app/client/src/components/editorComponents/ActionRightPane/Connections.tsx
+++ b/app/client/src/components/editorComponents/ActionRightPane/Connections.tsx
@@ -3,7 +3,7 @@ import { Text, TextType } from "design-system-old";
 import styled from "styled-components";
 import LongArrowSVG from "assets/images/long-arrow-bottom.svg";
 import { useEntityLink } from "../Debugger/hooks/debuggerHooks";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import {
   createMessage,
   INCOMING_ENTITIES,
diff --git a/app/client/src/components/editorComponents/ApiResponseView.tsx b/app/client/src/components/editorComponents/ApiResponseView.tsx
index c1fff76120..0c3530f776 100644
--- a/app/client/src/components/editorComponents/ApiResponseView.tsx
+++ b/app/client/src/components/editorComponents/ApiResponseView.tsx
@@ -22,7 +22,7 @@ import NoResponseSVG from "assets/images/no-response.svg";
 import DebuggerLogs from "./Debugger/DebuggerLogs";
 import ErrorLogs from "./Debugger/Errors";
 import Resizer, { ResizerCSS } from "./Debugger/Resizer";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { Classes, TAB_MIN_HEIGHT, Text, TextType } from "design-system-old";
 import { Button, Callout, Flex, SegmentedControl } from "design-system";
 import type { BottomTab } from "./EntityBottomTabs";
diff --git a/app/client/src/components/editorComponents/Button.tsx b/app/client/src/components/editorComponents/Button.tsx
index cdcd1a2229..9277363049 100644
--- a/app/client/src/components/editorComponents/Button.tsx
+++ b/app/client/src/components/editorComponents/Button.tsx
@@ -50,8 +50,8 @@ const buttonStyles = css<Partial<ButtonProps>>`
         props.skin === undefined
           ? "center"
           : props.iconAlignment === Directions.RIGHT
-          ? "space-between"
-          : "flex-start"};
+            ? "space-between"
+            : "flex-start"};
     }
   }
   ${(props) => (props.outline ? outline : "")}
diff --git a/app/client/src/components/editorComponents/CloseEditor.tsx b/app/client/src/components/editorComponents/CloseEditor.tsx
index f2c4878d3d..6caf88de27 100644
--- a/app/client/src/components/editorComponents/CloseEditor.tsx
+++ b/app/client/src/components/editorComponents/CloseEditor.tsx
@@ -12,7 +12,7 @@ import {
 } from "@appsmith/RouteBuilder";
 import { useSelector } from "react-redux";
 import { getCurrentPageId } from "selectors/editorSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { Link } from "design-system";
 import styled from "styled-components";
 import type { AppsmithLocationState } from "../../utils/history";
diff --git a/app/client/src/components/editorComponents/CodeEditor/PeekOverlayPopup/Analytics.ts b/app/client/src/components/editorComponents/CodeEditor/PeekOverlayPopup/Analytics.ts
index bdba6b2c98..ca59286be3 100644
--- a/app/client/src/components/editorComponents/CodeEditor/PeekOverlayPopup/Analytics.ts
+++ b/app/client/src/components/editorComponents/CodeEditor/PeekOverlayPopup/Analytics.ts
@@ -1,5 +1,5 @@
 import type { MouseEventHandler } from "react";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 export const objectCollapseAnalytics: MouseEventHandler = (ev) => {
   /*
diff --git a/app/client/src/components/editorComponents/CodeEditor/commandsHelper.ts b/app/client/src/components/editorComponents/CodeEditor/commandsHelper.ts
index 5df7b042a4..b0b8bf95fd 100644
--- a/app/client/src/components/editorComponents/CodeEditor/commandsHelper.ts
+++ b/app/client/src/components/editorComponents/CodeEditor/commandsHelper.ts
@@ -6,7 +6,7 @@ import type {
 import type { CommandsCompletion } from "utils/autocomplete/CodemirrorTernService";
 import { generateQuickCommands } from "./generateQuickCommands";
 import type { Datasource } from "entities/Datasource";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import log from "loglevel";
 import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
 import {
diff --git a/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx b/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx
index 2200ce1a92..5a521275de 100644
--- a/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx
+++ b/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx
@@ -12,7 +12,7 @@ import type { FeatureFlags } from "@appsmith/entities/FeatureFlag";
 import { Button, Icon } from "design-system";
 import { APPSMITH_AI } from "@appsmith/components/editorComponents/GPT/trigger";
 import { DatasourceCreateEntryPoints } from "constants/Datasource";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import BetaCard from "../BetaCard";
 import type { NavigationData } from "selectors/navigationSelectors";
 import type { AIEditorContext } from "@appsmith/components/editorComponents/GPT";
@@ -202,8 +202,8 @@ export const generateQuickCommands = (
         suggestion.type === ENTITY_TYPE.ACTION
           ? `{{${name}.data}}`
           : suggestion.type === ENTITY_TYPE.JSACTION
-          ? `{{${name}.}}`
-          : `{{${name}}}`,
+            ? `{{${name}.}}`
+            : `{{${name}}}`,
       displayText: `${name}`,
       className: "CodeMirror-commands group relative",
       data: suggestion,
diff --git a/app/client/src/components/editorComponents/CodeEditor/index.tsx b/app/client/src/components/editorComponents/CodeEditor/index.tsx
index 9e1a649a2d..d1bcd03655 100644
--- a/app/client/src/components/editorComponents/CodeEditor/index.tsx
+++ b/app/client/src/components/editorComponents/CodeEditor/index.tsx
@@ -37,7 +37,7 @@ import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
 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 AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import "components/editorComponents/CodeEditor/sql/customMimes";
 import "components/editorComponents/CodeEditor/modes";
 import type {
diff --git a/app/client/src/components/editorComponents/Debugger/ActionLink.tsx b/app/client/src/components/editorComponents/Debugger/ActionLink.tsx
index 97e0d0b303..b72838423f 100644
--- a/app/client/src/components/editorComponents/Debugger/ActionLink.tsx
+++ b/app/client/src/components/editorComponents/Debugger/ActionLink.tsx
@@ -4,7 +4,7 @@ import React, { useCallback } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import type { AppState } from "@appsmith/reducers";
 import { getAction } from "@appsmith/selectors/entitiesSelector";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { navigateToEntity } from "actions/editorActions";
 import { DebuggerEntityLink, type EntityLinkProps } from "./DebuggerEntityLink";
 
diff --git a/app/client/src/components/editorComponents/Debugger/ContextualMenu.tsx b/app/client/src/components/editorComponents/Debugger/ContextualMenu.tsx
index 373df1ba1d..0973db9c1e 100644
--- a/app/client/src/components/editorComponents/Debugger/ContextualMenu.tsx
+++ b/app/client/src/components/editorComponents/Debugger/ContextualMenu.tsx
@@ -4,7 +4,7 @@ import type { Dispatch } from "redux";
 import { useDispatch } from "react-redux";
 import type { Message, SourceEntity } from "entities/AppsmithConsole";
 import { PropertyEvaluationErrorType } from "utils/DynamicBindingUtils";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getAppsmithConfigs } from "@appsmith/configs";
 import {
   createMessage,
diff --git a/app/client/src/components/editorComponents/Debugger/DataSourceLink.tsx b/app/client/src/components/editorComponents/Debugger/DataSourceLink.tsx
index 11761a696a..88892999fc 100644
--- a/app/client/src/components/editorComponents/Debugger/DataSourceLink.tsx
+++ b/app/client/src/components/editorComponents/Debugger/DataSourceLink.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { DebuggerEntityLink, type EntityLinkProps } from "./DebuggerEntityLink";
 import { useSelector } from "react-redux";
 import type { AppState } from "@appsmith/reducers";
diff --git a/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx b/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx
index 2a6448a727..6018efdeea 100644
--- a/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx
+++ b/app/client/src/components/editorComponents/Debugger/DebugCTA.tsx
@@ -3,7 +3,7 @@ import styled from "styled-components";
 import { setDebuggerSelectedTab, showDebugger } from "actions/debuggerActions";
 import { useDispatch, useSelector } from "react-redux";
 import { getAppMode } from "@appsmith/selectors/applicationSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getTypographyByKey } from "design-system-old";
 import type { Message } from "entities/AppsmithConsole";
 import ContextualMenu from "./ContextualMenu";
diff --git a/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx b/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx
index aa3f1f161f..e18a565cd7 100644
--- a/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx
+++ b/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx
@@ -21,7 +21,7 @@ import bootIntercom from "utils/bootIntercom";
 import type { Theme } from "constants/DefaultTheme";
 import { thinScrollbar } from "constants/DefaultTheme";
 import type { IconName } from "@blueprintjs/core";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getDebuggerSelectedFilter } from "selectors/debuggerSelectors";
 import { setDebuggerSelectedFilter } from "actions/debuggerActions";
 
diff --git a/app/client/src/components/editorComponents/Debugger/DebuggerTabs.tsx b/app/client/src/components/editorComponents/Debugger/DebuggerTabs.tsx
index 6ecf5f9fb0..4904540189 100644
--- a/app/client/src/components/editorComponents/Debugger/DebuggerTabs.tsx
+++ b/app/client/src/components/editorComponents/Debugger/DebuggerTabs.tsx
@@ -13,7 +13,7 @@ import {
   getErrorCount,
   getResponsePaneHeight,
 } from "selectors/debuggerSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import Errors from "./Errors";
 import Resizer, { ResizerCSS } from "./Resizer";
 import EntityDeps from "./EntityDependecies";
diff --git a/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx b/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx
index ea24274a3b..c5cd690430 100644
--- a/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx
+++ b/app/client/src/components/editorComponents/Debugger/EntityDependecies.tsx
@@ -15,7 +15,7 @@ import {
 } from "@appsmith/constants/messages";
 import { getDependenciesFromInverseDependencies } from "./helpers";
 import { useSelectedEntity, useEntityLink } from "./hooks/debuggerHooks";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { thinScrollbar } from "constants/DefaultTheme";
 import { ENTITY_TYPE } from "@appsmith/entities/AppsmithConsole/utils";
 import { useGetEntityInfo } from "./hooks/useGetEntityInfo";
diff --git a/app/client/src/components/editorComponents/Debugger/ErrorLogs/ErrorLogItem.tsx b/app/client/src/components/editorComponents/Debugger/ErrorLogs/ErrorLogItem.tsx
index aa592b728e..95e5ba1548 100644
--- a/app/client/src/components/editorComponents/Debugger/ErrorLogs/ErrorLogItem.tsx
+++ b/app/client/src/components/editorComponents/Debugger/ErrorLogs/ErrorLogItem.tsx
@@ -11,7 +11,7 @@ import LogAdditionalInfo from "./components/LogAdditionalInfo";
 import LogEntityLink from "./components/LogEntityLink";
 import LogTimeStamp from "./components/LogTimeStamp";
 import { getLogIcon } from "../helpers";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import moment from "moment";
 import LogHelper from "./components/LogHelper";
 import { toggleExpandErrorLogItem } from "actions/debuggerActions";
diff --git a/app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogHelper.tsx b/app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogHelper.tsx
index 8c1f6c9489..471213228b 100644
--- a/app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogHelper.tsx
+++ b/app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogHelper.tsx
@@ -4,7 +4,7 @@ import type { SourceEntity } from "entities/AppsmithConsole";
 import type LOG_TYPE from "entities/AppsmithConsole/logtype";
 import React from "react";
 import styled from "styled-components";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import ContextualMenu from "../../ContextualMenu";
 
 const ContextWrapper = styled.div`
diff --git a/app/client/src/components/editorComponents/Debugger/JSCollectionLink.tsx b/app/client/src/components/editorComponents/Debugger/JSCollectionLink.tsx
index 675a3d7e0a..b7f4d1db44 100644
--- a/app/client/src/components/editorComponents/Debugger/JSCollectionLink.tsx
+++ b/app/client/src/components/editorComponents/Debugger/JSCollectionLink.tsx
@@ -2,7 +2,7 @@ import React, { useDispatch } from "react-redux";
 import { DebuggerEntityLink, type EntityLinkProps } from "./DebuggerEntityLink";
 import { useCallback } from "react";
 import { navigateToEntity } from "actions/editorActions";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { ENTITY_TYPE } from "@appsmith/entities/AppsmithConsole/utils";
 
 export default function JSCollectionLink(props: EntityLinkProps) {
diff --git a/app/client/src/components/editorComponents/Debugger/WidgetLink.tsx b/app/client/src/components/editorComponents/Debugger/WidgetLink.tsx
index 90069d3911..696c2faa0d 100644
--- a/app/client/src/components/editorComponents/Debugger/WidgetLink.tsx
+++ b/app/client/src/components/editorComponents/Debugger/WidgetLink.tsx
@@ -1,7 +1,7 @@
 import { ENTITY_TYPE } from "@appsmith/entities/AppsmithConsole/utils";
 import React, { useCallback } from "react";
 import { useDispatch } from "react-redux";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { navigateToEntity } from "actions/editorActions";
 import { DebuggerEntityLink, type EntityLinkProps } from "./DebuggerEntityLink";
 
diff --git a/app/client/src/components/editorComponents/Debugger/hooks/useDebuggerTriggerClick.ts b/app/client/src/components/editorComponents/Debugger/hooks/useDebuggerTriggerClick.ts
index f186805c33..4136d5c5d6 100644
--- a/app/client/src/components/editorComponents/Debugger/hooks/useDebuggerTriggerClick.ts
+++ b/app/client/src/components/editorComponents/Debugger/hooks/useDebuggerTriggerClick.ts
@@ -1,7 +1,7 @@
 import { useLocation } from "react-router";
 import { DEBUGGER_TAB_KEYS } from "../helpers";
 import { setCanvasDebuggerState } from "actions/debuggerActions";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import type { FocusEntityInfo } from "navigation/FocusEntity";
 import { FocusEntity, identifyEntityFromPath } from "navigation/FocusEntity";
 import { setJsPaneDebuggerState } from "actions/jsPaneActions";
diff --git a/app/client/src/components/editorComponents/EntityBottomTabs.tsx b/app/client/src/components/editorComponents/EntityBottomTabs.tsx
index 28c16a544c..cd6e69463d 100644
--- a/app/client/src/components/editorComponents/EntityBottomTabs.tsx
+++ b/app/client/src/components/editorComponents/EntityBottomTabs.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import type { CollapsibleTabProps } from "design-system-old";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { DEBUGGER_TAB_KEYS } from "./Debugger/helpers";
 import { Tab, TabPanel, Tabs, TabsList } from "design-system";
 import styled from "styled-components";
diff --git a/app/client/src/components/editorComponents/EntityExplorerSidebar.tsx b/app/client/src/components/editorComponents/EntityExplorerSidebar.tsx
index c2bc512f7c..b36633c695 100644
--- a/app/client/src/components/editorComponents/EntityExplorerSidebar.tsx
+++ b/app/client/src/components/editorComponents/EntityExplorerSidebar.tsx
@@ -25,7 +25,7 @@ import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 import { SIDEBAR_ID } from "constants/Explorer";
 import styled from "styled-components";
 import moment from "moment";
-import AnalyticsUtil from "../../utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 const StyledResizer = styled.div<{ resizing: boolean }>`
   ${(props) =>
diff --git a/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx b/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx
index 8003aff778..37b3b6b10f 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx
@@ -5,7 +5,7 @@ import { getTypographyByKey, Text, TextType } from "design-system-old";
 import { Icon } from "design-system";
 import { setGlobalSearchCategory } from "actions/globalSearchActions";
 import { HELPBAR_PLACEHOLDER } from "@appsmith/constants/messages";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { modText } from "utils/helpers";
 import { filterCategories, SEARCH_CATEGORY_ID } from "./utils";
 import { protectedModeSelector } from "selectors/gitSyncSelectors";
diff --git a/app/client/src/components/editorComponents/GlobalSearch/ResultsNotFound.tsx b/app/client/src/components/editorComponents/GlobalSearch/ResultsNotFound.tsx
index 0b8d491a2f..08916c0777 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/ResultsNotFound.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/ResultsNotFound.tsx
@@ -3,7 +3,7 @@ import styled from "styled-components";
 import NoSearchDataImage from "assets/images/no_search_data.png";
 import { NO_SEARCH_DATA_TEXT } from "@appsmith/constants/messages";
 import { getTypographyByKey } from "design-system-old";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { isAirgapped } from "@appsmith/utils/airgapHelpers";
 import { importSvg } from "design-system-old";
 import { DISCORD_URL } from "constants/ThirdPartyConstants";
diff --git a/app/client/src/components/editorComponents/GlobalSearch/SearchModal.tsx b/app/client/src/components/editorComponents/GlobalSearch/SearchModal.tsx
index 829f118fbf..df30d1f9f5 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/SearchModal.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/SearchModal.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import styled from "styled-components";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { ModalBody, ModalContent, Modal } from "design-system";
 
 const StyledDocsSearchModal = styled(ModalContent)`
diff --git a/app/client/src/components/editorComponents/GlobalSearch/index.tsx b/app/client/src/components/editorComponents/GlobalSearch/index.tsx
index 092db01929..59281199cb 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/index.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/index.tsx
@@ -42,7 +42,7 @@ import {
 import { getActionConfig } from "pages/Editor/Explorer/Actions/helpers";
 import type { ExplorerURLParams } from "@appsmith/pages/Editor/Explorer/helpers";
 import { getLastSelectedWidget } from "selectors/ui";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import useRecentEntities from "./useRecentEntities";
 import { noop } from "lodash";
 import {
diff --git a/app/client/src/components/editorComponents/GlobalSearch/utils.tsx b/app/client/src/components/editorComponents/GlobalSearch/utils.tsx
index b56bc41074..b2651f0a63 100644
--- a/app/client/src/components/editorComponents/GlobalSearch/utils.tsx
+++ b/app/client/src/components/editorComponents/GlobalSearch/utils.tsx
@@ -24,7 +24,7 @@ import history from "utils/history";
 import { curlImportPageURL } from "@appsmith/RouteBuilder";
 import { isMacOrIOS, modText, shiftText } from "utils/helpers";
 import { FocusEntity } from "navigation/FocusEntity";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { Icon } from "design-system";
 import type { ActionParentEntityTypeInterface } from "@appsmith/entities/Engine/actionHelpers";
 import {
diff --git a/app/client/src/components/editorComponents/LazyCodeEditor/styles.tsx b/app/client/src/components/editorComponents/LazyCodeEditor/styles.tsx
index e8b431952e..424065706f 100644
--- a/app/client/src/components/editorComponents/LazyCodeEditor/styles.tsx
+++ b/app/client/src/components/editorComponents/LazyCodeEditor/styles.tsx
@@ -40,8 +40,8 @@ export const HighlighedCodeContainer = styled("div")<{
       contentKind === ContentKind.CODE
         ? CodeEditorColors.KEYWORD
         : contentKind === ContentKind.PLACEHOLDER
-        ? "#858282"
-        : "inherit"} !important;
+          ? "#858282"
+          : "inherit"} !important;
   }
 `;
 
@@ -62,8 +62,8 @@ export const ContentWrapper = styled("div")<{
     !!height
       ? height
       : contentKind === ContentKind.PLACEHOLDER
-      ? "36px"
-      : "auto"};
+        ? "36px"
+        : "auto"};
   min-height: 36px;
   border: ${(props) => (props.borderLess ? "none" : "1px solid")};
   border-color: inherit;
diff --git a/app/client/src/components/editorComponents/NavBarItem.tsx b/app/client/src/components/editorComponents/NavBarItem.tsx
index 02923c931b..677fc50c35 100644
--- a/app/client/src/components/editorComponents/NavBarItem.tsx
+++ b/app/client/src/components/editorComponents/NavBarItem.tsx
@@ -3,7 +3,7 @@
 import React from "react";
 import styled from "styled-components";
 import { NavLink } from "react-router-dom";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { Colors } from "constants/Colors";
 
 interface MenuBarItemProps {
diff --git a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/PartialExportModal.test.tsx b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/PartialExportModal.test.tsx
index 9f2efa6599..b55c1b9f09 100644
--- a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/PartialExportModal.test.tsx
+++ b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/PartialExportModal.test.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { render, screen, fireEvent, waitFor } from "@testing-library/react";
 import "@testing-library/jest-dom";
-import PartialExportModal from "./index";
+import { PartialExportModal } from "./index";
 import { lightTheme } from "selectors/themeSelectors";
 import { ThemeProvider } from "styled-components";
 import configureStore from "redux-mock-store";
@@ -29,13 +29,15 @@ describe("<PartialExportModal />", () => {
   let store: any;
 
   beforeEach(() => {
+    defaultAppState.ui.applications.partialImportExport.isExportModalOpen =
+      true;
     store = mockStore(defaultAppState);
   });
 
   const BaseComponentRender = () => (
     <Provider store={store}>
       <ThemeProvider theme={lightTheme}>
-        <PartialExportModal handleModalClose={() => jest.fn()} isModalOpen />
+        <PartialExportModal />
       </ThemeProvider>
     </Provider>
   );
diff --git a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/index.tsx b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/index.tsx
index d4ed147236..22895ff68c 100644
--- a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/index.tsx
+++ b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/index.tsx
@@ -9,7 +9,10 @@ import {
   selectLibrariesForExplorer,
   selectWidgetsForCurrentPage,
 } from "@appsmith/selectors/entitiesSelector";
-import { partialExportWidgets } from "actions/widgetActions";
+import {
+  openPartialExportModal,
+  partialExportWidgets,
+} from "actions/widgetActions";
 import {
   Button,
   Collapsible,
@@ -36,10 +39,6 @@ import JSObjectsNQueriesExport from "./JSObjectsNQueriesExport";
 import { Bar, ScrollableSection } from "./StyledSheet";
 import WidgetsExport from "./WidgetsExport";
 
-interface Props {
-  handleModalClose: () => void;
-  isModalOpen: boolean;
-}
 const selectedParamsInitValue: PartialExportParams = {
   jsObjects: [],
   datasources: [],
@@ -47,7 +46,7 @@ const selectedParamsInitValue: PartialExportParams = {
   widgets: [],
   queries: [],
 };
-const PartiaExportModel = ({ handleModalClose, isModalOpen }: Props) => {
+export const PartialExportModal = () => {
   const [customJsLibraries, setCustomJsLibraries] = useState<JSLibrary[]>([]);
   const dispatch = useDispatch();
   const [selectedParams, setSelectedParams] = useState<PartialExportParams>(
@@ -260,10 +259,21 @@ const PartiaExportModel = ({ handleModalClose, isModalOpen }: Props) => {
         widgets: selectOnlyParentIds(canvasWidgets!, selectedParams.widgets),
       }),
     );
+    setSelectedParams(selectedParamsInitValue);
+  };
+
+  const handleModalClose = (open: boolean) => {
+    if (!open) {
+      dispatch(openPartialExportModal(false));
+      setSelectedParams(selectedParamsInitValue);
+    }
   };
 
   return (
-    <Modal onOpenChange={handleModalClose} open={isModalOpen}>
+    <Modal
+      onOpenChange={handleModalClose}
+      open={partialImportExportLoadingState.isExportModalOpen}
+    >
       <ModalContent>
         <ModalHeader>
           <Text className="title" kind="heading-xl">
@@ -329,5 +339,3 @@ const PartiaExportModel = ({ handleModalClose, isModalOpen }: Props) => {
     </Modal>
   );
 };
-
-export default PartiaExportModel;
diff --git a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts
index 52fd24c045..3ff4b30642 100644
--- a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts
+++ b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts
@@ -11118,8 +11118,10 @@ export const defaultAppState = {
         isFetchingAllUsers: false,
       },
       partialImportExport: {
+        isExportModalOpen: false,
         isExporting: false,
         isExportDone: false,
+        isImportModalOpen: false,
         isImporting: false,
         isImportDone: false,
       },
diff --git a/app/client/src/components/editorComponents/PartialImportExport/PartialImportModal/index.tsx b/app/client/src/components/editorComponents/PartialImportExport/PartialImportModal/index.tsx
index 870328716d..5f3493e46f 100644
--- a/app/client/src/components/editorComponents/PartialImportExport/PartialImportModal/index.tsx
+++ b/app/client/src/components/editorComponents/PartialImportExport/PartialImportModal/index.tsx
@@ -1,4 +1,7 @@
-import { importPartialApplication } from "@appsmith/actions/applicationActions";
+import {
+  importPartialApplication,
+  openPartialImportModal,
+} from "@appsmith/actions/applicationActions";
 import {
   IMPORT_APP_FROM_FILE_MESSAGE,
   IMPORT_APP_FROM_FILE_TITLE,
@@ -130,13 +133,7 @@ const StatusbarWrapper = styled.div`
   }
 `;
 
-interface PartialImportModalProps {
-  isModalOpen?: boolean;
-  onClose?: () => void;
-}
-
-function PartialImportModal(props: PartialImportModalProps) {
-  const { isModalOpen, onClose } = props;
+export function PartialImportModal() {
   const [appFileToBeUploaded, setAppFileToBeUploaded] = useState<{
     file: File;
     setProgress: SetProgress;
@@ -170,11 +167,15 @@ function PartialImportModal(props: PartialImportModalProps) {
     [],
   );
 
+  const handleClose = () => {
+    dispatch(openPartialImportModal(false));
+  };
+
   useEffect(() => {
     // finished of importing application
     if (appFileToBeUploaded && partialImportExportLoadingState.isImportDone) {
       setAppFileToBeUploaded(null);
-      onClose && onClose();
+      handleClose();
     }
   }, [appFileToBeUploaded, partialImportExportLoadingState]);
 
@@ -182,12 +183,15 @@ function PartialImportModal(props: PartialImportModalProps) {
 
   const handleModalClose = (open: boolean) => {
     if (!open) {
-      onClose && onClose();
+      handleClose();
     }
   };
 
   return (
-    <Modal onOpenChange={handleModalClose} open={isModalOpen}>
+    <Modal
+      onOpenChange={handleModalClose}
+      open={partialImportExportLoadingState.isImportModalOpen}
+    >
       <ModalContent
         className={"t--import-application-modal"}
         data-testid="t--partialImportModal"
@@ -246,5 +250,3 @@ function PartialImportModal(props: PartialImportModalProps) {
     </Modal>
   );
 }
-
-export default PartialImportModal;
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/index.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/index.tsx
index 468e77a19f..6f949c5823 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/index.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/index.tsx
@@ -2,7 +2,7 @@ import React, { useContext, useEffect, useMemo } from "react";
 import { useSelector } from "react-redux";
 import { getPluginImages } from "@appsmith/selectors/entitiesSelector";
 import { getisOneClickBindingConnectingForWidget } from "selectors/oneClickBindingSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getWidget } from "sagas/selectors";
 import type { AppState } from "@appsmith/reducers";
 import {
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useConnectToOptions.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useConnectToOptions.tsx
index 9844049330..9a4c2e1826 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useConnectToOptions.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useConnectToOptions.tsx
@@ -9,7 +9,7 @@ import {
 import WidgetFactory from "WidgetProvider/factory";
 import { DatasourceImage, ImageWrapper } from "../../../styles";
 import { getDatatype } from "utils/AppsmithUtils";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import type { DropdownOptionType } from "../../../types";
 import type { WidgetProps } from "widgets/BaseWidget";
 import { WidgetQueryGeneratorFormContext } from "components/editorComponents/WidgetQueryGeneratorForm";
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useDatasourceOptions.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useDatasourceOptions.tsx
index a593b4960f..1c6efda1c7 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useDatasourceOptions.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useSource/useDatasourceOptions.tsx
@@ -18,7 +18,7 @@ import {
   fetchDatasourceStructure,
   fetchGheetSpreadsheets,
 } from "actions/datasourceActions";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { invert } from "lodash";
 import { DatasourceCreateEntryPoints } from "constants/Datasource";
 import { useDispatch, useSelector } from "react-redux";
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 28c4615b24..1cc9cb9fd1 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
@@ -3,7 +3,7 @@ import { Icon } from "design-system";
 import history from "utils/history";
 import { integrationEditorURL } from "@appsmith/RouteBuilder";
 import { INTEGRATION_TABS } from "constants/routes";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { DatasourceCreateEntryPoints } from "constants/Datasource";
 import { useParams } from "react-router";
 import type { ExplorerURLParams } from "@appsmith/pages/Editor/Explorer/helpers";
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/TableOrSpreadsheetDropdown/useTableOrSpreadsheet.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/TableOrSpreadsheetDropdown/useTableOrSpreadsheet.tsx
index 7c312f9c5f..67ea4e2e68 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/TableOrSpreadsheetDropdown/useTableOrSpreadsheet.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/TableOrSpreadsheetDropdown/useTableOrSpreadsheet.tsx
@@ -21,7 +21,7 @@ import type { AppState } from "@appsmith/reducers";
 import { DropdownOption as Option } from "../DatasourceDropdown/DropdownOption";
 import type { DropdownOptionType } from "../../types";
 import { getisOneClickBindingConnectingForWidget } from "selectors/oneClickBindingSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getWidget } from "sagas/selectors";
 import type { DatasourceStructure } from "entities/Datasource";
 
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/ConnectData/useConnectData.ts b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/ConnectData/useConnectData.ts
index a433adf739..171779b7f0 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/ConnectData/useConnectData.ts
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/ConnectData/useConnectData.ts
@@ -3,7 +3,7 @@ import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 import { getWidget } from "sagas/selectors";
 import { getPluginPackageFromDatasourceId } from "@appsmith/selectors/entitiesSelector";
 import { getisOneClickBindingConnectingForWidget } from "selectors/oneClickBindingSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { isValidGsheetConfig } from "../utils";
 import { useContext, useMemo } from "react";
 import { WidgetQueryGeneratorFormContext } from "../index";
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/SheetsDropdown/useSheets.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/SheetsDropdown/useSheets.tsx
index 5683f860a2..628da67078 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/SheetsDropdown/useSheets.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/SheetsDropdown/useSheets.tsx
@@ -12,7 +12,7 @@ import {
 } from "selectors/datasourceSelectors";
 import { getDatasource } from "@appsmith/selectors/entitiesSelector";
 import type { AppState } from "@appsmith/reducers";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getWidget } from "sagas/selectors";
 
 export function useSheets() {
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/useColumnDropdown.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/useColumnDropdown.tsx
index af051218ad..baaaa4b8d2 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/useColumnDropdown.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/useColumnDropdown.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useMemo } from "react";
 import { PluginPackageName } from "entities/Action";
 import { get, isArray } from "lodash";
 import { ALLOWED_SEARCH_DATATYPE } from "pages/Editor/GeneratePage/components/constants";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { DropdownOption as Option } from "../../CommonControls/DatasourceDropdown/DropdownOption";
 import type { DropdownOptionType } from "../../types";
 
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 9ed0b7be41..b81e758cfd 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
@@ -24,7 +24,7 @@ import {
 } from "@appsmith/constants/messages";
 import type { AppState } from "@appsmith/reducers";
 import { getWidget } from "sagas/selectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 export interface OneClickDropdownFieldProps {
   label: string;
diff --git a/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx b/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx
index 670ec522d4..3daa266609 100644
--- a/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx
+++ b/app/client/src/components/editorComponents/form/fields/KeyValueFieldArray.tsx
@@ -223,11 +223,11 @@ function KeyValueRow(props: Props & WrappedFieldArrayProps) {
                         props.placeholder
                           ? `${props.placeholder} ${index + 1}`
                           : props.actionConfig[index].mandatory &&
-                            props.actionConfig[index].type
-                          ? `${props.actionConfig[index].type}`
-                          : props.actionConfig[index].type
-                          ? `${props.actionConfig[index].type} (optional)`
-                          : `(optional)`
+                              props.actionConfig[index].type
+                            ? `${props.actionConfig[index].type}`
+                            : props.actionConfig[index].type
+                              ? `${props.actionConfig[index].type} (optional)`
+                              : `(optional)`
                       }
                       showLightningMenu={
                         props.actionConfig[index].editable ||
diff --git a/app/client/src/components/editorComponents/form/fields/StyledFormComponents.tsx b/app/client/src/components/editorComponents/form/fields/StyledFormComponents.tsx
index 499b579117..ecae65e849 100644
--- a/app/client/src/components/editorComponents/form/fields/StyledFormComponents.tsx
+++ b/app/client/src/components/editorComponents/form/fields/StyledFormComponents.tsx
@@ -109,9 +109,9 @@ const StyledFormLabel = styled.label<{
     props.extraStyles?.minWidth
       ? props.extraStyles?.minWidth
       : props.config?.controlType === "SWITCH" ||
-        props.config?.controlType === "CHECKBOX"
-      ? "auto;"
-      : "270px;"}
+          props.config?.controlType === "CHECKBOX"
+        ? "auto;"
+        : "270px;"}
   font-weight: 400;
   font-size: 14px;
   line-height: 16px;
@@ -120,8 +120,8 @@ const StyledFormLabel = styled.label<{
     props.extraStyles?.marginBottom
       ? props.extraStyles?.marginBottom
       : props.config?.controlType === "CHECKBOX"
-      ? "0;"
-      : "4px;"};
+        ? "0;"
+        : "4px;"};
   &:first-child {
     margin-left: 0;
   }
diff --git a/app/client/src/components/featureWalkthrough/index.tsx b/app/client/src/components/featureWalkthrough/index.tsx
index 9dd792b4a6..6a9cf7abd9 100644
--- a/app/client/src/components/featureWalkthrough/index.tsx
+++ b/app/client/src/components/featureWalkthrough/index.tsx
@@ -5,7 +5,7 @@ import WalkthroughContext from "./walkthroughContext";
 import { createPortal } from "react-dom";
 import { retryPromise } from "utils/AppsmithUtils";
 import { useLocation } from "react-router-dom";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { isElementVisible } from "./utils";
 import { hideIndicator } from "components/utils/Indicator";
 import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
diff --git a/app/client/src/components/featureWalkthrough/walkthroughRenderer.tsx b/app/client/src/components/featureWalkthrough/walkthroughRenderer.tsx
index 7d73a39513..c2151d5f94 100644
--- a/app/client/src/components/featureWalkthrough/walkthroughRenderer.tsx
+++ b/app/client/src/components/featureWalkthrough/walkthroughRenderer.tsx
@@ -10,7 +10,7 @@ import type {
 import WalkthroughContext, {
   isFeatureFooterDetails,
 } from "./walkthroughContext";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { showIndicator } from "components/utils/Indicator";
 
 const CLIPID = "clip__feature";
diff --git a/app/client/src/components/formControls/MultiFilePickerControl.tsx b/app/client/src/components/formControls/MultiFilePickerControl.tsx
index dc2b5fc2c1..a49dc2fd47 100644
--- a/app/client/src/components/formControls/MultiFilePickerControl.tsx
+++ b/app/client/src/components/formControls/MultiFilePickerControl.tsx
@@ -17,7 +17,7 @@ import { get, isArray } from "lodash";
 import { formatFileSize } from "./utils";
 import { getCurrentWorkspaceId } from "@appsmith/selectors/selectedWorkspaceSelectors";
 import { getPlugin } from "@appsmith/selectors/entitiesSelector";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 const HiddenFileInput = styled.input`
   visibility: hidden;
diff --git a/app/client/src/components/propertyControls/ButtonTabControl.tsx b/app/client/src/components/propertyControls/ButtonTabControl.tsx
index 22d1e3be15..fe286ae81d 100644
--- a/app/client/src/components/propertyControls/ButtonTabControl.tsx
+++ b/app/client/src/components/propertyControls/ButtonTabControl.tsx
@@ -50,8 +50,8 @@ class ButtonTabControl extends BaseControl<ButtonTabControlProps> {
     const values: string[] = propertyValue
       ? propertyValue.split(",")
       : defaultValue
-      ? defaultValue.split(",")
-      : [];
+        ? defaultValue.split(",")
+        : [];
 
     if (values.includes(value)) {
       values.splice(values.indexOf(value), 1);
diff --git a/app/client/src/components/propertyControls/ComputeTablePropertyControl.tsx b/app/client/src/components/propertyControls/ComputeTablePropertyControl.tsx
index 8bf0173e93..97b0c5c6e3 100644
--- a/app/client/src/components/propertyControls/ComputeTablePropertyControl.tsx
+++ b/app/client/src/components/propertyControls/ComputeTablePropertyControl.tsx
@@ -110,8 +110,8 @@ class ComputeTablePropertyControl extends BaseControl<ComputeTablePropertyContro
             tableId,
           )
         : propertyValue
-        ? propertyValue
-        : defaultValue;
+          ? propertyValue
+          : defaultValue;
     const evaluatedProperties = this.props.widgetProperties;
 
     const columns: Record<string, ColumnProperties> =
diff --git a/app/client/src/components/propertyControls/CustomWidgetAddEventButtonControl.tsx b/app/client/src/components/propertyControls/CustomWidgetAddEventButtonControl.tsx
index 4a2e880251..6541e68c8d 100644
--- a/app/client/src/components/propertyControls/CustomWidgetAddEventButtonControl.tsx
+++ b/app/client/src/components/propertyControls/CustomWidgetAddEventButtonControl.tsx
@@ -9,7 +9,7 @@ import {
   CUSTOM_WIDGET_FEATURE,
   createMessage,
 } from "@appsmith/constants/messages";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 interface ButtonControlState {
   showInput: boolean;
diff --git a/app/client/src/components/propertyControls/CustomWidgetEditSourceButtonControl.tsx b/app/client/src/components/propertyControls/CustomWidgetEditSourceButtonControl.tsx
index 9d8ae60f0b..504f711be4 100644
--- a/app/client/src/components/propertyControls/CustomWidgetEditSourceButtonControl.tsx
+++ b/app/client/src/components/propertyControls/CustomWidgetEditSourceButtonControl.tsx
@@ -10,7 +10,7 @@ import {
 } from "@appsmith/constants/messages";
 import CustomWidgetBuilderService from "utils/CustomWidgetBuilderService";
 import styled from "styled-components";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { xor } from "lodash";
 
 interface ButtonControlState {
diff --git a/app/client/src/components/propertyControls/DropDownControl.tsx b/app/client/src/components/propertyControls/DropDownControl.tsx
index 9406f5296b..430f839e29 100644
--- a/app/client/src/components/propertyControls/DropDownControl.tsx
+++ b/app/client/src/components/propertyControls/DropDownControl.tsx
@@ -100,8 +100,9 @@ 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/MenuButtonDynamicItemsControl.tsx b/app/client/src/components/propertyControls/MenuButtonDynamicItemsControl.tsx
index b25f54666f..21cd173ddd 100644
--- a/app/client/src/components/propertyControls/MenuButtonDynamicItemsControl.tsx
+++ b/app/client/src/components/propertyControls/MenuButtonDynamicItemsControl.tsx
@@ -121,8 +121,8 @@ class MenuButtonDynamicItemsControl extends BaseControl<MenuButtonDynamicItemsCo
             widgetProperties.primaryColumns,
           )
         : propertyValue
-        ? propertyValue
-        : defaultValue;
+          ? propertyValue
+          : defaultValue;
     let sourceData;
 
     if (widgetType === "TABLE_WIDGET_V2") {
diff --git a/app/client/src/components/propertyControls/TableComputeValue.tsx b/app/client/src/components/propertyControls/TableComputeValue.tsx
index 65bdc42635..086e2d3007 100644
--- a/app/client/src/components/propertyControls/TableComputeValue.tsx
+++ b/app/client/src/components/propertyControls/TableComputeValue.tsx
@@ -119,8 +119,8 @@ class ComputeTablePropertyControlV2 extends BaseControl<ComputeTablePropertyCont
             tableName,
           )
         : propertyValue
-        ? propertyValue
-        : defaultValue;
+          ? propertyValue
+          : defaultValue;
     const evaluatedProperties = this.props.widgetProperties;
 
     const columns: Record<string, ColumnProperties> =
diff --git a/app/client/src/components/propertyControls/WrappedCodeEditorControl.tsx b/app/client/src/components/propertyControls/WrappedCodeEditorControl.tsx
index d521a361d1..69965464cd 100644
--- a/app/client/src/components/propertyControls/WrappedCodeEditorControl.tsx
+++ b/app/client/src/components/propertyControls/WrappedCodeEditorControl.tsx
@@ -101,8 +101,8 @@ class WrappedCodeEditorControl extends BaseControl<WrappedCodeEditorControlProps
       propertyValue && isDynamicValue(propertyValue)
         ? this.getInputComputedValue(propertyValue)
         : propertyValue
-        ? propertyValue
-        : defaultValue;
+          ? propertyValue
+          : defaultValue;
 
     // Load default value in evaluated value
     if (value && !propertyValue) {
diff --git a/app/client/src/constants/DocumentationLinks.ts b/app/client/src/constants/DocumentationLinks.ts
index f2de90e9e6..2f243dba14 100644
--- a/app/client/src/constants/DocumentationLinks.ts
+++ b/app/client/src/constants/DocumentationLinks.ts
@@ -1,4 +1,4 @@
-import AnalyticsUtil from "../utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 export enum DocsLink {
   CAPTURE_DATA = "CAPTURE_DATA",
diff --git a/app/client/src/constants/IconConstants.tsx b/app/client/src/constants/IconConstants.tsx
index 40be6ef047..7aee148801 100644
--- a/app/client/src/constants/IconConstants.tsx
+++ b/app/client/src/constants/IconConstants.tsx
@@ -25,8 +25,8 @@ export const IconWrapper = styled.div<IconProps>`
     props.disabled
       ? "not-allowed"
       : props.onClick
-      ? "pointer"
-      : props.cursor ?? "default"};
+        ? "pointer"
+        : props.cursor ?? "default"};
   opacity: ${(props) => (props.disabled ? 0.5 : 1)};
 
   && svg {
diff --git a/app/client/src/ee/utils/AnalyticsUtil.tsx b/app/client/src/ee/utils/AnalyticsUtil.tsx
new file mode 100644
index 0000000000..46fb527986
--- /dev/null
+++ b/app/client/src/ee/utils/AnalyticsUtil.tsx
@@ -0,0 +1,3 @@
+export * from "ce/utils/AnalyticsUtil";
+import { default as CE_AnalyticsUtil } from "ce/utils/AnalyticsUtil";
+export default CE_AnalyticsUtil;
diff --git a/app/client/src/entities/DataTree/dataTreeWidget.ts b/app/client/src/entities/DataTree/dataTreeWidget.ts
index cfe6484c37..3af966868a 100644
--- a/app/client/src/entities/DataTree/dataTreeWidget.ts
+++ b/app/client/src/entities/DataTree/dataTreeWidget.ts
@@ -88,9 +88,8 @@ export function getSetterConfig(
         }
 
         if (staticConfigSetter.accessor) {
-          modifiedSetterConfig.__setters[
-            setterMethodName
-          ].accessor = `${widget.widgetName}.${staticConfigSetter.accessor}`;
+          modifiedSetterConfig.__setters[setterMethodName].accessor =
+            `${widget.widgetName}.${staticConfigSetter.accessor}`;
         }
       }
     }
diff --git a/app/client/src/entities/Engine/AppEditorEngine.ts b/app/client/src/entities/Engine/AppEditorEngine.ts
index 9e16000bee..092f856a2c 100644
--- a/app/client/src/entities/Engine/AppEditorEngine.ts
+++ b/app/client/src/entities/Engine/AppEditorEngine.ts
@@ -32,7 +32,7 @@ import {
 } from "sagas/InitSagas";
 import { getCurrentApplication } from "selectors/editorSelectors";
 import { getCurrentGitBranch } from "selectors/gitSyncSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import history from "utils/history";
 import PerformanceTracker, {
   PerformanceTransactionName,
diff --git a/app/client/src/layoutSystems/anvil/editor/canvasArenas/hooks/useAnvilDnDStates.ts b/app/client/src/layoutSystems/anvil/editor/canvasArenas/hooks/useAnvilDnDStates.ts
index 7532167750..4b221107da 100644
--- a/app/client/src/layoutSystems/anvil/editor/canvasArenas/hooks/useAnvilDnDStates.ts
+++ b/app/client/src/layoutSystems/anvil/editor/canvasArenas/hooks/useAnvilDnDStates.ts
@@ -134,8 +134,8 @@ export const useAnvilDnDStates = ({
   const draggedOn = isMainCanvas
     ? AnvilDropTargetTypesEnum.MAIN_CANVAS
     : isSection
-    ? AnvilDropTargetTypesEnum.SECTION
-    : AnvilDropTargetTypesEnum.ZONE;
+      ? AnvilDropTargetTypesEnum.SECTION
+      : AnvilDropTargetTypesEnum.ZONE;
 
   return {
     activateOverlayWidgetDrop,
diff --git a/app/client/src/layoutSystems/anvil/editor/canvasArenas/hooks/utils.ts b/app/client/src/layoutSystems/anvil/editor/canvasArenas/hooks/utils.ts
index 44241bb1fb..69328834ce 100644
--- a/app/client/src/layoutSystems/anvil/editor/canvasArenas/hooks/utils.ts
+++ b/app/client/src/layoutSystems/anvil/editor/canvasArenas/hooks/utils.ts
@@ -57,10 +57,10 @@ export const getDraggedWidgetTypes = (draggedBlocks: DraggedWidget[]) => {
     extractWidgetTypesDragged.length > 1
       ? AnvilDraggedWidgetTypesEnum.WIDGETS
       : extractWidgetTypesDragged[0] === anvilWidgets.ZONE_WIDGET
-      ? AnvilDraggedWidgetTypesEnum.ZONE
-      : extractWidgetTypesDragged[0] === anvilWidgets.SECTION_WIDGET
-      ? AnvilDraggedWidgetTypesEnum.SECTION
-      : AnvilDraggedWidgetTypesEnum.WIDGETS;
+        ? AnvilDraggedWidgetTypesEnum.ZONE
+        : extractWidgetTypesDragged[0] === anvilWidgets.SECTION_WIDGET
+          ? AnvilDraggedWidgetTypesEnum.SECTION
+          : AnvilDraggedWidgetTypesEnum.WIDGETS;
 
   // Returning the final dragged widget type
   return draggedWidgetTypes;
diff --git a/app/client/src/layoutSystems/anvil/sectionSpaceDistributor/utils/spaceRedistributionSagaUtils.ts b/app/client/src/layoutSystems/anvil/sectionSpaceDistributor/utils/spaceRedistributionSagaUtils.ts
index 0ca307f957..a30d04f446 100644
--- a/app/client/src/layoutSystems/anvil/sectionSpaceDistributor/utils/spaceRedistributionSagaUtils.ts
+++ b/app/client/src/layoutSystems/anvil/sectionSpaceDistributor/utils/spaceRedistributionSagaUtils.ts
@@ -497,8 +497,8 @@ function adjustZoneSpaces(
             LARGE_SMALL_ZONE_SHRINK_THRESHOLD * spaceDistributedArray[i],
           )
         : index === i
-        ? currentZoneShrinkLimit
-        : minColumnWidth;
+          ? currentZoneShrinkLimit
+          : minColumnWidth;
 
     const adjustedSpace = Math.max(
       Math.round(newlyAdjustedValues[i]),
diff --git a/app/client/src/layoutSystems/anvil/utils/paste/utils.ts b/app/client/src/layoutSystems/anvil/utils/paste/utils.ts
index 522c6eed03..dfeaa4278e 100644
--- a/app/client/src/layoutSystems/anvil/utils/paste/utils.ts
+++ b/app/client/src/layoutSystems/anvil/utils/paste/utils.ts
@@ -5,7 +5,7 @@ import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidg
 import { select } from "redux-saga/effects";
 import { getNextWidgetName } from "sagas/WidgetOperationUtils";
 import { getDataTree } from "selectors/dataTreeSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { generateReactKey } from "utils/generators";
 import type { CopiedWidgetData } from "./types";
 import type { LayoutProps, WidgetLayoutProps } from "../anvilTypes";
diff --git a/app/client/src/layoutSystems/autolayout/utils/highlightUtils.ts b/app/client/src/layoutSystems/autolayout/utils/highlightUtils.ts
index 711add0c10..13a1efd8c0 100644
--- a/app/client/src/layoutSystems/autolayout/utils/highlightUtils.ts
+++ b/app/client/src/layoutSystems/autolayout/utils/highlightUtils.ts
@@ -257,8 +257,8 @@ export function generateVerticalHighlights(data: {
             item.alignment === FlexLayerAlignment.Start
               ? childCount
               : item.alignment === FlexLayerAlignment.Center
-              ? childCount + startChildren.length
-              : childCount + startChildren.length + centerChildren.length,
+                ? childCount + startChildren.length
+                : childCount + startChildren.length + centerChildren.length,
           layerIndex,
           alignment: item.alignment,
           maxHeight,
diff --git a/app/client/src/layoutSystems/common/dropTarget/starterBuildingBlocks/StarterBuildingBlocks.test.tsx b/app/client/src/layoutSystems/common/dropTarget/starterBuildingBlocks/StarterBuildingBlocks.test.tsx
index 096f9a7fb9..8ed160f717 100644
--- a/app/client/src/layoutSystems/common/dropTarget/starterBuildingBlocks/StarterBuildingBlocks.test.tsx
+++ b/app/client/src/layoutSystems/common/dropTarget/starterBuildingBlocks/StarterBuildingBlocks.test.tsx
@@ -19,7 +19,7 @@ jest.mock("actions/templateActions", () => ({
   importStarterBuildingBlockIntoApplication: jest.fn(),
   showTemplatesModal: jest.fn(),
 }));
-jest.mock("utils/AnalyticsUtil", () => ({
+jest.mock("@appsmith/utils/AnalyticsUtil", () => ({
   logEvent: jest.fn(),
 }));
 
diff --git a/app/client/src/layoutSystems/common/dropTarget/starterBuildingBlocks/index.tsx b/app/client/src/layoutSystems/common/dropTarget/starterBuildingBlocks/index.tsx
index d4ed73c3d4..5f64495d59 100644
--- a/app/client/src/layoutSystems/common/dropTarget/starterBuildingBlocks/index.tsx
+++ b/app/client/src/layoutSystems/common/dropTarget/starterBuildingBlocks/index.tsx
@@ -23,7 +23,7 @@ import {
   getCurrentApplicationId,
 } from "selectors/editorSelectors";
 import { isImportingStarterBuildingBlockToAppSelector } from "selectors/templatesSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import {
   IconContainer,
   TemplateLayoutContainer,
diff --git a/app/client/src/layoutSystems/common/resizer/ModalResizableLayer.tsx b/app/client/src/layoutSystems/common/resizer/ModalResizableLayer.tsx
index ad5b71af17..70826d2c76 100644
--- a/app/client/src/layoutSystems/common/resizer/ModalResizableLayer.tsx
+++ b/app/client/src/layoutSystems/common/resizer/ModalResizableLayer.tsx
@@ -2,7 +2,7 @@ import React, { useContext, useMemo } from "react";
 import type { ReactNode } from "react";
 import { get, omit } from "lodash";
 import type { BaseWidgetProps } from "widgets/BaseWidgetHOC/withBaseWidgetHOC";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { useWidgetDragResize } from "utils/hooks/dragResizeHooks";
 import { useSelector } from "react-redux";
 import type { AppState } from "@appsmith/reducers";
diff --git a/app/client/src/layoutSystems/common/resizer/ResizableComponent.tsx b/app/client/src/layoutSystems/common/resizer/ResizableComponent.tsx
index 98571639de..86904b9d85 100644
--- a/app/client/src/layoutSystems/common/resizer/ResizableComponent.tsx
+++ b/app/client/src/layoutSystems/common/resizer/ResizableComponent.tsx
@@ -28,7 +28,7 @@ import {
   isMultiSelectedWidget,
   isWidgetSelected,
 } from "selectors/widgetSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { ResponsiveBehavior } from "layoutSystems/common/utils/constants";
 import {
   getWidgetHeight,
diff --git a/app/client/src/layoutSystems/common/widgetName/index.tsx b/app/client/src/layoutSystems/common/widgetName/index.tsx
index 0b17fac744..0cc82b228a 100644
--- a/app/client/src/layoutSystems/common/widgetName/index.tsx
+++ b/app/client/src/layoutSystems/common/widgetName/index.tsx
@@ -14,7 +14,7 @@ import {
 } from "selectors/editorSelectors";
 import { getIsTableFilterPaneVisible } from "selectors/tableFilterSelectors";
 import styled from "styled-components";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import PerformanceTracker, {
   PerformanceTransactionName,
 } from "utils/PerformanceTracker";
diff --git a/app/client/src/layoutSystems/fixedlayout/common/autoHeight/AutoHeightOverlayLayer.tsx b/app/client/src/layoutSystems/fixedlayout/common/autoHeight/AutoHeightOverlayLayer.tsx
index 293c86bada..d923f934fd 100644
--- a/app/client/src/layoutSystems/fixedlayout/common/autoHeight/AutoHeightOverlayLayer.tsx
+++ b/app/client/src/layoutSystems/fixedlayout/common/autoHeight/AutoHeightOverlayLayer.tsx
@@ -3,7 +3,7 @@ import AutoHeightOverlayContainer from "layoutSystems/fixedlayout/common/autoHei
 import { EditorContext } from "components/editorComponents/EditorContextProvider";
 import { GridDefaults } from "constants/WidgetConstants";
 import React, { useContext } from "react";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import type { BaseWidgetProps } from "widgets/BaseWidgetHOC/withBaseWidgetHOC";
 import {
   getWidgetMaxAutoHeight,
diff --git a/app/client/src/layoutSystems/fixedlayout/common/widgetGrouping/WidgetsMultiSelectBox.tsx b/app/client/src/layoutSystems/fixedlayout/common/widgetGrouping/WidgetsMultiSelectBox.tsx
index 155df1f7b1..5bf247c84f 100644
--- a/app/client/src/layoutSystems/fixedlayout/common/widgetGrouping/WidgetsMultiSelectBox.tsx
+++ b/app/client/src/layoutSystems/fixedlayout/common/widgetGrouping/WidgetsMultiSelectBox.tsx
@@ -230,8 +230,10 @@ 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/fixedlayout/editor/FixedLayoutCanvasArenas/CanvasSelectionArena.tsx b/app/client/src/layoutSystems/fixedlayout/editor/FixedLayoutCanvasArenas/CanvasSelectionArena.tsx
index 3bb3653d1f..f3b64d31b3 100644
--- a/app/client/src/layoutSystems/fixedlayout/editor/FixedLayoutCanvasArenas/CanvasSelectionArena.tsx
+++ b/app/client/src/layoutSystems/fixedlayout/editor/FixedLayoutCanvasArenas/CanvasSelectionArena.tsx
@@ -310,13 +310,13 @@ export function CanvasSelectionArena({
           startPositions.left = xInRange
             ? startPoints.x - left
             : outOfMinBounds.x
-            ? width - bufferFromBoundary
-            : bufferFromBoundary;
+              ? width - bufferFromBoundary
+              : bufferFromBoundary;
           startPositions.top = yInRange
             ? startPoints.y - top
             : outOfMinBounds.y
-            ? height - bufferFromBoundary
-            : bufferFromBoundary;
+              ? height - bufferFromBoundary
+              : bufferFromBoundary;
         }
         return startPositions;
       };
diff --git a/app/client/src/layoutSystems/fixedlayout/editor/FixedLayoutCanvasArenas/hooks/useBlocksToBeDraggedOnCanvas.ts b/app/client/src/layoutSystems/fixedlayout/editor/FixedLayoutCanvasArenas/hooks/useBlocksToBeDraggedOnCanvas.ts
index d84d375e4f..3ff1def523 100644
--- a/app/client/src/layoutSystems/fixedlayout/editor/FixedLayoutCanvasArenas/hooks/useBlocksToBeDraggedOnCanvas.ts
+++ b/app/client/src/layoutSystems/fixedlayout/editor/FixedLayoutCanvasArenas/hooks/useBlocksToBeDraggedOnCanvas.ts
@@ -19,7 +19,7 @@ import { useDispatch, useSelector } from "react-redux";
 import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 import { EditorContext } from "components/editorComponents/EditorContextProvider";
 import { useWidgetSelection } from "utils/hooks/useWidgetSelection";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { snapToGrid } from "utils/helpers";
 import { stopReflowAction } from "actions/reflowActions";
 import type { DragDetails } from "reducers/uiReducers/dragResizeReducer";
diff --git a/app/client/src/pages/AdminSettings/Authentication/AuthPage.tsx b/app/client/src/pages/AdminSettings/Authentication/AuthPage.tsx
index 2506379e76..8262557bbc 100644
--- a/app/client/src/pages/AdminSettings/Authentication/AuthPage.tsx
+++ b/app/client/src/pages/AdminSettings/Authentication/AuthPage.tsx
@@ -13,7 +13,7 @@ import {
 } from "@appsmith/constants/messages";
 import { Button, Callout, Divider, Icon, Text, Tooltip } from "design-system";
 import { adminSettingsCategoryUrl } from "@appsmith/RouteBuilder";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import useOnUpgrade from "utils/hooks/useOnUpgrade";
 import { RampFeature, RampSection } from "utils/ProductRamps/RampsControlList";
 import EnterpriseTag from "components/EnterpriseTag";
@@ -149,8 +149,8 @@ export function ActionButton({ method }: { method: AuthMethodType }) {
           method.isConnected
             ? EDIT
             : !method?.isFeatureEnabled
-            ? UPGRADE
-            : ENABLE,
+              ? UPGRADE
+              : ENABLE,
         )}
       </Button>
     </ButtonWrapper>
diff --git a/app/client/src/pages/AdminSettings/Branding/SettingsForm.tsx b/app/client/src/pages/AdminSettings/Branding/SettingsForm.tsx
index 6128a4e31c..46d520f935 100644
--- a/app/client/src/pages/AdminSettings/Branding/SettingsForm.tsx
+++ b/app/client/src/pages/AdminSettings/Branding/SettingsForm.tsx
@@ -26,7 +26,7 @@ import { ColorInput } from "pages/AdminSettings/FormGroup/ColorInput";
 import { ImageInput } from "pages/AdminSettings/FormGroup/ImageInput";
 import { logoImageValidator, faivconImageValidator } from "utils/BrandingUtils";
 import { useBrandingForm } from "@appsmith/pages/AdminSettings/Branding/useBrandingForm";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import styled from "styled-components";
 import { HelperText } from "pages/AdminSettings/components";
 
diff --git a/app/client/src/pages/AdminSettings/FormGroup/CopyUrlForm.tsx b/app/client/src/pages/AdminSettings/FormGroup/CopyUrlForm.tsx
index 7a9cebe56b..0aee861f10 100644
--- a/app/client/src/pages/AdminSettings/FormGroup/CopyUrlForm.tsx
+++ b/app/client/src/pages/AdminSettings/FormGroup/CopyUrlForm.tsx
@@ -1,7 +1,7 @@
 import React, { useMemo } from "react";
 import styled from "styled-components";
 import copy from "copy-to-clipboard";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { Icon, Input, Text, toast, Tooltip } from "design-system";
 
 export const BodyContainer = styled.div`
diff --git a/app/client/src/pages/AdminSettings/LeftPane.tsx b/app/client/src/pages/AdminSettings/LeftPane.tsx
index bf5e495694..fe901f7746 100644
--- a/app/client/src/pages/AdminSettings/LeftPane.tsx
+++ b/app/client/src/pages/AdminSettings/LeftPane.tsx
@@ -7,7 +7,7 @@ import {
 } from "@appsmith/pages/AdminSettings/config/types";
 import { adminSettingsCategoryUrl } from "@appsmith/RouteBuilder";
 import { useParams } from "react-router";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { Link, Text } from "design-system";
 import { useDispatch, useSelector } from "react-redux";
 import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
diff --git a/app/client/src/pages/AdminSettings/SettingsForm.tsx b/app/client/src/pages/AdminSettings/SettingsForm.tsx
index f224afe58f..550fa776c5 100644
--- a/app/client/src/pages/AdminSettings/SettingsForm.tsx
+++ b/app/client/src/pages/AdminSettings/SettingsForm.tsx
@@ -33,7 +33,7 @@ import {
   isTenantConfig,
   saveAllowed,
 } from "@appsmith/utils/adminSettingsHelpers";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import {
   Wrapper,
   BottomSpace,
diff --git a/app/client/src/pages/AppViewer/AppPage.tsx b/app/client/src/pages/AppViewer/AppPage.tsx
index 7771618103..5bcf6874e4 100644
--- a/app/client/src/pages/AppViewer/AppPage.tsx
+++ b/app/client/src/pages/AppViewer/AppPage.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useMemo } from "react";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { useDynamicAppLayout } from "utils/hooks/useDynamicAppLayout";
 import type { CanvasWidgetStructure } from "WidgetProvider/constants";
 import { useSelector } from "react-redux";
diff --git a/app/client/src/pages/AppViewer/Navigation/index.tsx b/app/client/src/pages/AppViewer/Navigation/index.tsx
index 7baa04f897..1abfc39264 100644
--- a/app/client/src/pages/AppViewer/Navigation/index.tsx
+++ b/app/client/src/pages/AppViewer/Navigation/index.tsx
@@ -23,7 +23,7 @@ import Sidebar from "./Sidebar";
 import { getCurrentApplication } from "@appsmith/selectors/applicationSelectors";
 import { useIsMobileDevice } from "utils/hooks/useDeviceDetect";
 import { setAppViewHeaderHeight } from "actions/appViewActions";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 export function Navigation() {
   const { search } = useLocation();
diff --git a/app/client/src/pages/AppViewer/SideNavItem.tsx b/app/client/src/pages/AppViewer/SideNavItem.tsx
index c880bdc17a..9f18de0862 100644
--- a/app/client/src/pages/AppViewer/SideNavItem.tsx
+++ b/app/client/src/pages/AppViewer/SideNavItem.tsx
@@ -3,7 +3,7 @@ import React from "react";
 import styled from "styled-components";
 import { NavLink, useRouteMatch } from "react-router-dom";
 import { MenuItem, Classes } from "@blueprintjs/core";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 const Content = styled.div<{ collapsed: boolean }>`
   display: flex;
diff --git a/app/client/src/pages/Applications/ForkApplicationModal.tsx b/app/client/src/pages/Applications/ForkApplicationModal.tsx
index 345ec5c650..9483795e37 100644
--- a/app/client/src/pages/Applications/ForkApplicationModal.tsx
+++ b/app/client/src/pages/Applications/ForkApplicationModal.tsx
@@ -109,8 +109,8 @@ function ForkApplicationModal(props: ForkApplicationModalProps) {
   const modalHeading = isFetchingApplications
     ? createMessage(FORK_APP_MODAL_LOADING_TITLE)
     : !workspaceList.length
-    ? createMessage(FORK_APP_MODAL_EMPTY_TITLE)
-    : createMessage(FORK_APP_MODAL_SUCCESS_TITLE);
+      ? createMessage(FORK_APP_MODAL_EMPTY_TITLE)
+      : createMessage(FORK_APP_MODAL_SUCCESS_TITLE);
 
   const getApplicationsListAndOpenModal = () => {
     !workspaceList.length &&
diff --git a/app/client/src/pages/Applications/loader.tsx b/app/client/src/pages/Applications/loader.tsx
index 7401d62374..9a311c07a5 100644
--- a/app/client/src/pages/Applications/loader.tsx
+++ b/app/client/src/pages/Applications/loader.tsx
@@ -4,7 +4,7 @@ import { retryPromise } from "utils/AppsmithUtils";
 import PerformanceTracker, {
   PerformanceTransactionName,
 } from "utils/PerformanceTracker";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { connect } from "react-redux";
 import { showDebugger } from "actions/debuggerActions";
 
diff --git a/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx b/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx
index b5a0704fee..732b343e38 100644
--- a/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx
+++ b/app/client/src/pages/Editor/APIEditor/CommonEditorForm.tsx
@@ -670,8 +670,8 @@ function CommonEditorForm(props: CommonFormPropsWithExtraParams) {
                             tab == "HEADERS"
                               ? headersCount
                               : tab == "PARAMS"
-                              ? paramsCount
-                              : undefined
+                                ? paramsCount
+                                : undefined
                           }
                           value={tab}
                         >
diff --git a/app/client/src/pages/Editor/APIEditor/index.tsx b/app/client/src/pages/Editor/APIEditor/index.tsx
index 430b2c28c1..16b85945bf 100644
--- a/app/client/src/pages/Editor/APIEditor/index.tsx
+++ b/app/client/src/pages/Editor/APIEditor/index.tsx
@@ -9,7 +9,7 @@ import {
   getPlugins,
 } from "@appsmith/selectors/entitiesSelector";
 import { deleteAction, runAction } from "actions/pluginActionActions";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import Editor from "./Editor";
 import BackToCanvas from "components/common/BackToCanvas";
 import MoreActionsMenu from "../Explorer/Actions/MoreActionsMenu";
diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/index.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/index.tsx
index 5a0591087f..a3a73e7f85 100644
--- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/index.tsx
+++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/EmbedSettings/index.tsx
@@ -19,7 +19,7 @@ import {
   PERMISSION_TYPE,
 } from "@appsmith/utils/permissionHelpers";
 import MakeApplicationForkable from "./MakeApplicationForkable";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
 import { getEmbedSnippetTab } from "@appsmith/utils/BusinessFeatures/privateEmbedHelpers";
diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/utils.ts b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/utils.ts
index 63f3007630..f49800737c 100644
--- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/utils.ts
+++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/NavigationSettings/utils.ts
@@ -3,7 +3,7 @@ import type {
   StringsFromNavigationSetting,
 } from "constants/AppConstants";
 import { keysOfNavigationSetting } from "constants/AppConstants";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import {
   APP_NAVIGATION_SETTING,
   createMessage,
diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/PageSettings.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/PageSettings.tsx
index f17c5bc473..cb1bfcad44 100644
--- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/PageSettings.tsx
+++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/PageSettings.tsx
@@ -33,7 +33,7 @@ import TextLoaderIcon from "../Components/TextLoaderIcon";
 import { filterAccentedAndSpecialCharacters, getUrlPreview } from "../Utils";
 import type { AppState } from "@appsmith/reducers";
 import { getUsedActionNames } from "selectors/actionSelectors";
-import { isNameValid, resolveAsSpaceChar } from "utils/helpers";
+import { isNameValid, toValidPageName } from "utils/helpers";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
 import { getHasManagePagePermission } from "@appsmith/utils/BusinessFeatures/permissionPageHelpers";
@@ -169,7 +169,7 @@ function PageSettings(props: { page: Page }) {
     }
 
     setIsPageNameValid(isValid);
-    setPageName(resolveAsSpaceChar(value, 30));
+    setPageName(toValidPageName(value));
   };
 
   const onPageSlugChange = (value: string) => {
diff --git a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/index.tsx b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/index.tsx
index 9983c7bc82..6174af0947 100644
--- a/app/client/src/pages/Editor/AppSettingsPane/AppSettings/index.tsx
+++ b/app/client/src/pages/Editor/AppSettingsPane/AppSettings/index.tsx
@@ -29,7 +29,7 @@ import { Colors } from "constants/Colors";
 import EmbedSettings from "./EmbedSettings";
 import NavigationSettings from "./NavigationSettings";
 import { updateAppSettingsPaneSelectedTabAction } from "actions/appSettingsPaneActions";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { Divider } from "design-system";
 import { ImportAppSettings } from "./ImportAppSettings";
 import BetaCard from "components/editorComponents/BetaCard";
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 70ba1d87a1..15c0c17879 100644
--- a/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/CommunityTemplateForm.tsx
+++ b/app/client/src/pages/Editor/CommunityTemplates/Modals/PublishCommunityTemplate/CommunityTemplateForm.tsx
@@ -8,7 +8,7 @@ import React, { useEffect, useMemo, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import { getCurrentApplication } from "selectors/editorSelectors";
 import { getCurrentUser } from "selectors/usersSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import {
   PublishPageAppSettingContainer,
   PublishPageBodyContainer,
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/CodeTemplates/index.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/CodeTemplates/index.tsx
index 8d7e0b22c5..d5ae0f46da 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/CodeTemplates/index.tsx
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/CodeTemplates/index.tsx
@@ -22,7 +22,7 @@ import {
   CUSTOM_WIDGET_FEATURE,
   createMessage,
 } from "@appsmith/constants/messages";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 const StyledButton = styled(Button)`
   height: 32px !important;
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/layoutControls.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/layoutControls.tsx
index 92838e7d8b..96ba040b8e 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/layoutControls.tsx
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/layoutControls.tsx
@@ -7,7 +7,7 @@ import {
   CUSTOM_WIDGET_FEATURE,
   createMessage,
 } from "@appsmith/constants/messages";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 const StyledSegmentedControl = styled(SegmentedControl)`
   & .ads-v2-icon {
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/referenceTrigger.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/referenceTrigger.tsx
index 000b87c214..7bf196094b 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/referenceTrigger.tsx
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/Header/referenceTrigger.tsx
@@ -6,7 +6,7 @@ import {
   CUSTOM_WIDGET_FEATURE,
   createMessage,
 } from "@appsmith/constants/messages";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 export default function ReferenceTrigger() {
   const { isReferenceOpen, toggleReference, widgetId } = useContext(
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/events.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/events.tsx
index 8cbe5d6332..0dd95f6999 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/events.tsx
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/References/events.tsx
@@ -14,7 +14,7 @@ import {
   CUSTOM_WIDGET_FEATURE,
   createMessage,
 } from "@appsmith/constants/messages";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 const StyledLazyCodeEditorWrapper = styled.div`
   .CodeMirror-line.CodeMirror-line {
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/index.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/index.tsx
index 97d582351d..9df1c99b24 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/index.tsx
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Preview/Debugger/index.tsx
@@ -11,7 +11,7 @@ import {
   CUSTOM_WIDGET_FEATURE,
   createMessage,
 } from "@appsmith/constants/messages";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 const LOCAL_STORAGE_KEYS_IS_DEBUGGER_OPEN =
   "custom-widget-builder-context-state-is-debugger-open";
diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/useCustomBuilder.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/useCustomBuilder.tsx
index 1ea085b46a..65491c111d 100644
--- a/app/client/src/pages/Editor/CustomWidgetBuilder/useCustomBuilder.tsx
+++ b/app/client/src/pages/Editor/CustomWidgetBuilder/useCustomBuilder.tsx
@@ -16,7 +16,7 @@ import {
   type CustomWidgetBuilderContextType,
 } from "./types";
 import { compileSrcDoc } from "./utility";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 let connectionTimeout: number;
 
diff --git a/app/client/src/pages/Editor/DataSourceEditor/BackButton.tsx b/app/client/src/pages/Editor/DataSourceEditor/BackButton.tsx
index 851ac0ac48..3855f2d644 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/BackButton.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/BackButton.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import styled from "styled-components";
 import { getIsGeneratePageInitiator } from "utils/GenerateCrudUtil";
 import { builderURL, generateTemplateFormURL } from "@appsmith/RouteBuilder";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { useSelector } from "react-redux";
 import { getCurrentPageId } from "selectors/editorSelectors";
 import { Link } from "design-system";
diff --git a/app/client/src/pages/Editor/DataSourceEditor/DSFormHeader.tsx b/app/client/src/pages/Editor/DataSourceEditor/DSFormHeader.tsx
index 3892634ca4..a0c5f6aa90 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/DSFormHeader.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/DSFormHeader.tsx
@@ -10,7 +10,7 @@ import {
   EDIT,
   createMessage,
 } from "@appsmith/constants/messages";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { useDispatch, useSelector } from "react-redux";
 import { deleteDatasource } from "actions/datasourceActions";
 import { debounce } from "lodash";
@@ -145,8 +145,8 @@ export const DSFormHeader = (props: DSFormHeaderProps) => {
         {isDeleting
           ? createMessage(CONFIRM_CONTEXT_DELETING)
           : confirmDelete
-          ? createMessage(CONFIRM_CONTEXT_DELETE)
-          : createMessage(CONTEXT_DELETE)}
+            ? createMessage(CONFIRM_CONTEXT_DELETE)
+            : createMessage(CONTEXT_DELETE)}
       </MenuItem>,
     ];
   };
diff --git a/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx b/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
index 58246322cb..017778aa2b 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
@@ -4,7 +4,7 @@ import { DATASOURCE_REST_API_FORM } from "@appsmith/constants/forms";
 import type { Datasource } from "entities/Datasource";
 import type { InjectedFormProps } from "redux-form";
 import { getFormMeta, reduxForm } from "redux-form";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import FormControl from "pages/Editor/FormControl";
 import { StyledInfo } from "components/formControls/InputTextControl";
 import { connect } from "react-redux";
diff --git a/app/client/src/pages/Editor/DataSourceEditor/hooks.ts b/app/client/src/pages/Editor/DataSourceEditor/hooks.ts
index c56d86da81..0fb97c8752 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/hooks.ts
+++ b/app/client/src/pages/Editor/DataSourceEditor/hooks.ts
@@ -1,7 +1,7 @@
 import { executeDatasourceQuery } from "actions/datasourceActions";
 import type { Datasource, QueryTemplate } from "entities/Datasource";
 import { useCallback, useState } from "react";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { useDispatch, useSelector } from "react-redux";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { PluginName } from "entities/Action";
diff --git a/app/client/src/pages/Editor/DataSourceEditor/index.tsx b/app/client/src/pages/Editor/DataSourceEditor/index.tsx
index 83479fc539..8115be6413 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/index.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/index.tsx
@@ -92,7 +92,7 @@ import type { CalloutKind } from "design-system";
 import type { FeatureFlags } from "@appsmith/entities/FeatureFlag";
 
 import { selectFeatureFlags } from "@appsmith/selectors/featureFlagsSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { setCurrentEditingEnvironmentID } from "@appsmith/actions/environmentAction";
 import { getCurrentEnvironmentDetails } from "@appsmith/selectors/environmentSelectors";
 import { isGACEnabled } from "@appsmith/utils/planHelpers";
diff --git a/app/client/src/pages/Editor/DatasourceInfo/DatasourceEntity.tsx b/app/client/src/pages/Editor/DatasourceInfo/DatasourceEntity.tsx
index cc70e8f931..8c2ad916c3 100644
--- a/app/client/src/pages/Editor/DatasourceInfo/DatasourceEntity.tsx
+++ b/app/client/src/pages/Editor/DatasourceInfo/DatasourceEntity.tsx
@@ -15,7 +15,7 @@ import {
   datasourcesEditorIdURL,
   saasEditorDatasourceIdURL,
 } from "@appsmith/RouteBuilder";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { useLocation } from "react-router";
 import omit from "lodash/omit";
 import { getQueryParams } from "utils/URLUtils";
diff --git a/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructure.tsx b/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructure.tsx
index 057d4d7b00..1132b4ed70 100644
--- a/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructure.tsx
+++ b/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructure.tsx
@@ -13,7 +13,7 @@ import { getPagePermissions } from "selectors/editorSelectors";
 import { Menu, MenuTrigger, Button, Tooltip, MenuContent } from "design-system";
 import { SHOW_TEMPLATES, createMessage } from "@appsmith/constants/messages";
 import styled from "styled-components";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import type { Plugin } from "api/PluginApi";
 import { omit } from "lodash";
 import { Virtuoso } from "react-virtuoso";
diff --git a/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureContainer.tsx b/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureContainer.tsx
index e8cca7337c..67de9f4500 100644
--- a/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureContainer.tsx
+++ b/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureContainer.tsx
@@ -15,7 +15,7 @@ import { useDispatch, useSelector } from "react-redux";
 import type { AppState } from "@appsmith/reducers";
 import ItemLoadingIndicator from "./ItemLoadingIndicator";
 import DatasourceStructureNotFound from "./DatasourceStructureNotFound";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { PluginName } from "entities/Action";
 import { DatasourceStructureSearchContainer } from "./SchemaViewModeCSS";
 import { refreshDatasourceStructure } from "actions/datasourceActions";
diff --git a/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureNotFound.tsx b/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureNotFound.tsx
index 7244cf92dc..dbc59c0565 100644
--- a/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureNotFound.tsx
+++ b/app/client/src/pages/Editor/DatasourceInfo/DatasourceStructureNotFound.tsx
@@ -4,7 +4,7 @@ import styled from "styled-components";
 import { Text, Button } from "design-system";
 import type { APIResponseError } from "api/ApiResponses";
 import { EDIT_DATASOURCE, createMessage } from "@appsmith/constants/messages";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { DatasourceEditEntryPoints } from "constants/Datasource";
 import history from "utils/history";
 import { getQueryParams } from "utils/URLUtils";
diff --git a/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx b/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx
index e032630ff5..3f2e78e3a1 100644
--- a/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx
+++ b/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx
@@ -31,7 +31,7 @@ import type {
 import { DatasourceStructureContext } from "entities/Datasource";
 import { getCurrentApplication } from "@appsmith/selectors/applicationSelectors";
 import type { AppState } from "@appsmith/reducers";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
 import {
diff --git a/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx b/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx
index 20c8850faf..4d126e8150 100644
--- a/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx
+++ b/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx
@@ -21,7 +21,7 @@ import {
   DATASOURCE_GENERATE_PAGE_BUTTON,
   GSHEET_SEARCH_PLACEHOLDER,
 } from "@appsmith/constants/messages";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getCurrentApplication } from "@appsmith/selectors/applicationSelectors";
 import type { AppState } from "@appsmith/reducers";
 import { getDatasource } from "@appsmith/selectors/entitiesSelector";
@@ -378,8 +378,8 @@ function GoogleSheetSchema(props: Props) {
     canCreateDatasourceActions &&
     canCreatePages;
 
-  const filteredSpreadsheets = spreadsheetOptions.filter(
-    (option) => (option.label || "").toLowerCase()?.includes(searchString),
+  const filteredSpreadsheets = spreadsheetOptions.filter((option) =>
+    (option.label || "").toLowerCase()?.includes(searchString),
   );
 
   return (
diff --git a/app/client/src/pages/Editor/DatasourceInfo/ItemLoadingIndicator.tsx b/app/client/src/pages/Editor/DatasourceInfo/ItemLoadingIndicator.tsx
index 8e9407edef..30793343c3 100644
--- a/app/client/src/pages/Editor/DatasourceInfo/ItemLoadingIndicator.tsx
+++ b/app/client/src/pages/Editor/DatasourceInfo/ItemLoadingIndicator.tsx
@@ -22,10 +22,10 @@ const ItemLoadingIndicator = ({ type }: { type: LoadingItemType }) => {
           type === "SPREADSHEET"
             ? GSHEET_SPREADSHEET_LOADING
             : type === "SHEET"
-            ? GSHEET_SHEET_LOADING
-            : type === "SCHEMA"
-            ? LOADING_SCHEMA
-            : GSHEET_DATA_LOADING,
+              ? GSHEET_SHEET_LOADING
+              : type === "SCHEMA"
+                ? LOADING_SCHEMA
+                : GSHEET_DATA_LOADING,
         )}
       </Text>
     </MessageWrapper>
diff --git a/app/client/src/pages/Editor/DatasourceInfo/QueryTemplates.tsx b/app/client/src/pages/Editor/DatasourceInfo/QueryTemplates.tsx
index 9cbb29e781..693b7e7983 100644
--- a/app/client/src/pages/Editor/DatasourceInfo/QueryTemplates.tsx
+++ b/app/client/src/pages/Editor/DatasourceInfo/QueryTemplates.tsx
@@ -27,7 +27,7 @@ import { change, getFormValues } from "redux-form";
 import { QUERY_EDITOR_FORM_NAME } from "@appsmith/constants/forms";
 import { diff } from "deep-diff";
 import { UndoRedoToastContext, showUndoRedoToast } from "utils/replayHelpers";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { FEATURE_WALKTHROUGH_KEYS } from "constants/WalkthroughConstants";
 import { SUGGESTED_TAG, createMessage } from "@appsmith/constants/messages";
 import { transformTextToSentenceCase } from "pages/Editor/utils";
diff --git a/app/client/src/pages/Editor/EditorHeader.tsx b/app/client/src/pages/Editor/EditorHeader.tsx
index b22b83010d..90ed664442 100644
--- a/app/client/src/pages/Editor/EditorHeader.tsx
+++ b/app/client/src/pages/Editor/EditorHeader.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useState } from "react";
 import { ThemeProvider } from "styled-components";
 import AppInviteUsersForm from "pages/workspace/AppInviteUsersForm";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import {
   getCurrentApplicationId,
   getCurrentPageId,
diff --git a/app/client/src/pages/Editor/EditorName/NavigationMenuItem.tsx b/app/client/src/pages/Editor/EditorName/NavigationMenuItem.tsx
index 66fa172c19..1a39c654b8 100644
--- a/app/client/src/pages/Editor/EditorName/NavigationMenuItem.tsx
+++ b/app/client/src/pages/Editor/EditorName/NavigationMenuItem.tsx
@@ -11,7 +11,7 @@ import {
 import type { noop } from "lodash";
 
 import type { CommonComponentProps } from "design-system-old";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { MenuTypes } from "./types";
 
 export interface MenuItemData {
diff --git a/app/client/src/pages/Editor/Explorer/Actions/ActionEntity.tsx b/app/client/src/pages/Editor/Explorer/Actions/ActionEntity.tsx
index 7853565b7c..d837d29f40 100644
--- a/app/client/src/pages/Editor/Explorer/Actions/ActionEntity.tsx
+++ b/app/client/src/pages/Editor/Explorer/Actions/ActionEntity.tsx
@@ -15,7 +15,7 @@ import type { Action, StoredDatasource } from "entities/Action";
 import { PluginType } from "entities/Action";
 import { keyBy } from "lodash";
 import { getActionConfig } from "./helpers";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { useLocation } from "react-router";
 import type { Datasource } from "entities/Datasource";
 import {
diff --git a/app/client/src/pages/Editor/Explorer/Actions/helpers.tsx b/app/client/src/pages/Editor/Explorer/Actions/helpers.tsx
index 31ee289637..7b349d4832 100644
--- a/app/client/src/pages/Editor/Explorer/Actions/helpers.tsx
+++ b/app/client/src/pages/Editor/Explorer/Actions/helpers.tsx
@@ -121,7 +121,6 @@ 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),
   );
diff --git a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStarterLayoutPrompt.tsx b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStarterLayoutPrompt.tsx
index bbbe840a79..195c5d078f 100644
--- a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStarterLayoutPrompt.tsx
+++ b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStarterLayoutPrompt.tsx
@@ -30,7 +30,7 @@ import {
 } from "selectors/editorSelectors";
 import { INTEGRATION_TABS } from "constants/routes";
 import { Colors } from "constants/Colors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { STARTER_BUILDING_BLOCK_TEMPLATE_NAME } from "constants/TemplatesConstants";
 import { useAppWideAndOtherDatasource } from "@appsmith/pages/Editor/Explorer/hooks";
 
diff --git a/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx b/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx
index 0f843ca526..be97ef96b3 100644
--- a/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx
+++ b/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx
@@ -10,7 +10,7 @@ import type { AppState } from "@appsmith/reducers";
 import classNames from "classnames";
 import styled from "styled-components";
 import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { EntityClassNames } from ".";
 import { Button } from "design-system";
 import { getEntityProperties } from "@appsmith/pages/Editor/Explorer/Entity/getEntityProperties";
diff --git a/app/client/src/pages/Editor/Explorer/Entity/EntityProperty.tsx b/app/client/src/pages/Editor/Explorer/Entity/EntityProperty.tsx
index a9c11aa16b..cec5a80246 100644
--- a/app/client/src/pages/Editor/Explorer/Entity/EntityProperty.tsx
+++ b/app/client/src/pages/Editor/Explorer/Entity/EntityProperty.tsx
@@ -13,7 +13,7 @@ import { EntityClassNames } from ".";
 import { Tooltip, Icon } from "design-system";
 import { COPY_ELEMENT, createMessage } from "@appsmith/constants/messages";
 import CollapseToggle from "./CollapseToggle";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import type { EntityProperty as EntityPropertyType } from "@appsmith/pages/Editor/Explorer/Entity/getEntityProperties";
 
 const Wrapper = styled.div`
diff --git a/app/client/src/pages/Editor/Explorer/Entity/index.tsx b/app/client/src/pages/Editor/Explorer/Entity/index.tsx
index a98f5e9721..1ec18753f3 100644
--- a/app/client/src/pages/Editor/Explorer/Entity/index.tsx
+++ b/app/client/src/pages/Editor/Explorer/Entity/index.tsx
@@ -110,8 +110,8 @@ export const EntityItem = styled.div<{
     props.active
       ? `var(--ads-v2-color-bg-muted)`
       : props.isSticky
-      ? "var(--ads-v2-color-bg)"
-      : "none"};
+        ? "var(--ads-v2-color-bg)"
+        : "none"};
   height: 36px;
   width: 100%;
   display: inline-grid;
diff --git a/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx b/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx
index c66d8caeed..a5d8592d14 100644
--- a/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx
+++ b/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx
@@ -23,7 +23,7 @@ import {
 import { fetchWorkspace } from "@appsmith/actions/workspaceActions";
 import { getCurrentWorkspaceId } from "@appsmith/selectors/selectedWorkspaceSelectors";
 import { importSvg } from "design-system-old";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { EntityExplorerWrapper } from "./Common/EntityExplorerWrapper";
 import { getCurrentApplicationId } from "selectors/editorSelectors";
 import { FilesContextProvider } from "./Files/FilesContextProvider";
diff --git a/app/client/src/pages/Editor/Explorer/JSActions/JSActionEntity.tsx b/app/client/src/pages/Editor/Explorer/JSActions/JSActionEntity.tsx
index fa3ede47e0..b558c7611b 100644
--- a/app/client/src/pages/Editor/Explorer/JSActions/JSActionEntity.tsx
+++ b/app/client/src/pages/Editor/Explorer/JSActions/JSActionEntity.tsx
@@ -9,7 +9,7 @@ import type { JSCollection } from "entities/JSCollection";
 import { JsFileIconV2 } from "../ExplorerIcons";
 import type { PluginType } from "entities/Action";
 import { jsCollectionIdURL } from "@appsmith/RouteBuilder";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { useLocation } from "react-router";
 import {
   getHasDeleteActionPermission,
diff --git a/app/client/src/pages/Editor/Explorer/Libraries/Installer.tsx b/app/client/src/pages/Editor/Explorer/Libraries/Installer.tsx
index 1d04e4aa93..0a28f79431 100644
--- a/app/client/src/pages/Editor/Explorer/Libraries/Installer.tsx
+++ b/app/client/src/pages/Editor/Explorer/Libraries/Installer.tsx
@@ -37,7 +37,7 @@ import type { AppState } from "@appsmith/reducers";
 import { installLibraryInit } from "actions/JSLibraryActions";
 import classNames from "classnames";
 import type { JSLibrary } from "workers/common/JSLibrary";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { EntityClassNames } from "pages/Editor/Explorer/Entity";
 
 const Wrapper = styled.div`
diff --git a/app/client/src/pages/Editor/Explorer/Pages/AddPageContextMenu.tsx b/app/client/src/pages/Editor/Explorer/Pages/AddPageContextMenu.tsx
index 4b13be7fb2..03d6a15731 100644
--- a/app/client/src/pages/Editor/Explorer/Pages/AddPageContextMenu.tsx
+++ b/app/client/src/pages/Editor/Explorer/Pages/AddPageContextMenu.tsx
@@ -16,7 +16,7 @@ import {
   CREATE_PAGE,
   GENERATE_PAGE_ACTION_TITLE,
 } from "@appsmith/constants/messages";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import type { ButtonSizes } from "design-system";
 import {
   Menu,
@@ -47,12 +47,14 @@ interface SubMenuProps {
   onMenuClose: () => void;
   createPageCallback: () => void;
   buttonSize?: ButtonSizes;
+  onItemSelected?: () => void;
 }
 
 function AddPageContextMenu({
   buttonSize,
   className,
   createPageCallback,
+  onItemSelected,
   onMenuClose,
   openMenu,
 }: SubMenuProps) {
@@ -114,6 +116,7 @@ function AddPageContextMenu({
   };
 
   const onMenuItemClick = (item: (typeof ContextMenuItems)[number]) => {
+    if (onItemSelected) onItemSelected();
     handleOpenChange(false);
     item.onClick();
     AnalyticsUtil.logEvent("ENTITY_EXPLORER_ADD_PAGE_CLICK", {
diff --git a/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx b/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx
index 039be50fd0..c2c6fa847c 100644
--- a/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx
+++ b/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx
@@ -1,7 +1,7 @@
 import type { ReactNode } from "react";
-import React, { useCallback, useEffect, useMemo, useState } from "react";
+import React, { useCallback, useMemo, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { initExplorerEntityNameEdit } from "actions/explorerActions";
 import {
   clonePageInit,
@@ -22,10 +22,7 @@ import {
   CONTEXT_PARTIAL_IMPORT,
 } from "@appsmith/constants/messages";
 import { getPageById } from "selectors/editorSelectors";
-import {
-  getCurrentApplication,
-  getPartialImportExportLoadingState,
-} from "@appsmith/selectors/applicationSelectors";
+import { getCurrentApplication } from "@appsmith/selectors/applicationSelectors";
 import type { AppState } from "@appsmith/reducers";
 import ContextMenu from "pages/Editor/Explorer/ContextMenu";
 import type { TreeDropdownOption } from "pages/Editor/Explorer/ContextMenu";
@@ -36,8 +33,8 @@ import {
   getHasDeletePagePermission,
   getHasManagePagePermission,
 } from "@appsmith/utils/BusinessFeatures/permissionPageHelpers";
-import PartiaExportModel from "components/editorComponents/PartialImportExport/PartialExportModal";
-import PartialImportModal from "components/editorComponents/PartialImportExport/PartialImportModal";
+import { openPartialExportModal } from "actions/widgetActions";
+import { openPartialImportModal } from "@appsmith/actions/applicationActions";
 
 const CustomLabel = styled.div`
   display: flex;
@@ -54,27 +51,14 @@ export function PageContextMenu(props: {
   isDefaultPage: boolean;
   isHidden: boolean;
   hasExportPermission: boolean;
+  onItemSelected?: () => void;
 }) {
   const dispatch = useDispatch();
   const isPartialImportExportEnabled = useFeatureFlag(
     FEATURE_FLAG.release_show_partial_import_export_enabled,
   );
-  const [showPartialExportModal, setShowPartialExportModal] = useState(false);
-  const [showPartialImportModal, setShowPartialImportModal] = useState(false);
   const [confirmDelete, setConfirmDelete] = useState(false);
 
-  const partialImportExportLoadingState = useSelector(
-    getPartialImportExportLoadingState,
-  );
-
-  useEffect(() => {
-    if (partialImportExportLoadingState.isExportDone) {
-      setShowPartialExportModal(false);
-    }
-    if (partialImportExportLoadingState.isImportDone) {
-      setShowPartialImportModal(false);
-    }
-  }, [partialImportExportLoadingState]);
   /**
    * delete the page
    *
@@ -145,8 +129,14 @@ export function PageContextMenu(props: {
     ],
   );
 
-  const openPartialExportModal = () => setShowPartialExportModal(true);
-  const openPartialImportModal = () => setShowPartialImportModal(true);
+  const handlePartialExportClick = () => {
+    if (props.onItemSelected) props.onItemSelected();
+    dispatch(openPartialExportModal(true));
+  };
+  const handlePartialImportClick = () => {
+    if (props.onItemSelected) props.onItemSelected();
+    dispatch(openPartialImportModal(true));
+  };
 
   const pagePermissions =
     useSelector(getPageById(props.pageId))?.userPermissions || [];
@@ -210,12 +200,12 @@ export function PageContextMenu(props: {
       },
     showPartialImportExportInMenu && {
       value: "partial-export",
-      onSelect: openPartialExportModal,
+      onSelect: handlePartialExportClick,
       label: createMessage(CONTEXT_PARTIAL_EXPORT),
     },
     showPartialImportExportInMenu && {
       value: "partial-import",
-      onSelect: openPartialImportModal,
+      onSelect: handlePartialImportClick,
       label: createMessage(CONTEXT_PARTIAL_IMPORT),
     },
     !props.isDefaultPage &&
@@ -234,25 +224,11 @@ export function PageContextMenu(props: {
   ].filter(Boolean);
 
   return optionsTree?.length > 0 ? (
-    <>
-      <ContextMenu
-        className={props.className}
-        optionTree={optionsTree as TreeDropdownOption[]}
-        setConfirmDelete={setConfirmDelete}
-      />
-      {showPartialExportModal && (
-        <PartiaExportModel
-          handleModalClose={() => setShowPartialExportModal(false)}
-          isModalOpen={showPartialExportModal}
-        />
-      )}
-      {showPartialImportModal && (
-        <PartialImportModal
-          isModalOpen={showPartialImportModal}
-          onClose={() => setShowPartialImportModal(false)}
-        />
-      )}
-    </>
+    <ContextMenu
+      className={props.className}
+      optionTree={optionsTree as TreeDropdownOption[]}
+      setConfirmDelete={setConfirmDelete}
+    />
   ) : null;
 }
 
diff --git a/app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx b/app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx
index e66d809e30..bd39c177a5 100644
--- a/app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx
+++ b/app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx
@@ -9,7 +9,7 @@ import type { CanvasStructure } from "reducers/uiReducers/pageCanvasStructureRed
 import { getLastSelectedWidget, getSelectedWidgets } from "selectors/ui";
 import { useNavigateToWidget } from "./useNavigateToWidget";
 import WidgetIcon from "./WidgetIcon";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { builderURL } from "@appsmith/RouteBuilder";
 import { useLocation } from "react-router";
 import { getPagePermissions } from "selectors/editorSelectors";
diff --git a/app/client/src/pages/Editor/Explorer/index.tsx b/app/client/src/pages/Editor/Explorer/index.tsx
index e184180d3a..ae9144d346 100644
--- a/app/client/src/pages/Editor/Explorer/index.tsx
+++ b/app/client/src/pages/Editor/Explorer/index.tsx
@@ -8,7 +8,7 @@ import type { AppState } from "@appsmith/reducers";
 import { builderURL } from "@appsmith/RouteBuilder";
 import { getCurrentPageId } from "selectors/editorSelectors";
 import { getIsFirstTimeUserOnboardingEnabled } from "selectors/onboardingSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { trimQueryString } from "utils/helpers";
 import history from "utils/history";
 import EntityExplorer from "./EntityExplorer";
diff --git a/app/client/src/pages/Editor/FirstTimeUserOnboarding/AnonymousDataPopup.tsx b/app/client/src/pages/Editor/FirstTimeUserOnboarding/AnonymousDataPopup.tsx
index 61c4dfdf49..a02cb9b022 100644
--- a/app/client/src/pages/Editor/FirstTimeUserOnboarding/AnonymousDataPopup.tsx
+++ b/app/client/src/pages/Editor/FirstTimeUserOnboarding/AnonymousDataPopup.tsx
@@ -26,7 +26,7 @@ import { isAirgapped } from "@appsmith/utils/airgapHelpers";
 import { deleteCanvasCardsState } from "actions/editorActions";
 import styled from "styled-components";
 import { showAnonymousDataPopup } from "actions/onboardingActions";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 const Wrapper = styled.div`
   margin: ${(props) =>
diff --git a/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx b/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx
index b133aa7723..00ec5c9082 100644
--- a/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx
+++ b/app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx
@@ -27,7 +27,7 @@ import {
   getSignpostingStepStateByStep,
   isWidgetActionConnectionPresent,
 } from "selectors/onboardingSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { forceOpenWidgetPanel } from "actions/widgetSidebarActions";
 import { bindDataOnCanvas } from "actions/pluginActionActions";
 import {
diff --git a/app/client/src/pages/Editor/GeneratePage/components/CrudInfoModal.tsx b/app/client/src/pages/Editor/GeneratePage/components/CrudInfoModal.tsx
index fb9670a87e..83b8a8149d 100644
--- a/app/client/src/pages/Editor/GeneratePage/components/CrudInfoModal.tsx
+++ b/app/client/src/pages/Editor/GeneratePage/components/CrudInfoModal.tsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react";
 import styled from "styled-components";
 import { connect, useDispatch } from "react-redux";
 import type { AppState } from "@appsmith/reducers";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import {
   Button,
   Text,
diff --git a/app/client/src/pages/Editor/GeneratePage/components/DataSourceOption.tsx b/app/client/src/pages/Editor/GeneratePage/components/DataSourceOption.tsx
index 8f37a84ca6..b104a06143 100644
--- a/app/client/src/pages/Editor/GeneratePage/components/DataSourceOption.tsx
+++ b/app/client/src/pages/Editor/GeneratePage/components/DataSourceOption.tsx
@@ -94,8 +94,8 @@ function DataSourceOption({
   const optionCypressSelector = isConnectNewDataSourceBtn
     ? ".t--connectNewDatasource-option"
     : isSelectedNode
-    ? ""
-    : dataTestid;
+      ? ""
+      : dataTestid;
   return (
     <Tooltip
       content="Not supported for template generation"
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 12d2cda4c8..c43f0f508d 100644
--- a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx
+++ b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx
@@ -40,7 +40,7 @@ import {
   useSheetColumnHeaders,
   useS3BucketList,
 } from "./hooks";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import type { AppState } from "@appsmith/reducers";
 import type {
   DropdownOptions,
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 14d4489460..f7753ff04b 100644
--- a/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/hooks.ts
+++ b/app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/hooks.ts
@@ -9,7 +9,7 @@ import type { DropdownOption } from "design-system-old";
 import { useDispatch, useSelector } from "react-redux";
 import { PluginPackageName } from "entities/Action";
 import { getCurrentEnvironmentId } from "@appsmith/selectors/environmentSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 export const FAKE_DATASOURCE_OPTION = {
   CONNECT_NEW_DATASOURCE_OPTION: {
diff --git a/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.tsx b/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.tsx
index 1f5d31f31b..ce9557b9c9 100644
--- a/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.tsx
+++ b/app/client/src/pages/Editor/GlobalHotKeys/GlobalHotKeys.tsx
@@ -16,7 +16,7 @@ import { setGlobalSearchCategory } from "actions/globalSearchActions";
 import { getSelectedText, isMacOrIOS } from "utils/helpers";
 import { getLastSelectedWidget, getSelectedWidgets } from "selectors/ui";
 import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { WIDGETS_SEARCH_ID } from "constants/Explorer";
 import { resetSnipingMode as resetSnipingModeAction } from "actions/propertyPaneActions";
 
diff --git a/app/client/src/pages/Editor/HelpButton.tsx b/app/client/src/pages/Editor/HelpButton.tsx
index f1eaba5b8b..f0cdce0613 100644
--- a/app/client/src/pages/Editor/HelpButton.tsx
+++ b/app/client/src/pages/Editor/HelpButton.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from "react";
 
 import { HELP_MODAL_WIDTH } from "constants/HelpConstants";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getCurrentUser } from "selectors/usersSelectors";
 import { useDispatch, useSelector } from "react-redux";
 import bootIntercom, { updateIntercomProperties } from "utils/bootIntercom";
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/JS/BlankStateContainer.tsx b/app/client/src/pages/Editor/IDE/EditorPane/JS/BlankStateContainer.tsx
deleted file mode 100644
index d41f30c568..0000000000
--- a/app/client/src/pages/Editor/IDE/EditorPane/JS/BlankStateContainer.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from "react";
-import { Flex } from "design-system";
-
-import { BlankState } from "./BlankState";
-
-const BlankStateContainer: React.FC = () => {
-  return (
-    <Flex flexDirection="column" gap="spaces-3" overflow="hidden" py="spaces-3">
-      <BlankState />
-    </Flex>
-  );
-};
-
-export { BlankStateContainer };
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/PagesSection.tsx b/app/client/src/pages/Editor/IDE/EditorPane/PagesSection.tsx
index d13268dc9c..4d22959fae 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/PagesSection.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/PagesSection.tsx
@@ -1,8 +1,7 @@
-import React, { useCallback, useEffect, useMemo, useState } from "react";
-import { Flex } from "design-system";
+import React, { useCallback, useMemo, useState } from "react";
+import { Flex, Text } from "design-system";
 import { useDispatch, useSelector } from "react-redux";
 import { useLocation } from "react-router";
-import { animated, useSpring } from "react-spring";
 
 import { selectAllPages } from "@appsmith/selectors/entitiesSelector";
 import type { Page } from "@appsmith/constants/ReduxActionConstants";
@@ -19,14 +18,32 @@ import { getNextEntityName } from "utils/AppsmithUtils";
 import { getCurrentWorkspaceId } from "@appsmith/selectors/selectedWorkspaceSelectors";
 import { getInstanceId } from "@appsmith/selectors/tenantSelectors";
 import { PageElement } from "pages/Editor/IDE/EditorPane/components/PageElement";
-import { getPagesActiveStatus } from "selectors/ideSelectors";
-import PaneHeader from "../LeftPane/PaneHeader";
+import styled from "styled-components";
 
-const AnimatedFlex = animated(Flex);
-const defaultAnimationState = { height: "0%" };
-const expandedAnimationState = { height: "21.5%" };
+const Container = styled(Flex)`
+  & .t--entity-item {
+    grid-template-columns: 0 auto 1fr auto auto auto auto auto;
+    height: 32px;
 
-const PagesSection = () => {
+    & .t--entity-name {
+      padding-left: var(--ads-v2-spaces-3);
+    }
+  }
+`;
+
+const Header = styled.div`
+  padding: var(--ads-v2-spaces-3);
+  padding-right: var(--ads-v2-spaces-2);
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 40px;
+  span {
+    line-height: 20px;
+  }
+`;
+
+const PagesSection = ({ onItemSelected }: { onItemSelected: () => void }) => {
   const dispatch = useDispatch();
   const location = useLocation();
   const pages: Page[] = useSelector(selectAllPages);
@@ -36,14 +53,6 @@ const PagesSection = () => {
   );
   const workspaceId = useSelector(getCurrentWorkspaceId);
   const instanceId = useSelector(getInstanceId);
-  const pagesActive = useSelector(getPagesActiveStatus);
-
-  const [springs, api] = useSpring(() => ({
-    from: defaultAnimationState,
-    config: {
-      duration: 200,
-    },
-  }));
 
   const [isMenuOpen, setIsMenuOpen] = useState(false);
 
@@ -54,22 +63,6 @@ const PagesSection = () => {
     userAppPermissions,
   );
 
-  useEffect(() => {
-    if (pagesActive) {
-      api.start({
-        to: expandedAnimationState,
-      });
-    } else {
-      api.start({
-        to: defaultAnimationState,
-      });
-    }
-
-    return () => {
-      api.stop();
-    };
-  }, [pagesActive, api]);
-
   const createPageCallback = useCallback(() => {
     const name = getNextEntityName(
       "Page",
@@ -89,43 +82,44 @@ const PagesSection = () => {
   const onMenuClose = useCallback(() => setIsMenuOpen(false), [setIsMenuOpen]);
 
   const pageElements = useMemo(
-    () => pages.map((page) => <PageElement key={page.pageId} page={page} />),
+    () =>
+      pages.map((page) => (
+        <PageElement key={page.pageId} onClick={onItemSelected} page={page} />
+      )),
     [pages, location.pathname],
   );
 
   return (
-    <AnimatedFlex
+    <Container
       flexDirection={"column"}
-      height={"21.5%"}
       justifyContent={"center"}
+      maxHeight={"300px"}
       overflow={"hidden"}
-      style={springs}
     >
-      <PaneHeader
-        className="pages"
-        rightIcon={
-          canCreatePages ? (
-            <AddPageContextMenu
-              buttonSize="sm"
-              className={`${EntityClassNames.ADD_BUTTON} group pages`}
-              createPageCallback={createPageCallback}
-              onMenuClose={onMenuClose}
-              openMenu={isMenuOpen}
-            />
-          ) : null
-        }
-        title={`All Pages (${pages.length})`}
-      />
+      <Header className="pages">
+        <Text kind="heading-xs">{`All Pages (${pages.length})`}</Text>
+        {canCreatePages ? (
+          <AddPageContextMenu
+            buttonSize="sm"
+            className={`${EntityClassNames.ADD_BUTTON} group pages`}
+            createPageCallback={createPageCallback}
+            onItemSelected={onItemSelected}
+            onMenuClose={onMenuClose}
+            openMenu={isMenuOpen}
+          />
+        ) : null}
+      </Header>
       <Flex
         alignItems={"center"}
         flex={"1"}
         flexDirection={"column"}
         overflow={"auto"}
+        px="spaces-2"
         width={"100%"}
       >
         {pageElements}
       </Flex>
-    </AnimatedFlex>
+    </Container>
   );
 };
 
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/Query/BlankStateContainer.tsx b/app/client/src/pages/Editor/IDE/EditorPane/Query/BlankStateContainer.tsx
deleted file mode 100644
index 8b097c26b5..0000000000
--- a/app/client/src/pages/Editor/IDE/EditorPane/Query/BlankStateContainer.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from "react";
-import { Flex } from "design-system";
-
-import { BlankState } from "./BlankState";
-
-const BlankStateContainer: React.FC = () => {
-  return (
-    <Flex
-      flex="1"
-      flexDirection="column"
-      gap="spaces-3"
-      overflow="hidden"
-      py="spaces-3"
-    >
-      <BlankState />
-    </Flex>
-  );
-};
-
-export { BlankStateContainer };
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/components/PageElement.tsx b/app/client/src/pages/Editor/IDE/EditorPane/components/PageElement.tsx
index 32d6fe0052..ab11ffdb65 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/components/PageElement.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/components/PageElement.tsx
@@ -18,14 +18,20 @@ import {
 import { getCurrentApplication } from "@appsmith/selectors/applicationSelectors";
 import type { AppState } from "@appsmith/reducers";
 import { StyledEntity } from "pages/Editor/Explorer/Common/components";
-import { resolveAsSpaceChar } from "utils/helpers";
+import { toValidPageName } from "utils/helpers";
 import { updatePage } from "actions/pageActions";
 import { useGetPageFocusUrl } from "pages/Editor/IDE/hooks";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { toggleInOnboardingWidgetSelection } from "actions/onboardingActions";
 import history, { NavigationMethod } from "utils/history";
 
-const PageElement = ({ page }: { page: Page }) => {
+const PageElement = ({
+  onClick,
+  page,
+}: {
+  page: Page;
+  onClick?: () => void;
+}) => {
   const dispatch = useDispatch();
   const location = useLocation();
   const navigateToUrl = useGetPageFocusUrl(page.pageId);
@@ -72,6 +78,9 @@ const PageElement = ({ page }: { page: Page }) => {
       history.push(navigateToUrl, {
         invokedBy: NavigationMethod.EntityExplorer,
       });
+      if (onClick) {
+        onClick();
+      }
     },
     [location.pathname, currentPageId, navigateToUrl],
   );
@@ -86,6 +95,7 @@ const PageElement = ({ page }: { page: Page }) => {
       isHidden={!!page.isHidden}
       key={page.pageId + "_context-menu"}
       name={page.pageName}
+      onItemSelected={onClick}
       pageId={page.pageId}
     />
   );
@@ -103,10 +113,10 @@ const PageElement = ({ page }: { page: Page }) => {
       isDefaultExpanded={isCurrentPage}
       key={page.pageId}
       name={page.pageName}
-      onNameEdit={resolveAsSpaceChar}
+      onNameEdit={toValidPageName}
       ref={ref}
       searchKeyword={""}
-      step={1}
+      step={0}
       updateEntityName={(id, name) =>
         updatePage({ id, name, isHidden: !!page.isHidden })
       }
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/components/SegmentedHeader.tsx b/app/client/src/pages/Editor/IDE/EditorPane/components/SegmentedHeader.tsx
index 54e4bbc6e1..2a0eda156a 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/components/SegmentedHeader.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/components/SegmentedHeader.tsx
@@ -18,7 +18,7 @@ import styled from "styled-components";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
 import { getIDEViewMode, getIsSideBySideEnabled } from "selectors/ideSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { setIdeEditorViewMode } from "actions/ideActions";
 
 const Container = styled(Flex)`
diff --git a/app/client/src/pages/Editor/IDE/EditorPane/index.tsx b/app/client/src/pages/Editor/IDE/EditorPane/index.tsx
index 7003f66dcd..ec3afd8366 100644
--- a/app/client/src/pages/Editor/IDE/EditorPane/index.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorPane/index.tsx
@@ -9,7 +9,6 @@ import EditorPaneSegments from "./EditorPaneSegments";
 import GlobalAdd from "./GlobalAdd";
 import { useEditorPaneWidth } from "../hooks";
 import EntityProperties from "pages/Editor/Explorer/Entity/EntityProperties";
-import { PagesSection } from "./PagesSection";
 
 const EditorPane = ({ match: { path } }: RouteComponentProps) => {
   const width = useEditorPaneWidth();
@@ -26,7 +25,6 @@ const EditorPane = ({ match: { path } }: RouteComponentProps) => {
       {/** Entity Properties component is needed to render
         the Bindings popover in the context menu. Will be removed eventually **/}
       <EntityProperties />
-      <PagesSection />
 
       <Switch>
         <SentryRoute component={GlobalAdd} exact path={`${path}${ADD_PATH}`} />
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/FullScreenTabs.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/FullScreenTabs.tsx
index 7e9f96c929..fc5f292fd9 100644
--- a/app/client/src/pages/Editor/IDE/EditorTabs/FullScreenTabs.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorTabs/FullScreenTabs.tsx
@@ -15,7 +15,7 @@ import {
   MINIMIZE_BUTTON_TOOLTIP,
   createMessage,
 } from "@appsmith/constants/messages";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 const FullScreenTabs = () => {
   const dispatch = useDispatch();
diff --git a/app/client/src/pages/Editor/IDE/EditorTabs/SearchableFilesList.tsx b/app/client/src/pages/Editor/IDE/EditorTabs/SearchableFilesList.tsx
index 969339097f..d4666616a4 100644
--- a/app/client/src/pages/Editor/IDE/EditorTabs/SearchableFilesList.tsx
+++ b/app/client/src/pages/Editor/IDE/EditorTabs/SearchableFilesList.tsx
@@ -85,6 +85,7 @@ const SearchableFilesList = (props: Props) => {
     <Menu onOpenChange={setOpen} open={isOpen}>
       <MenuTrigger>
         <StyledButton
+          className="!min-w-fit"
           data-testid="t--files-list-trigger"
           isActive={isOpen}
           isIconButton
diff --git a/app/client/src/pages/Editor/IDE/Header/EditorTitle.tsx b/app/client/src/pages/Editor/IDE/Header/EditorTitle.tsx
index 1361474410..f9bf9dd06b 100644
--- a/app/client/src/pages/Editor/IDE/Header/EditorTitle.tsx
+++ b/app/client/src/pages/Editor/IDE/Header/EditorTitle.tsx
@@ -1,52 +1,75 @@
-import React from "react";
-import { Flex, Text, Icon } from "design-system";
-import { useDispatch, useSelector } from "react-redux";
+import React, { useState } from "react";
+import {
+  Flex,
+  Text,
+  Icon,
+  Popover,
+  PopoverTrigger,
+  PopoverContent,
+} from "design-system";
 
 import { createMessage, HEADER_TITLES } from "@appsmith/constants/messages";
-import { setIdeEditorPagesActiveStatus } from "actions/ideActions";
-import { getPagesActiveStatus } from "selectors/ideSelectors";
+import { PagesSection } from "../EditorPane/PagesSection";
+import styled from "styled-components";
+
+const PageSwitchTrigger = styled.div<{ active: boolean }>`
+  border-radius: var(--ads-v2-border-radius);
+  background-color: ${(props) =>
+    props.active ? `var(--ads-v2-color-bg-subtle)` : "unset"};
+  cursor: pointer;
+  padding: var(--ads-v2-spaces-2);
+  :hover {
+    background-color: var(--ads-v2-color-bg-subtle);
+  }
+`;
 
 const EditorTitle = ({ title }: { title: string }) => {
-  const dispatch = useDispatch();
-  const active = useSelector(getPagesActiveStatus);
+  const [active, setActive] = useState(false);
 
-  const onClickHandler = () => {
-    dispatch(setIdeEditorPagesActiveStatus(!active));
+  const closeMenu = () => {
+    setActive(false);
   };
 
   return (
-    <Flex
-      alignItems={"center"}
-      borderRadius={"var(--ads-v2-border-radius)"}
-      className={"hover:bg-[var(--ads-v2-color-bg-subtle)] cursor-pointer"}
-      justifyContent={"center"}
-      onClick={onClickHandler}
-      p={"spaces-2"}
-    >
-      <Text
-        color={"var(--ads-v2-colors-content-label-inactive-fg)"}
-        kind="body-m"
+    <Popover onOpenChange={setActive} open={active}>
+      <PopoverTrigger>
+        <PageSwitchTrigger
+          active={active}
+          className="flex align-center justify-center"
+        >
+          <Text
+            color={"var(--ads-v2-colors-content-label-inactive-fg)"}
+            kind="body-m"
+          >
+            {createMessage(HEADER_TITLES.EDITOR) + " /"}
+          </Text>
+          <Flex
+            alignItems={"center"}
+            className={"t--pages-switcher"}
+            data-active={active}
+            gap={"spaces-1"}
+            height={"100%"}
+            justifyContent={"center"}
+            paddingLeft={"spaces-2"}
+          >
+            <Text isBold kind={"body-m"}>
+              {title}
+            </Text>
+            <Icon
+              name={active ? "arrow-up-s-line" : "arrow-down-s-line"}
+              size={"md"}
+            />
+          </Flex>
+        </PageSwitchTrigger>
+      </PopoverTrigger>
+      <PopoverContent
+        align="start"
+        className="!p-0 !pb-1"
+        onEscapeKeyDown={closeMenu}
       >
-        {createMessage(HEADER_TITLES.EDITOR) + " /"}
-      </Text>
-      <Flex
-        alignItems={"center"}
-        className={"t--pages-switcher"}
-        data-active={active}
-        gap={"spaces-1"}
-        height={"100%"}
-        justifyContent={"center"}
-        paddingLeft={"spaces-2"}
-      >
-        <Text isBold kind={"body-m"}>
-          {title}
-        </Text>
-        <Icon
-          name={active ? "arrow-up-s-line" : "arrow-down-s-line"}
-          size={"md"}
-        />
-      </Flex>
-    </Flex>
+        <PagesSection onItemSelected={closeMenu} />
+      </PopoverContent>
+    </Popover>
   );
 };
 
diff --git a/app/client/src/pages/Editor/IDE/Header/index.tsx b/app/client/src/pages/Editor/IDE/Header/index.tsx
index 79935d9fb9..8ec3fbddc9 100644
--- a/app/client/src/pages/Editor/IDE/Header/index.tsx
+++ b/app/client/src/pages/Editor/IDE/Header/index.tsx
@@ -66,7 +66,7 @@ import {
   protectedModeSelector,
 } from "selectors/gitSyncSelectors";
 import { showConnectGitModal } from "actions/gitSyncActions";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import type { NavigationSetting } from "constants/AppConstants";
 import { useHref } from "pages/Editor/utils";
 import { viewerURL } from "@appsmith/RouteBuilder";
@@ -75,7 +75,8 @@ import { EditorTitle } from "./EditorTitle";
 import { useCurrentAppState } from "pages/Editor/IDE/hooks";
 import { DefaultTitle } from "./DeaultTitle";
 import { EditorState } from "@appsmith/entities/IDE/constants";
-import { EditorSaveIndicator } from "../../EditorSaveIndicator";
+import { EditorSaveIndicator } from "pages/Editor/EditorSaveIndicator";
+import type { Page } from "@appsmith/constants/ReduxActionConstants";
 
 const StyledDivider = styled(Divider)`
   height: 50%;
@@ -85,6 +86,41 @@ const StyledDivider = styled(Divider)`
 
 const { cloudHosting } = getAppsmithConfigs();
 
+interface HeaderTitleProps {
+  appState: EditorState;
+  currentPage?: Page;
+}
+
+const HeaderTitleComponent = ({ appState, currentPage }: HeaderTitleProps) => {
+  switch (appState) {
+    case EditorState.DATA:
+      return (
+        <DefaultTitle
+          key={appState}
+          title={createMessage(HEADER_TITLES.DATA)}
+        />
+      );
+    case EditorState.EDITOR:
+      return <EditorTitle key={appState} title={currentPage?.pageName || ""} />;
+    case EditorState.SETTINGS:
+      return (
+        <DefaultTitle
+          key={appState}
+          title={createMessage(HEADER_TITLES.SETTINGS)}
+        />
+      );
+    case EditorState.LIBRARIES:
+      return (
+        <DefaultTitle
+          key={appState}
+          title={createMessage(HEADER_TITLES.LIBRARIES)}
+        />
+      );
+    default:
+      return <EditorTitle key={appState} title={currentPage?.pageName || ""} />;
+  }
+};
+
 const Header = () => {
   const dispatch = useDispatch();
 
@@ -184,21 +220,6 @@ const Header = () => {
     [dispatch, handlePublish],
   );
 
-  const TitleComponent = () => {
-    switch (appState) {
-      case EditorState.DATA:
-        return <DefaultTitle title={createMessage(HEADER_TITLES.DATA)} />;
-      case EditorState.EDITOR:
-        return <EditorTitle title={currentPage?.pageName || ""} />;
-      case EditorState.SETTINGS:
-        return <DefaultTitle title={createMessage(HEADER_TITLES.SETTINGS)} />;
-      case EditorState.LIBRARIES:
-        return <DefaultTitle title={createMessage(HEADER_TITLES.LIBRARIES)} />;
-      default:
-        return <EditorTitle title={currentPage?.pageName || ""} />;
-    }
-  };
-
   return (
     <Flex
       alignItems={"center"}
@@ -219,7 +240,7 @@ const Header = () => {
       >
         <AppsmithLink />
         <Divider orientation="vertical" />
-        <TitleComponent />
+        <HeaderTitleComponent appState={appState} currentPage={currentPage} />
         <EditorSaveIndicator isSaving={isSaving} saveError={pageSaveError} />
       </Flex>
       <Flex
diff --git a/app/client/src/pages/Editor/IDE/ProtectedBranchIDE.test.tsx b/app/client/src/pages/Editor/IDE/ProtectedBranchIDE.test.tsx
new file mode 100644
index 0000000000..3ed96a4306
--- /dev/null
+++ b/app/client/src/pages/Editor/IDE/ProtectedBranchIDE.test.tsx
@@ -0,0 +1,81 @@
+import React from "react";
+import { render } from "@testing-library/react";
+import { merge } from "lodash";
+import { Provider } from "react-redux";
+import configureStore from "redux-mock-store";
+import IDE from ".";
+import { BrowserRouter } from "react-router-dom";
+import "@testing-library/jest-dom";
+
+const getMockStore = (override: Record<string, any> = {}) => {
+  const slice = {
+    ui: {
+      applications: {
+        currentApplication: {
+          gitApplicationMetadata: {
+            branchName: "main",
+            remoteUrl: "remote-url",
+          },
+        },
+      },
+      editor: {
+        isPreviewMode: false,
+      },
+      gitSync: {
+        protectedBranches: ["main"],
+      },
+    },
+  };
+  const mockStore = configureStore([]);
+  const newSlice = merge(slice, override);
+  return mockStore({
+    ...newSlice,
+  });
+};
+
+jest.mock("./MainPane", () => () => <div />);
+jest.mock("./LeftPane", () => () => <div />);
+jest.mock("./RightPane", () => () => <div />);
+jest.mock("./Sidebar", () => () => <div />);
+jest.mock("components/BottomBar", () => () => <div />);
+
+describe("Protected view for IDE", () => {
+  it("should render the protected view for IDE", () => {
+    const store = getMockStore();
+    const { getByTestId } = render(
+      <Provider store={store}>
+        <BrowserRouter>
+          <IDE />
+        </BrowserRouter>
+      </Provider>,
+    );
+    expect(getByTestId("t--git-protected-branch-callout")).toBeInTheDocument();
+  });
+
+  it("should not render the protected view if branch is not protected", () => {
+    const store = getMockStore({
+      ui: {
+        applications: {
+          currentApplication: {
+            gitApplicationMetadata: {
+              branchName: "branch-1",
+            },
+          },
+        },
+        gitSync: {
+          protectedBranches: ["main"],
+        },
+      },
+    });
+    const { queryByTestId } = render(
+      <Provider store={store}>
+        <BrowserRouter>
+          <IDE />
+        </BrowserRouter>
+      </Provider>,
+    );
+    expect(
+      queryByTestId("t--git-protected-branch-callout"),
+    ).not.toBeInTheDocument();
+  });
+});
diff --git a/app/client/src/pages/Editor/IDE/ProtectedCallout.tsx b/app/client/src/pages/Editor/IDE/ProtectedCallout.tsx
new file mode 100644
index 0000000000..a1330955c2
--- /dev/null
+++ b/app/client/src/pages/Editor/IDE/ProtectedCallout.tsx
@@ -0,0 +1,65 @@
+import React from "react";
+import { Callout } from "design-system";
+import styled from "styled-components";
+import { useDispatch, useSelector } from "react-redux";
+import {
+  setShowBranchPopupAction,
+  updateGitProtectedBranchesInit,
+} from "actions/gitSyncActions";
+import { getIsUpdateProtectedBranchesLoading } from "selectors/gitSyncSelectors";
+import {
+  BRANCH_PROTECTION_CALLOUT_CREATE_BRANCH,
+  BRANCH_PROTECTION_CALLOUT_MSG,
+  BRANCH_PROTECTION_CALLOUT_UNPROTECT,
+  BRANCH_PROTECTION_CALLOUT_UNPROTECT_LOADING,
+  createMessage,
+} from "@appsmith/constants/messages";
+
+const StyledCallout = styled(Callout)`
+  height: 70px;
+  overflow-y: hidden;
+`;
+
+function ProtectedCallout() {
+  const dispatch = useDispatch();
+  const isLoading = useSelector(getIsUpdateProtectedBranchesLoading);
+
+  const handleClickOnNewBranch = () => {
+    dispatch(setShowBranchPopupAction(true));
+  };
+
+  const handleClickOnUnprotect = () => {
+    dispatch(
+      updateGitProtectedBranchesInit({
+        protectedBranches: [],
+      }),
+    );
+  };
+
+  return (
+    // @ts-expect-error Key is valid but does not exist in CalloutProps
+    <StyledCallout
+      data-testid="t--git-protected-branch-callout"
+      kind="info"
+      links={[
+        {
+          key: "create-branch",
+          children: createMessage(BRANCH_PROTECTION_CALLOUT_CREATE_BRANCH),
+          onClick: handleClickOnNewBranch,
+        },
+        {
+          key: "unprotect",
+          children: isLoading
+            ? createMessage(BRANCH_PROTECTION_CALLOUT_UNPROTECT_LOADING)
+            : createMessage(BRANCH_PROTECTION_CALLOUT_UNPROTECT),
+          onClick: handleClickOnUnprotect,
+          isDisabled: isLoading,
+        },
+      ]}
+    >
+      {createMessage(BRANCH_PROTECTION_CALLOUT_MSG)}
+    </StyledCallout>
+  );
+}
+
+export default ProtectedCallout;
diff --git a/app/client/src/pages/Editor/IDE/index.tsx b/app/client/src/pages/Editor/IDE/index.tsx
index 31feb1ddd5..2b85c08246 100644
--- a/app/client/src/pages/Editor/IDE/index.tsx
+++ b/app/client/src/pages/Editor/IDE/index.tsx
@@ -13,6 +13,8 @@ import MainPane from "./MainPane";
 import RightPane from "./RightPane";
 import classNames from "classnames";
 import { tailwindLayers } from "constants/Layers";
+import ProtectedCallout from "./ProtectedCallout";
+import { protectedModeSelector } from "selectors/gitSyncSelectors";
 
 /**
  * OldName: MainContainer
@@ -20,9 +22,11 @@ import { tailwindLayers } from "constants/Layers";
 function IDE() {
   const isPreviewMode = useSelector(previewModeSelector);
   const isCombinedPreviewMode = useSelector(combinedPreviewModeSelector);
+  const isProtectedMode = useSelector(protectedModeSelector);
 
   return (
     <>
+      {isProtectedMode && <ProtectedCallout />}
       <EditorWrapperContainer>
         <div
           className={classNames({
diff --git a/app/client/src/pages/Editor/IntegrationEditor/AIDataSources.tsx b/app/client/src/pages/Editor/IntegrationEditor/AIDataSources.tsx
index 0400acea18..a54879b248 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/AIDataSources.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/AIDataSources.tsx
@@ -4,7 +4,7 @@ import styled from "styled-components";
 import { createTempDatasourceFromForm } from "actions/datasourceActions";
 import type { AppState } from "@appsmith/reducers";
 import type { Plugin } from "api/PluginApi";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { PluginType } from "entities/Action";
 import { getAssetUrl } from "@appsmith/utils/airgapHelpers";
 
diff --git a/app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx b/app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx
index b63eaebf2f..9db95f555c 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx
@@ -17,7 +17,7 @@ import { Button, MenuContent, MenuItem, MenuTrigger } from "design-system";
 import { deleteDatasource } from "actions/datasourceActions";
 import { getGenerateCRUDEnabledPluginMap } from "@appsmith/selectors/entitiesSelector";
 import type { GenerateCRUDEnabledPluginMap, Plugin } from "api/PluginApi";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import NewActionButton from "../DataSourceEditor/NewActionButton";
 import {
   datasourcesEditorIdURL,
@@ -405,8 +405,8 @@ function DatasourceCard(props: DatasourceCardProps) {
                         {isDeletingDatasource
                           ? createMessage(CONFIRM_CONTEXT_DELETING)
                           : confirmDelete
-                          ? createMessage(CONFIRM_CONTEXT_DELETE)
-                          : createMessage(CONTEXT_DELETE)}
+                            ? createMessage(CONFIRM_CONTEXT_DELETE)
+                            : createMessage(CONTEXT_DELETE)}
                       </MenuItem>
                     )}
                   </MenuContent>
diff --git a/app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx b/app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx
index 868145b3ca..880cf92155 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx
@@ -14,7 +14,7 @@ import {
   createTempDatasourceFromForm,
 } from "actions/datasourceActions";
 import type { AppState } from "@appsmith/reducers";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getCurrentApplication } from "@appsmith/selectors/applicationSelectors";
 import type { ApplicationPayload } from "@appsmith/constants/ReduxActionConstants";
 import { getQueryParams } from "utils/URLUtils";
diff --git a/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx b/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx
index 539699b380..7a21ca10da 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx
@@ -28,7 +28,7 @@ import Debugger, {
   ResizerMainContainer,
 } from "../DataSourceEditor/Debugger";
 import { showDebuggerFlag } from "selectors/debuggerSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { DatasourceCreateEntryPoints } from "constants/Datasource";
 import { selectFeatureFlags } from "@appsmith/selectors/featureFlagsSelectors";
 import { isGACEnabled } from "@appsmith/utils/planHelpers";
diff --git a/app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx b/app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx
index ee89b54f22..472a6d00cb 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx
@@ -7,7 +7,7 @@ import { addMockDatasourceToWorkspace } from "actions/datasourceActions";
 import { getCurrentWorkspaceId } from "@appsmith/selectors/selectedWorkspaceSelectors";
 import { getQueryParams } from "utils/URLUtils";
 import type { AppState } from "@appsmith/reducers";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getAssetUrl } from "@appsmith/utils/airgapHelpers";
 import { DatasourceCreateEntryPoints } from "constants/Datasource";
 
diff --git a/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx b/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx
index 3b8af46e69..dd1f1c83f7 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx
@@ -9,7 +9,7 @@ import type { AppState } from "@appsmith/reducers";
 import CurlLogo from "assets/images/Curl-logo.svg";
 import PlusLogo from "assets/images/Plus-logo.svg";
 import type { GenerateCRUDEnabledPluginMap, Plugin } from "api/PluginApi";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { CURL } from "constants/AppsmithActionConstants/ActionConstants";
 import { PluginPackageName, PluginType } from "entities/Action";
 import { getQueryParams } from "utils/URLUtils";
diff --git a/app/client/src/pages/Editor/IntegrationEditor/UnsupportedPluginDialog.tsx b/app/client/src/pages/Editor/IntegrationEditor/UnsupportedPluginDialog.tsx
index 3f11764083..c085a3e4c9 100644
--- a/app/client/src/pages/Editor/IntegrationEditor/UnsupportedPluginDialog.tsx
+++ b/app/client/src/pages/Editor/IntegrationEditor/UnsupportedPluginDialog.tsx
@@ -9,7 +9,7 @@ import {
   ModalFooter,
 } from "design-system";
 import { UNSUPPORTED_PLUGIN_DIALOG_MAIN_HEADING } from "@appsmith/constants/messages";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import {
   UNSUPPORTED_PLUGIN_DIALOG_TITLE,
   UNSUPPORTED_PLUGIN_DIALOG_SUBTITLE,
diff --git a/app/client/src/pages/Editor/JSEditor/AppJSEditorContextMenu.tsx b/app/client/src/pages/Editor/JSEditor/AppJSEditorContextMenu.tsx
index d544768162..5e8a669c49 100644
--- a/app/client/src/pages/Editor/JSEditor/AppJSEditorContextMenu.tsx
+++ b/app/client/src/pages/Editor/JSEditor/AppJSEditorContextMenu.tsx
@@ -18,7 +18,7 @@ import {
   autoIndentCode,
   getAutoIndentShortcutKeyText,
 } from "components/editorComponents/CodeEditor/utils/autoIndentUtils";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { updateJSCollectionBody } from "actions/jsPaneActions";
 import type { IconName } from "@blueprintjs/icons";
 
diff --git a/app/client/src/pages/Editor/JSEditor/JSFunctionSettings.tsx b/app/client/src/pages/Editor/JSEditor/JSFunctionSettings.tsx
index 63ff46b820..f2f9d53385 100644
--- a/app/client/src/pages/Editor/JSEditor/JSFunctionSettings.tsx
+++ b/app/client/src/pages/Editor/JSEditor/JSFunctionSettings.tsx
@@ -7,7 +7,7 @@ import type { JSAction } from "entities/JSCollection";
 import React, { useCallback, useState } from "react";
 import styled from "styled-components";
 import { CONFIRM_BEFORE_CALLING_HEADING, SETTINGS_HEADINGS } from "./constants";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { Icon, Tooltip, Switch } from "design-system";
 import RemoveConfirmationModal from "./RemoveConfirmBeforeCallingDialog";
 
diff --git a/app/client/src/pages/Editor/MultiSelectPropertyPane/index.tsx b/app/client/src/pages/Editor/MultiSelectPropertyPane/index.tsx
index 38111a7408..c336565427 100644
--- a/app/client/src/pages/Editor/MultiSelectPropertyPane/index.tsx
+++ b/app/client/src/pages/Editor/MultiSelectPropertyPane/index.tsx
@@ -3,6 +3,7 @@ import * as Sentry from "@sentry/react";
 import {
   createMessage,
   MULTI_SELECT_PROPERTY_PANE_MESSAGE,
+  WIDGET_MULTI_SELECT,
 } from "@appsmith/constants/messages";
 import { Text, Button } from "design-system";
 import { useSelector } from "react-redux";
@@ -20,7 +21,7 @@ function MultiSelectPropertyPane() {
     <div className="relative space-y-3">
       <div className="px-3 py-3">
         <Text kind="heading-s" renderAs="h3">
-          Multi
+          {createMessage(WIDGET_MULTI_SELECT)}
         </Text>
       </div>
 
diff --git a/app/client/src/pages/Editor/PropertyPane/ConnectDataCTA.tsx b/app/client/src/pages/Editor/PropertyPane/ConnectDataCTA.tsx
index 38dd36c546..b84b07a55d 100644
--- a/app/client/src/pages/Editor/PropertyPane/ConnectDataCTA.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/ConnectDataCTA.tsx
@@ -5,7 +5,7 @@ import styled from "styled-components";
 import { useSelector } from "react-redux";
 import { INTEGRATION_EDITOR_MODES, INTEGRATION_TABS } from "constants/routes";
 import history from "utils/history";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import type { WidgetType } from "constants/WidgetConstants";
 import { integrationEditorURL } from "@appsmith/RouteBuilder";
 import { getCurrentPageId } from "selectors/editorSelectors";
diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx
index a8cf1391d2..3e1f68f210 100644
--- a/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx
@@ -8,7 +8,7 @@ import { ToggleButton, Tooltip, Button } from "design-system";
 import PropertyControlFactory from "utils/PropertyControlFactory";
 import PropertyHelpLabel from "pages/Editor/PropertyPane/PropertyHelpLabel";
 import { useDispatch, useSelector } from "react-redux";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import type { UpdateWidgetPropertyPayload } from "actions/controlActions";
 import {
   batchUpdateMultipleWidgetProperties,
@@ -860,8 +860,8 @@ const PropertyControl = memo((props: Props) => {
     const JSToggleTooltip = isToggleDisabled
       ? JS_TOGGLE_DISABLED_MESSAGE
       : !isDynamic
-      ? JS_TOGGLE_SWITCH_JS_MESSAGE
-      : "";
+        ? JS_TOGGLE_SWITCH_JS_MESSAGE
+        : "";
 
     try {
       return (
diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx
index 547fc556b2..c4338c91a1 100644
--- a/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/PropertyPaneConnections.tsx
@@ -18,7 +18,7 @@ import type { Log } from "entities/AppsmithConsole";
 import { ENTITY_TYPE } from "@appsmith/entities/AppsmithConsole/utils";
 import { DebugButton } from "components/editorComponents/Debugger/DebugCTA";
 import { showDebugger } from "actions/debuggerActions";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import type { InteractionAnalyticsEventDetail } from "utils/AppsmithUtils";
 import {
   interactionAnalyticsEvent,
diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyPaneView.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyPaneView.tsx
index 9c186f8a64..b6868a7241 100644
--- a/app/client/src/pages/Editor/PropertyPane/PropertyPaneView.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/PropertyPaneView.tsx
@@ -21,7 +21,7 @@ import type { WidgetType } from "constants/WidgetConstants";
 import { WIDGET_ID_SHOW_WALKTHROUGH } from "constants/WidgetConstants";
 import type { InteractionAnalyticsEventDetail } from "utils/AppsmithUtils";
 import { INTERACTION_ANALYTICS_EVENT } from "utils/AppsmithUtils";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { buildDeprecationWidgetMessage, isWidgetDeprecated } from "../utils";
 import { Button, Callout } from "design-system";
 import WidgetFactory from "WidgetProvider/factory";
diff --git a/app/client/src/pages/Editor/PropertyPane/propertyPaneSearch.ts b/app/client/src/pages/Editor/PropertyPane/propertyPaneSearch.ts
index 3eee21c19e..9d72945aea 100644
--- a/app/client/src/pages/Editor/PropertyPane/propertyPaneSearch.ts
+++ b/app/client/src/pages/Editor/PropertyPane/propertyPaneSearch.ts
@@ -4,7 +4,7 @@ import type {
   PropertyPaneSectionConfig,
 } from "constants/PropertyControlConstants";
 import { debounce } from "lodash";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 interface SearchResultType {
   section: {
diff --git a/app/client/src/pages/Editor/PropertyPaneHelpButton.tsx b/app/client/src/pages/Editor/PropertyPaneHelpButton.tsx
index 9f49a67960..69cdd04853 100644
--- a/app/client/src/pages/Editor/PropertyPaneHelpButton.tsx
+++ b/app/client/src/pages/Editor/PropertyPaneHelpButton.tsx
@@ -5,7 +5,7 @@ import {
   setGlobalSearchQuery,
   toggleShowGlobalSearchModal,
 } from "actions/globalSearchActions";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import WidgetFactory from "WidgetProvider/factory";
 import { getSelectedWidget } from "sagas/selectors";
 import { Icon } from "design-system";
diff --git a/app/client/src/pages/Editor/QueryEditor/BindDataButton.tsx b/app/client/src/pages/Editor/QueryEditor/BindDataButton.tsx
index db8db78f0a..90d1b81a5a 100644
--- a/app/client/src/pages/Editor/QueryEditor/BindDataButton.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/BindDataButton.tsx
@@ -28,7 +28,7 @@ import { getWidgets } from "sagas/selectors";
 import type { FlattenedWidgetProps } from "reducers/entityReducers/canvasWidgetsStructureReducer";
 import { WDS_V2_WIDGET_MAP } from "widgets/wds/constants";
 import { getNextWidgetName } from "sagas/WidgetOperationUtils";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { addSuggestedWidget } from "actions/widgetActions";
 import { getDataTree } from "selectors/dataTreeSelectors";
 import { ASSETS_CDN_URL } from "constants/ThirdPartyConstants";
diff --git a/app/client/src/pages/Editor/QueryEditor/Editor.tsx b/app/client/src/pages/Editor/QueryEditor/Editor.tsx
index 7dab744921..05b4717b8a 100644
--- a/app/client/src/pages/Editor/QueryEditor/Editor.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/Editor.tsx
@@ -33,7 +33,7 @@ import CenteredWrapper from "components/designSystems/appsmith/CenteredWrapper";
 import PerformanceTracker, {
   PerformanceTransactionName,
 } from "utils/PerformanceTracker";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { initFormEvaluations } from "actions/evaluationActions";
 import { getUIComponent } from "./helpers";
 import type { Diff } from "deep-diff";
diff --git a/app/client/src/pages/Editor/QueryEditor/QueryResponseTab.tsx b/app/client/src/pages/Editor/QueryEditor/QueryResponseTab.tsx
index 6f692f14f6..18d851e80a 100644
--- a/app/client/src/pages/Editor/QueryEditor/QueryResponseTab.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/QueryResponseTab.tsx
@@ -16,7 +16,7 @@ import { JsonWrapper } from "components/editorComponents/Debugger/ErrorLogs/comp
 import { Callout, Flex, SegmentedControl } from "design-system";
 import styled from "styled-components";
 import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/helpers";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { setActionResponseDisplayFormat } from "actions/pluginActionActions";
 import { getUpdateTimestamp } from "components/editorComponents/Debugger/ErrorLogs/ErrorLogItem";
 import type { SourceEntity } from "entities/AppsmithConsole";
diff --git a/app/client/src/pages/Editor/QueryEditor/Table.tsx b/app/client/src/pages/Editor/QueryEditor/Table.tsx
index 11893aa958..c2a31477f1 100644
--- a/app/client/src/pages/Editor/QueryEditor/Table.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/Table.tsx
@@ -195,7 +195,11 @@ const renderCell = (props: any) => {
   }
 
   return (
-    <AutoToolTipComponent title={displayValue}>
+    <AutoToolTipComponent
+      boundary="viewport"
+      position="left"
+      title={displayValue}
+    >
       {displayValue}
     </AutoToolTipComponent>
   );
@@ -351,7 +355,11 @@ function Table(props: TableProps) {
                               : "hidden-header"
                           }
                         >
-                          <AutoToolTipComponent title={column.render("Header")}>
+                          <AutoToolTipComponent
+                            boundary="viewport"
+                            position="left"
+                            title={column.render("Header")}
+                          >
                             {column.render("Header")}
                             {shouldResize && (
                               <div
diff --git a/app/client/src/pages/Editor/QueryEditor/TemplateMenu.tsx b/app/client/src/pages/Editor/QueryEditor/TemplateMenu.tsx
index 685b32817f..5954645aa8 100644
--- a/app/client/src/pages/Editor/QueryEditor/TemplateMenu.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/TemplateMenu.tsx
@@ -3,7 +3,7 @@ import styled from "styled-components";
 import { connect } from "react-redux";
 import type { AppState } from "@appsmith/reducers";
 import { getPluginTemplates } from "@appsmith/selectors/entitiesSelector";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 const Container = styled.div`
   display: flex;
diff --git a/app/client/src/pages/Editor/QueryEditor/index.tsx b/app/client/src/pages/Editor/QueryEditor/index.tsx
index 54f39afd37..2569239180 100644
--- a/app/client/src/pages/Editor/QueryEditor/index.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/index.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useMemo } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import type { RouteComponentProps } from "react-router";
 
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import Editor from "./Editor";
 import history from "utils/history";
 import MoreActionsMenu from "../Explorer/Actions/MoreActionsMenu";
diff --git a/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx b/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx
index 0bd9f0b522..89d0996bbc 100644
--- a/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx
+++ b/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx
@@ -80,7 +80,7 @@ import DSDataFilter from "@appsmith/components/DSDataFilter";
 import { DSEditorWrapper } from "../DataSourceEditor";
 import type { DatasourceFilterState } from "../DataSourceEditor";
 import { getQueryParams } from "utils/URLUtils";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getDefaultEnvironmentId } from "@appsmith/selectors/environmentSelectors";
 import { DEFAULT_ENV_ID } from "@appsmith/api/ApiUtils";
 import {
diff --git a/app/client/src/pages/Editor/SaaSEditor/GoogleSheetFilePicker.tsx b/app/client/src/pages/Editor/SaaSEditor/GoogleSheetFilePicker.tsx
index 94d23556f5..1bb68a828a 100644
--- a/app/client/src/pages/Editor/SaaSEditor/GoogleSheetFilePicker.tsx
+++ b/app/client/src/pages/Editor/SaaSEditor/GoogleSheetFilePicker.tsx
@@ -4,7 +4,7 @@ import { FilePickerActionStatus } from "entities/Datasource";
 import { useDispatch } from "react-redux";
 import { filePickerCallbackAction } from "actions/datasourceActions";
 import { GOOGLE_SHEET_FILE_PICKER_OVERLAY_CLASS } from "constants/Datasource";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import {
   createMessage,
   GOOGLE_SHEETS_FILE_PICKER_TITLE,
diff --git a/app/client/src/pages/Editor/ThemePropertyPane/ThemeCard.tsx b/app/client/src/pages/Editor/ThemePropertyPane/ThemeCard.tsx
index 53e6e97e98..09c007f9bd 100644
--- a/app/client/src/pages/Editor/ThemePropertyPane/ThemeCard.tsx
+++ b/app/client/src/pages/Editor/ThemePropertyPane/ThemeCard.tsx
@@ -14,7 +14,7 @@ import {
   getAppThemingStack,
 } from "selectors/appThemingSelectors";
 import type { AppTheme } from "entities/AppTheming";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import DeleteThemeModal from "./DeleteThemeModal";
 import { getComplementaryGrayscaleColor } from "widgets/WidgetUtils";
 import { getCurrentApplicationId } from "selectors/editorSelectors";
diff --git a/app/client/src/pages/Editor/ThemePropertyPane/ThemeEditor.tsx b/app/client/src/pages/Editor/ThemePropertyPane/ThemeEditor.tsx
index 635ddbcabc..4909c1d55c 100644
--- a/app/client/src/pages/Editor/ThemePropertyPane/ThemeEditor.tsx
+++ b/app/client/src/pages/Editor/ThemePropertyPane/ThemeEditor.tsx
@@ -16,7 +16,7 @@ import {
 } from "actions/appThemingActions";
 import SettingSection from "./SettingSection";
 import type { AppTheme } from "entities/AppTheming";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import ThemeFontControl from "./controls/ThemeFontControl";
 import ThemeColorControl from "./controls/ThemeColorControl";
 import { Classes as CsClasses } from "design-system-old";
diff --git a/app/client/src/pages/Editor/WidgetsEditor/components/CodeModeTooltip.tsx b/app/client/src/pages/Editor/WidgetsEditor/components/CodeModeTooltip.tsx
index 50ec4ec66b..936515c6b8 100644
--- a/app/client/src/pages/Editor/WidgetsEditor/components/CodeModeTooltip.tsx
+++ b/app/client/src/pages/Editor/WidgetsEditor/components/CodeModeTooltip.tsx
@@ -8,6 +8,8 @@ import {
   CANVAS_VIEW_MODE_TOOLTIP,
   createMessage,
 } from "@appsmith/constants/messages";
+import { useCurrentAppState } from "pages/Editor/IDE/hooks";
+import { EditorState } from "@appsmith/entities/IDE/constants";
 
 /**
  * CodeModeTooltip
@@ -17,6 +19,7 @@ import {
 
 const CodeModeTooltip = (props: { children: React.ReactElement }) => {
   const isWidgetSelectionBlock = useSelector(getWidgetSelectionBlock);
+  const editorState = useCurrentAppState();
   const [shouldShow, setShouldShow] = useState<boolean>(false);
   useEffect(() => {
     retrieveCodeWidgetNavigationUsed()
@@ -30,6 +33,7 @@ const CodeModeTooltip = (props: { children: React.ReactElement }) => {
       });
   }, [isWidgetSelectionBlock]);
   if (!isWidgetSelectionBlock) return props.children;
+  if (editorState !== EditorState.EDITOR) return props.children;
   return (
     <Tooltip
       content={createMessage(CANVAS_VIEW_MODE_TOOLTIP, `${modText()}`)}
diff --git a/app/client/src/pages/Editor/WidgetsEditor/components/EmptyCanvasPrompts.tsx b/app/client/src/pages/Editor/WidgetsEditor/components/EmptyCanvasPrompts.tsx
index a489a079d1..71dfa584ba 100644
--- a/app/client/src/pages/Editor/WidgetsEditor/components/EmptyCanvasPrompts.tsx
+++ b/app/client/src/pages/Editor/WidgetsEditor/components/EmptyCanvasPrompts.tsx
@@ -6,7 +6,7 @@ import {
   selectURLSlugs,
   showCanvasTopSectionSelector,
 } from "selectors/editorSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import history from "utils/history";
 import { generateTemplateFormURL } from "@appsmith/RouteBuilder";
 import { useParams } from "react-router";
diff --git a/app/client/src/pages/Editor/WidgetsEditor/index.tsx b/app/client/src/pages/Editor/WidgetsEditor/index.tsx
index 10030e8d6b..52c5728558 100644
--- a/app/client/src/pages/Editor/WidgetsEditor/index.tsx
+++ b/app/client/src/pages/Editor/WidgetsEditor/index.tsx
@@ -5,7 +5,7 @@ import {
   getCurrentPageId,
   getCurrentPageName,
 } from "selectors/editorSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import PerformanceTracker, {
   PerformanceTransactionName,
 } from "utils/PerformanceTracker";
diff --git a/app/client/src/pages/Editor/commons/EditorWrapperContainer.tsx b/app/client/src/pages/Editor/commons/EditorWrapperContainer.tsx
index 1dba658cb0..9bbd48c2e0 100644
--- a/app/client/src/pages/Editor/commons/EditorWrapperContainer.tsx
+++ b/app/client/src/pages/Editor/commons/EditorWrapperContainer.tsx
@@ -3,29 +3,34 @@ import styled from "styled-components";
 import classNames from "classnames";
 import { useSelector } from "react-redux";
 import { combinedPreviewModeSelector } from "../../../selectors/editorSelectors";
+import { protectedModeSelector } from "selectors/gitSyncSelectors";
 
 interface EditorWrapperContainerProps {
   children: React.ReactNode;
 }
 
-const Wrapper = styled.div`
+const Wrapper = styled.div<{
+  isProtectedMode: boolean;
+}>`
   display: flex;
   height: calc(
     100vh - ${(props) => props.theme.smallHeaderHeight} -
-      ${(props) => props.theme.bottomBarHeight}
+      ${(props) => props.theme.bottomBarHeight} -
+      ${(props) => (props.isProtectedMode ? "70px" : "0px")}
   );
   background-color: ${(props) => props.theme.appBackground};
 `;
 
 function EditorWrapperContainer({ children }: EditorWrapperContainerProps) {
   const isCombinedPreviewMode = useSelector(combinedPreviewModeSelector);
-
+  const isProtectedMode = useSelector(protectedModeSelector);
   return (
     <Wrapper
       className={classNames({
         [`relative w-full overflow-x-hidden`]: true,
         "select-none": !isCombinedPreviewMode,
       })}
+      isProtectedMode={isProtectedMode}
     >
       {children}
     </Wrapper>
diff --git a/app/client/src/pages/Editor/gitSync/DisableAutocommitModal.tsx b/app/client/src/pages/Editor/gitSync/DisableAutocommitModal.tsx
index a2e5322e3e..d5c3f3713f 100644
--- a/app/client/src/pages/Editor/gitSync/DisableAutocommitModal.tsx
+++ b/app/client/src/pages/Editor/gitSync/DisableAutocommitModal.tsx
@@ -23,7 +23,7 @@ import {
   getIsAutocommitModalOpen,
   getIsAutocommitToggling,
 } from "selectors/gitSyncSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 function DisableAutocommitModal() {
   const isAutocommitModalOpen = useSelector(getIsAutocommitModalOpen);
diff --git a/app/client/src/pages/Editor/gitSync/DisconnectGitModal.tsx b/app/client/src/pages/Editor/gitSync/DisconnectGitModal.tsx
index 8414c89c5b..1ff0469160 100644
--- a/app/client/src/pages/Editor/gitSync/DisconnectGitModal.tsx
+++ b/app/client/src/pages/Editor/gitSync/DisconnectGitModal.tsx
@@ -31,7 +31,7 @@ import {
   NONE_REVERSIBLE_MESSAGE,
   REVOKE,
 } from "@appsmith/constants/messages";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { Space } from "./components/StyledComponents";
 import { GitSettingsTab } from "reducers/uiReducers/gitSyncReducer";
 
diff --git a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitDefaultBranch.tsx b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitDefaultBranch.tsx
index d60210847e..e2347acced 100644
--- a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitDefaultBranch.tsx
+++ b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitDefaultBranch.tsx
@@ -14,7 +14,7 @@ import styled from "styled-components";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
 import { useAppsmithEnterpriseLink } from "./hooks";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 const Container = styled.div`
   padding-top: 8px;
diff --git a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitProtectedBranches.tsx b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitProtectedBranches.tsx
index 870b9fb670..aee7db6069 100644
--- a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitProtectedBranches.tsx
+++ b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/GitProtectedBranches.tsx
@@ -22,7 +22,7 @@ import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
 import { useAppsmithEnterpriseLink } from "./hooks";
 import { REMOTE_BRANCH_PREFIX } from "../../constants";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { DOCS_BRANCH_PROTECTION_URL } from "constants/ThirdPartyConstants";
 
 const Container = styled.div`
diff --git a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/hooks.ts b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/hooks.ts
index 9ef7608e7c..03dd575fc5 100644
--- a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/hooks.ts
+++ b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabBranch/hooks.ts
@@ -1,13 +1,16 @@
-import { getInstanceId } from "@appsmith/selectors/tenantSelectors";
-import { getAppsmithConfigs } from "@appsmith/configs";
+import { getInstanceId, isFreePlan } from "@appsmith/selectors/tenantSelectors";
 import { useSelector } from "react-redux";
 import { ENTERPRISE_PRICING_PAGE } from "constants/ThirdPartyConstants";
 import { useMemo } from "react";
+import { getUserSource } from "@appsmith/utils/AnalyticsUtil";
 
 export const useAppsmithEnterpriseLink = (feature: string) => {
   const instanceId = useSelector(getInstanceId);
-  const { cloudHosting } = getAppsmithConfigs();
-  const source = cloudHosting ? "cloud" : "ce";
+  const freePlan = useSelector(isFreePlan);
+  let source = getUserSource();
+  if (source === "ee" && freePlan) {
+    source = "ce";
+  }
   const constructedUrl = useMemo(() => {
     const url = new URL(ENTERPRISE_PRICING_PAGE);
     if (source) url.searchParams.append("source", source);
diff --git a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabGeneral/DangerZone.tsx b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabGeneral/DangerZone.tsx
index 1bc145dea8..856fe0c7d0 100644
--- a/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabGeneral/DangerZone.tsx
+++ b/app/client/src/pages/Editor/gitSync/GitSettingsModal/TabGeneral/DangerZone.tsx
@@ -26,7 +26,7 @@ import {
   getIsAutocommitToggling,
 } from "selectors/gitSyncSelectors";
 import styled from "styled-components";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import {
   useHasConnectToGitPermission,
diff --git a/app/client/src/pages/Editor/gitSync/GitSyncModal/GitSyncModalV1.tsx b/app/client/src/pages/Editor/gitSync/GitSyncModal/GitSyncModalV1.tsx
index 8715a75e08..772421dbad 100644
--- a/app/client/src/pages/Editor/gitSync/GitSyncModal/GitSyncModalV1.tsx
+++ b/app/client/src/pages/Editor/gitSync/GitSyncModal/GitSyncModalV1.tsx
@@ -15,7 +15,7 @@ import GitConnection from "../Tabs/GitConnection";
 
 import GitErrorPopup from "../components/GitErrorPopup";
 import styled from "styled-components";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { Modal, ModalContent, ModalHeader } from "design-system";
 import {
   createMessage,
diff --git a/app/client/src/pages/Editor/gitSync/GitSyncModal/GitSyncModalV2.tsx b/app/client/src/pages/Editor/gitSync/GitSyncModal/GitSyncModalV2.tsx
index 9b10a061ae..5030b00171 100644
--- a/app/client/src/pages/Editor/gitSync/GitSyncModal/GitSyncModalV2.tsx
+++ b/app/client/src/pages/Editor/gitSync/GitSyncModal/GitSyncModalV2.tsx
@@ -22,7 +22,7 @@ import {
   MERGE,
   IMPORT_APP,
 } from "@appsmith/constants/messages";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { Modal, ModalContent, ModalHeader } from "design-system";
 import GitConnectionV2 from "../Tabs/GitConnectionV2";
 import { GitSyncModalTab } from "entities/GitSync";
diff --git a/app/client/src/pages/Editor/gitSync/QuickGitActions/BranchButton.tsx b/app/client/src/pages/Editor/gitSync/QuickGitActions/BranchButton.tsx
index 0a87185fca..16a9fd459e 100644
--- a/app/client/src/pages/Editor/gitSync/QuickGitActions/BranchButton.tsx
+++ b/app/client/src/pages/Editor/gitSync/QuickGitActions/BranchButton.tsx
@@ -1,6 +1,6 @@
-import React, { useEffect, useRef, useState } from "react";
+import React, { useRef } from "react";
 import styled from "styled-components";
-import { useSelector } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 
 import { Popover2 } from "@blueprintjs/popover2";
 import "@blueprintjs/popover2/lib/css/blueprint-popover2.css";
@@ -10,16 +10,13 @@ import BranchList from "../components/BranchList";
 import {
   getGitStatus,
   protectedModeSelector,
+  showBranchPopupSelector,
 } from "selectors/gitSyncSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
-import { Button, Icon, Text, Tooltip } from "design-system";
-import { isEllipsisActive } from "../../../../utils/helpers";
-import {
-  BRANCH_TOOLTIP_MESSAGE,
-  BRANCH_TOOLTIP_TITLE,
-  createMessage,
-} from "@appsmith/constants/messages";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
+import { Button, Icon, Tooltip } from "design-system";
+import { isEllipsisActive } from "utils/helpers";
 import { importRemixIcon } from "design-system-old";
+import { setShowBranchPopupAction } from "actions/gitSyncActions";
 
 const ProtectedIcon = importRemixIcon(
   async () => import("remixicon-react/ShieldKeyholeLineIcon"),
@@ -33,24 +30,18 @@ const ButtonContainer = styled(Button)`
   min-width: unset !important;
 `;
 
-const TooltipText = styled(Text)`
-  font-size: 12px;
-  color: #fff;
-`;
-
 function BranchButton() {
+  const dispatch = useDispatch();
   const gitMetaData = useSelector(getCurrentAppGitMetaData);
   const isProtectedMode = useSelector(protectedModeSelector);
   const currentBranch = gitMetaData?.branchName;
-  const [isOpen, setIsOpen] = useState(false);
   const labelTarget = useRef<HTMLSpanElement>(null);
   const status = useSelector(getGitStatus);
-  const [showProtectedBranchTooltip, setShowProtectedBranchTooltip] =
-    useState(false);
+  const isOpen = useSelector(showBranchPopupSelector);
 
-  useEffect(() => {
-    setShowProtectedBranchTooltip(!!isProtectedMode);
-  }, [isProtectedMode]);
+  const setIsOpen = (isOpen: boolean) => {
+    dispatch(setShowBranchPopupAction(isOpen));
+  };
 
   return (
     <Popover2
@@ -71,57 +62,35 @@ function BranchButton() {
       placement="top-start"
     >
       <Tooltip
-        content={
-          <>
-            <TooltipText
-              renderAs="p"
-              style={{ fontWeight: "bold", marginBottom: 16 }}
-            >
-              {createMessage(BRANCH_TOOLTIP_TITLE)}
-            </TooltipText>
-            <TooltipText renderAs="p">
-              {createMessage(BRANCH_TOOLTIP_MESSAGE)}
-            </TooltipText>
-          </>
-        }
-        defaultVisible
-        isDisabled={!isProtectedMode || isOpen}
-        onVisibleChange={(v) => setShowProtectedBranchTooltip(v)}
+        content={currentBranch || ""}
+        isDisabled={!isEllipsisActive(labelTarget.current)}
         placement="topLeft"
-        trigger={["hover", "click"]}
-        visible={showProtectedBranchTooltip}
       >
-        <Tooltip
-          content={currentBranch || ""}
-          isDisabled={!isEllipsisActive(labelTarget.current)}
-          placement="topLeft"
+        <ButtonContainer
+          className="t--branch-button"
+          data-testid={"t--branch-button-currentBranch"}
+          kind="secondary"
         >
-          <ButtonContainer
-            className="t--branch-button"
-            data-testid={"t--branch-button-currentBranch"}
-            kind="secondary"
+          {isProtectedMode ? (
+            <ProtectedIcon
+              style={{ height: 14, width: 14, marginRight: 4, marginTop: 1 }}
+            />
+          ) : (
+            <Icon name={"git-branch"} style={{ marginRight: 4 }} />
+          )}
+          <span
+            ref={labelTarget}
+            style={{
+              maxWidth: "82px",
+              whiteSpace: "nowrap",
+              overflow: "hidden",
+              textOverflow: "ellipsis",
+            }}
           >
-            {isProtectedMode ? (
-              <ProtectedIcon
-                style={{ height: 14, width: 14, marginRight: 4, marginTop: 1 }}
-              />
-            ) : (
-              <Icon name={"git-branch"} style={{ marginRight: 4 }} />
-            )}
-            <span
-              ref={labelTarget}
-              style={{
-                maxWidth: "82px",
-                whiteSpace: "nowrap",
-                overflow: "hidden",
-                textOverflow: "ellipsis",
-              }}
-            >
-              {currentBranch}
-            </span>
-            {!status?.isClean && !isProtectedMode && "*"}
-          </ButtonContainer>
-        </Tooltip>
+            {currentBranch}
+          </span>
+          {!status?.isClean && !isProtectedMode && "*"}
+        </ButtonContainer>
       </Tooltip>
     </Popover2>
   );
diff --git a/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx b/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx
index f16f434e53..ec6d3ef6b1 100644
--- a/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx
+++ b/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx
@@ -42,7 +42,7 @@ import {
 import SpinnerLoader from "pages/common/SpinnerLoader";
 import { getTypographyByKey } from "design-system-old";
 import { Button, Icon, Tooltip } from "design-system";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
 import AutocommitStatusbar from "./AutocommitStatusbar";
diff --git a/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx b/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx
index 6a732e4095..e832a27cdf 100644
--- a/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx
+++ b/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx
@@ -40,7 +40,7 @@ import {
 } from "@appsmith/actions/applicationActions";
 import type { Datasource } from "entities/Datasource";
 import DatasourceForm from "../DataSourceEditor";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { useQuery } from "../utils";
 import ListItemWrapper from "./components/DatasourceListItem";
 import { getDefaultPageId } from "@appsmith/sagas/ApplicationSagas";
@@ -305,8 +305,8 @@ function ReconnectDatasourceModal() {
           currentEnvDetails.id,
         )
       : ds.datasourceStorages
-      ? isEnvironmentConfigured(ds, currentEnvDetails.id)
-      : false;
+        ? isEnvironmentConfigured(ds, currentEnvDetails.id)
+        : false;
     return output;
   };
 
diff --git a/app/client/src/pages/Editor/gitSync/RepoLimitExceededErrorModal.tsx b/app/client/src/pages/Editor/gitSync/RepoLimitExceededErrorModal.tsx
index ff8d4f52c3..48bf2a92cc 100644
--- a/app/client/src/pages/Editor/gitSync/RepoLimitExceededErrorModal.tsx
+++ b/app/client/src/pages/Editor/gitSync/RepoLimitExceededErrorModal.tsx
@@ -39,7 +39,7 @@ import {
 } from "@appsmith/selectors/applicationSelectors";
 import type { ApplicationPayload } from "@appsmith/constants/ReduxActionConstants";
 import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { Space } from "./components/StyledComponents";
 import { getFetchedWorkspaces } from "@appsmith/selectors/workspaceSelectors";
 import { getApplicationsOfWorkspace } from "@appsmith/selectors/selectedWorkspaceSelectors";
diff --git a/app/client/src/pages/Editor/gitSync/Tabs/ConnectionSuccess.tsx b/app/client/src/pages/Editor/gitSync/Tabs/ConnectionSuccess.tsx
index 94c99d2343..c42128858d 100644
--- a/app/client/src/pages/Editor/gitSync/Tabs/ConnectionSuccess.tsx
+++ b/app/client/src/pages/Editor/gitSync/Tabs/ConnectionSuccess.tsx
@@ -19,7 +19,7 @@ import React, { useEffect } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import styled from "styled-components";
 import { getCurrentAppGitMetaData } from "@appsmith/selectors/applicationSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { GitSettingsTab } from "reducers/uiReducers/gitSyncReducer";
 
 const Container = styled.div``;
diff --git a/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx b/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx
index 626f692f9d..f7170da190 100644
--- a/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx
+++ b/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx
@@ -56,7 +56,7 @@ import GitChangesList from "../components/GitChangesList";
 import ConflictInfo from "../components/ConflictInfo";
 
 import { isEllipsisActive, isMacOrIOS } from "utils/helpers";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import {
   getApplicationLastDeployedAt,
   getCurrentApplication,
diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitConnection.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitConnection.tsx
index c6f778846a..1f21a5d690 100644
--- a/app/client/src/pages/Editor/gitSync/Tabs/GitConnection.tsx
+++ b/app/client/src/pages/Editor/gitSync/Tabs/GitConnection.tsx
@@ -68,7 +68,7 @@ import {
   ModalBody,
   ModalFooter,
 } from "design-system";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { GIT_DOC_URLs, isValidGitRemoteUrl } from "../utils";
 import { useGitConnect, useSSHKeyPair } from "../hooks";
 
@@ -498,8 +498,8 @@ function GitConnection({ isImport }: Props) {
             {isImport
               ? createMessage(IMPORT_BTN_LABEL)
               : isGitConnected
-              ? createMessage(UPDATE_CONFIG)
-              : createMessage(CONNECT_BTN_LABEL)}
+                ? createMessage(UPDATE_CONFIG)
+                : createMessage(CONNECT_BTN_LABEL)}
           </Button>
         ) : null}
       </ModalFooter>
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 bca05c7d55..8435c34e61 100644
--- a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/AddDeployKey.tsx
+++ b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/AddDeployKey.tsx
@@ -23,7 +23,7 @@ import {
 } from "design-system";
 import styled from "styled-components";
 import { CopyButton } from "../../components/CopyButton";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import {
   ADD_DEPLOY_KEY_STEP_TITLE,
   CONSENT_ADDED_DEPLOY_KEY,
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 02e7657649..be2e1158ec 100644
--- a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/ChooseGitProvider.tsx
+++ b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/ChooseGitProvider.tsx
@@ -41,7 +41,7 @@ import {
   NEED_EMPTY_REPO_MESSAGE,
   createMessage,
 } from "@appsmith/constants/messages";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getCurrentApplicationId } from "selectors/editorSelectors";
 
 const WellInnerContainer = styled.div`
diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/index.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/index.tsx
index 8204c2c034..7c351d9b91 100644
--- a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/index.tsx
+++ b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/index.tsx
@@ -24,7 +24,7 @@ import {
   createMessage,
 } from "@appsmith/constants/messages";
 import GitSyncStatusbar from "../../components/Statusbar";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 const StyledModalBody = styled(ModalBody)`
   flex: 1;
diff --git a/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx b/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx
index 8ba4e1b738..27e8c0ebd6 100644
--- a/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx
+++ b/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx
@@ -2,6 +2,7 @@ import React, { useCallback, useEffect, useMemo, useState } from "react";
 import { Container, Space } from "../components/StyledComponents";
 
 import {
+  BRANCH_PROTECTION_PROTECTED,
   CANNOT_MERGE_DUE_TO_UNCOMMITTED_CHANGES,
   createMessage,
   FETCH_GIT_STATUS,
@@ -51,7 +52,7 @@ import {
   ModalFooter,
   ModalBody,
 } from "design-system";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import type { Theme } from "constants/DefaultTheme";
 
 const Row = styled.div`
@@ -113,10 +114,7 @@ export default function Merge() {
       if (index === gitBranches.length) break;
       const branchObj = gitBranches[index];
 
-      if (
-        currentBranch !== branchObj.branchName &&
-        !protectedBranches.includes(branchObj.branchName)
-      ) {
+      if (currentBranch !== branchObj.branchName) {
         if (!branchObj.default) {
           branchOptions.push({
             label: branchObj.branchName,
@@ -248,9 +246,19 @@ export default function Merge() {
               size="md"
               value={selectedBranchOption}
             >
-              {branchList.map((branch) => (
-                <Option key={branch.value}>{branch.value}</Option>
-              ))}
+              {branchList.map((branch) => {
+                const isProtected = protectedBranches.includes(
+                  branch?.value ?? "",
+                );
+                return (
+                  <Option disabled={isProtected} key={branch.value}>
+                    {branch.value}
+                    {isProtected
+                      ? ` (${createMessage(BRANCH_PROTECTION_PROTECTED)})`
+                      : ""}
+                  </Option>
+                );
+              })}
             </Select>
 
             <Space horizontal size={3} />
diff --git a/app/client/src/pages/Editor/gitSync/components/BranchList.tsx b/app/client/src/pages/Editor/gitSync/components/BranchList.tsx
index 9dad11ebaf..62b9348456 100644
--- a/app/client/src/pages/Editor/gitSync/components/BranchList.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/BranchList.tsx
@@ -44,7 +44,7 @@ import {
   isRemoteBranch,
   removeSpecialChars,
 } from "pages/Editor/gitSync/utils";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { useActiveHoverIndex, useFilteredBranches } from "../hooks";
 import { BranchListItemContainer } from "./BranchListItemContainer";
 import { RemoteBranchList } from "./RemoteBranchList";
diff --git a/app/client/src/pages/Editor/gitSync/components/BranchMoreMenu.tsx b/app/client/src/pages/Editor/gitSync/components/BranchMoreMenu.tsx
index 10abb2abfc..8aa97261f9 100644
--- a/app/client/src/pages/Editor/gitSync/components/BranchMoreMenu.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/BranchMoreMenu.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { deleteBranchInit } from "actions/gitSyncActions";
 import { useDispatch, useSelector } from "react-redux";
 import {
diff --git a/app/client/src/pages/Editor/gitSync/components/CredentialMode.tsx b/app/client/src/pages/Editor/gitSync/components/CredentialMode.tsx
index b598ad3e66..9af79be6d3 100644
--- a/app/client/src/pages/Editor/gitSync/components/CredentialMode.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/CredentialMode.tsx
@@ -40,9 +40,9 @@ export const Radio = styled.label<{
         flex-basis: calc(100% / ${props.columns});
         `
       : props.rows && props.rows > 0
-      ? `
+        ? `
         margin-bottom: ${props.theme.spaces[11] + 1}px;`
-      : null};
+        : null};
 
   input {
     position: absolute;
diff --git a/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx b/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx
index 81ee3a17ea..a4645db410 100644
--- a/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx
@@ -13,7 +13,7 @@ import {
 } from "@appsmith/constants/messages";
 import SuccessTick from "pages/common/SuccessTick";
 import { howMuchTimeBeforeText } from "utils/helpers";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 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/ssh-key/index.tsx b/app/client/src/pages/Editor/gitSync/components/ssh-key/index.tsx
index 5c6c43d0fa..54e9730bb6 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
@@ -5,7 +5,7 @@ import {
 } from "@appsmith/constants/messages";
 import React, { useCallback, useState } from "react";
 import { Space } from "pages/Editor/gitSync/components/StyledComponents";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { useSSHKeyPair } from "../../hooks";
 import {
   DeployedKeyContainer,
diff --git a/app/client/src/pages/Editor/index.tsx b/app/client/src/pages/Editor/index.tsx
index 366a6b8d2f..c0af974c7c 100644
--- a/app/client/src/pages/Editor/index.tsx
+++ b/app/client/src/pages/Editor/index.tsx
@@ -45,6 +45,8 @@ import DisableAutocommitModal from "./gitSync/DisableAutocommitModal";
 import GitSettingsModal from "./gitSync/GitSettingsModal";
 import ReconfigureCDKeyModal from "@appsmith/components/gitComponents/ReconfigureCDKeyModal";
 import DisableCDModal from "@appsmith/components/gitComponents/DisableCDModal";
+import { PartialExportModal } from "components/editorComponents/PartialImportExport/PartialExportModal";
+import { PartialImportModal } from "components/editorComponents/PartialImportExport/PartialImportModal";
 
 interface EditorProps {
   currentApplicationId?: string;
@@ -178,6 +180,8 @@ class Editor extends Component<Props> {
             <ImportedApplicationSuccessModal />
             <ReconnectDatasourceModal />
             <SignpostingOverlay />
+            <PartialExportModal />
+            <PartialImportModal />
           </GlobalHotKeys>
         </div>
         <RequestConfirmationModal />
diff --git a/app/client/src/pages/Editor/widgetSidebar/UIEntitySidebar.tsx b/app/client/src/pages/Editor/widgetSidebar/UIEntitySidebar.tsx
index c35b78e3d7..c43d9d6720 100644
--- a/app/client/src/pages/Editor/widgetSidebar/UIEntitySidebar.tsx
+++ b/app/client/src/pages/Editor/widgetSidebar/UIEntitySidebar.tsx
@@ -1,4 +1,5 @@
 import {
+  UI_ELEMENT_PANEL_SEARCH_TEXT,
   WIDGET_PANEL_EMPTY_MESSAGE,
   createMessage,
 } from "@appsmith/constants/messages";
@@ -12,7 +13,7 @@ import { SearchInput, Text } from "design-system";
 import Fuse from "fuse.js";
 import { debounce } from "lodash";
 import React, { useEffect, useMemo, useRef, useState } from "react";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { groupWidgetCardsByTags } from "../utils";
 import UIEntityTagGroup from "./UIEntityTagGroup";
 import { useUIExplorerItems } from "./hooks";
@@ -103,7 +104,7 @@ function UIEntitySidebar({
           autoComplete="off"
           id={ENTITY_EXPLORER_SEARCH_ID}
           onChange={search}
-          placeholder="Search widgets"
+          placeholder={createMessage(UI_ELEMENT_PANEL_SEARCH_TEXT)}
           ref={searchInputRef}
           type="text"
         />
diff --git a/app/client/src/pages/Editor/widgetSidebar/WidgetCard.tsx b/app/client/src/pages/Editor/widgetSidebar/WidgetCard.tsx
index ebcf2c804e..9b85e1bc0f 100644
--- a/app/client/src/pages/Editor/widgetSidebar/WidgetCard.tsx
+++ b/app/client/src/pages/Editor/widgetSidebar/WidgetCard.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import type { WidgetCardProps } from "widgets/BaseWidget";
 import styled from "styled-components";
 import { useWidgetDragResize } from "utils/hooks/dragResizeHooks";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { generateReactKey } from "utils/generators";
 import { Text } from "design-system";
 
diff --git a/app/client/src/pages/Templates/Template/RequestTemplate.tsx b/app/client/src/pages/Templates/Template/RequestTemplate.tsx
index 883de232d1..d5adee2d27 100644
--- a/app/client/src/pages/Templates/Template/RequestTemplate.tsx
+++ b/app/client/src/pages/Templates/Template/RequestTemplate.tsx
@@ -10,7 +10,7 @@ import {
   REQUEST_TEMPLATE,
   REQUEST_BUILDING_BLOCK,
 } from "@appsmith/constants/messages";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 const Wrapper = styled.div`
   border: 1px solid var(--ads-v2-color-border);
diff --git a/app/client/src/pages/Templates/TemplateFilters/index.tsx b/app/client/src/pages/Templates/TemplateFilters/index.tsx
index 6aa81c4b0f..e5e21e418e 100644
--- a/app/client/src/pages/Templates/TemplateFilters/index.tsx
+++ b/app/client/src/pages/Templates/TemplateFilters/index.tsx
@@ -13,7 +13,7 @@ import {
   getTemplateSearchQuery,
   isFetchingTemplatesSelector,
 } from "selectors/templatesSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import {
   FilterCategoryWrapper,
   FilterItemText,
diff --git a/app/client/src/pages/Templates/TemplateView.tsx b/app/client/src/pages/Templates/TemplateView.tsx
index d71fa5717b..56434dab01 100644
--- a/app/client/src/pages/Templates/TemplateView.tsx
+++ b/app/client/src/pages/Templates/TemplateView.tsx
@@ -18,7 +18,7 @@ import type { AppState } from "@appsmith/reducers";
 import history from "utils/history";
 import { TEMPLATES_PATH } from "constants/routes";
 import { Colors } from "constants/Colors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import ReconnectDatasourceModal from "pages/Editor/gitSync/ReconnectDatasourceModal";
 import TemplateDescription from "./Template/TemplateDescription";
 import SimilarTemplates from "./Template/SimilarTemplates";
diff --git a/app/client/src/pages/Templates/TemplatesLayoutWithFilters.tsx b/app/client/src/pages/Templates/TemplatesLayoutWithFilters.tsx
index bfb09e9ce7..e630f739b7 100644
--- a/app/client/src/pages/Templates/TemplatesLayoutWithFilters.tsx
+++ b/app/client/src/pages/Templates/TemplatesLayoutWithFilters.tsx
@@ -9,7 +9,7 @@ import {
   isImportingTemplateToAppSelector,
 } from "selectors/templatesSelectors";
 import styled from "styled-components";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { TemplateContent } from "./TemplateContent";
 import TemplateFilters from "./TemplateFilters";
 
diff --git a/app/client/src/pages/Templates/TemplatesModal/PageSelection.tsx b/app/client/src/pages/Templates/TemplatesModal/PageSelection.tsx
index 33a8658e3c..6f02844b91 100644
--- a/app/client/src/pages/Templates/TemplatesModal/PageSelection.tsx
+++ b/app/client/src/pages/Templates/TemplatesModal/PageSelection.tsx
@@ -16,7 +16,7 @@ import React, { useEffect, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import { getCurrentApplicationId } from "selectors/editorSelectors";
 import styled from "styled-components";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 const Wrapper = styled.div`
   width: 280px;
diff --git a/app/client/src/pages/UserAuth/Login.tsx b/app/client/src/pages/UserAuth/Login.tsx
index 712bda3d41..a84f458cdf 100644
--- a/app/client/src/pages/UserAuth/Login.tsx
+++ b/app/client/src/pages/UserAuth/Login.tsx
@@ -37,7 +37,7 @@ import {
   FormActions,
   EmailFormWrapper,
 } from "pages/UserAuth/StyledComponents";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { LOGIN_SUBMIT_PATH } from "@appsmith/constants/ApiConstants";
 import PerformanceTracker, {
   PerformanceTransactionName,
diff --git a/app/client/src/pages/UserAuth/SignUp.tsx b/app/client/src/pages/UserAuth/SignUp.tsx
index 327deafb07..47e28cfd44 100644
--- a/app/client/src/pages/UserAuth/SignUp.tsx
+++ b/app/client/src/pages/UserAuth/SignUp.tsx
@@ -34,7 +34,7 @@ import { Button, Link, Callout } from "design-system";
 import { isEmail, isStrongPassword, isEmptyString } from "utils/formhelpers";
 
 import type { SignupFormValues } from "pages/UserAuth/helpers";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 import { SIGNUP_SUBMIT_PATH } from "@appsmith/constants/ApiConstants";
 import { connect, useSelector } from "react-redux";
diff --git a/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx b/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx
index 9f9e9bc705..9c537e567b 100644
--- a/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx
+++ b/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx
@@ -3,7 +3,7 @@ import styled from "styled-components";
 import type { SocialLoginType } from "@appsmith/constants/SocialLogin";
 import { getSocialLoginButtonProps } from "@appsmith/constants/SocialLogin";
 import type { EventName } from "@appsmith/utils/analyticsUtilTypes";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { useLocation } from "react-router-dom";
 import PerformanceTracker, {
   PerformanceTransactionName,
diff --git a/app/client/src/pages/UserAuth/VerificationError.tsx b/app/client/src/pages/UserAuth/VerificationError.tsx
index 37ac93e508..3845603b15 100644
--- a/app/client/src/pages/UserAuth/VerificationError.tsx
+++ b/app/client/src/pages/UserAuth/VerificationError.tsx
@@ -13,7 +13,7 @@ import {
 import { useResendEmailVerification } from "./helpers";
 import type { RouteComponentProps } from "react-router-dom";
 import styled from "styled-components";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 const Body = styled.div`
   display: flex;
diff --git a/app/client/src/pages/common/CustomizedDropdown/StyledComponents.tsx b/app/client/src/pages/common/CustomizedDropdown/StyledComponents.tsx
index 65318cf770..4b0ee18322 100644
--- a/app/client/src/pages/common/CustomizedDropdown/StyledComponents.tsx
+++ b/app/client/src/pages/common/CustomizedDropdown/StyledComponents.tsx
@@ -24,8 +24,8 @@ export const DropdownTrigger = styled.div<{ skin: Skin }>`
         props.skin === Skin.DARK
           ? props.theme.colors.textOnDarkBG
           : props.skin === Skin.LIGHT
-          ? props.theme.colors.defaultText
-          : "initial"};
+            ? props.theme.colors.defaultText
+            : "initial"};
     }
     &:hover {
       background: inherit;
diff --git a/app/client/src/pages/common/ErrorPages/PageNotFound.tsx b/app/client/src/pages/common/ErrorPages/PageNotFound.tsx
index 504ad25ed1..f3a4edd550 100644
--- a/app/client/src/pages/common/ErrorPages/PageNotFound.tsx
+++ b/app/client/src/pages/common/ErrorPages/PageNotFound.tsx
@@ -9,7 +9,7 @@ import {
   PAGE_NOT_FOUND,
   PAGE_NOT_FOUND_TITLE,
 } from "@appsmith/constants/messages";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 import Page from "./Page";
 
diff --git a/app/client/src/pages/common/ImportModal.tsx b/app/client/src/pages/common/ImportModal.tsx
index 38b342934d..314a039482 100644
--- a/app/client/src/pages/common/ImportModal.tsx
+++ b/app/client/src/pages/common/ImportModal.tsx
@@ -16,7 +16,7 @@ import { setIsGitSyncModalOpen } from "actions/gitSyncActions";
 import { GitSyncModalTab } from "entities/GitSync";
 import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 import Statusbar from "pages/Editor/gitSync/components/Statusbar";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import type { Theme } from "constants/DefaultTheme";
 import { Icon, Modal, ModalContent, ModalHeader, Text } from "design-system";
 import useMessages from "@appsmith/hooks/importModal/useMessages";
@@ -256,8 +256,8 @@ function ImportModal(props: ImportModalProps) {
             {toEditor
               ? null
               : isImporting
-              ? createMessage(UPLOADING_JSON)
-              : mainDescription}
+                ? createMessage(UPLOADING_JSON)
+                : mainDescription}
           </Text>
         </TextWrapper>
         {!isImporting && (
diff --git a/app/client/src/pages/common/datasourceAuth/index.tsx b/app/client/src/pages/common/datasourceAuth/index.tsx
index 74d12c09f4..fadc56b5e7 100644
--- a/app/client/src/pages/common/datasourceAuth/index.tsx
+++ b/app/client/src/pages/common/datasourceAuth/index.tsx
@@ -10,7 +10,7 @@ import {
   toggleSaveActionFlag,
   updateDatasourceAuthState,
 } from "actions/datasourceActions";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getCurrentApplicationId } from "selectors/editorSelectors";
 import { useParams, useLocation, useHistory } from "react-router";
 import type { ExplorerURLParams } from "@appsmith/pages/Editor/Explorer/helpers";
diff --git a/app/client/src/pages/setup/SignupSuccess.tsx b/app/client/src/pages/setup/SignupSuccess.tsx
index cbb679e7fd..531e763df8 100644
--- a/app/client/src/pages/setup/SignupSuccess.tsx
+++ b/app/client/src/pages/setup/SignupSuccess.tsx
@@ -14,7 +14,7 @@ import { Spinner } from "design-system";
 import { isValidLicense } from "@appsmith/selectors/tenantSelectors";
 import { redirectUserAfterSignup } from "@appsmith/utils/signupHelpers";
 import { setUserSignedUpFlag } from "utils/storage";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 export function SignupSuccess() {
   const dispatch = useDispatch();
diff --git a/app/client/src/pages/setup/UserWelcomeScreen.tsx b/app/client/src/pages/setup/UserWelcomeScreen.tsx
index 300e350e81..d6a606977b 100644
--- a/app/client/src/pages/setup/UserWelcomeScreen.tsx
+++ b/app/client/src/pages/setup/UserWelcomeScreen.tsx
@@ -6,7 +6,7 @@ import {
   WELCOME_HEADER,
 } from "@appsmith/constants/messages";
 import NonSuperUserProfilingQuestions from "./NonSuperUserProfilingQuestions";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import WelcomeBackground from "./WelcomeBackground";
 import SetupForm from "./SetupForm";
 
diff --git a/app/client/src/pages/workspace/AppInviteUsersForm.tsx b/app/client/src/pages/workspace/AppInviteUsersForm.tsx
index 53b131545a..f43b491066 100644
--- a/app/client/src/pages/workspace/AppInviteUsersForm.tsx
+++ b/app/client/src/pages/workspace/AppInviteUsersForm.tsx
@@ -22,7 +22,7 @@ import {
 } from "@appsmith/constants/messages";
 import { hasInviteUserToApplicationPermission } from "@appsmith/utils/permissionHelpers";
 import { Button, Icon, Switch, Tooltip } from "design-system";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
 import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag";
 
diff --git a/app/client/src/plugins/Linting/constants.ts b/app/client/src/plugins/Linting/constants.ts
index 5c04ff6e24..506fe6f567 100644
--- a/app/client/src/plugins/Linting/constants.ts
+++ b/app/client/src/plugins/Linting/constants.ts
@@ -21,7 +21,7 @@ export const lintOptions = (globalData: Record<string, boolean>) =>
     sub: true, // Don't force dot notation
     expr: true, // suppresses warnings about the use of expressions where normally you would expect to see assignments or function calls
     // environments
-    browser: true,
+    browser: false,
     worker: true,
     mocha: false,
     // global values
diff --git a/app/client/src/reducers/uiReducers/gitSyncReducer.ts b/app/client/src/reducers/uiReducers/gitSyncReducer.ts
index 652d76c1f4..454a080061 100644
--- a/app/client/src/reducers/uiReducers/gitSyncReducer.ts
+++ b/app/client/src/reducers/uiReducers/gitSyncReducer.ts
@@ -27,6 +27,7 @@ const initialState: GitSyncReducerState = {
   branches: [],
   fetchingBranches: false,
   localGitConfig: { authorEmail: "", authorName: "" },
+  showBranchPopup: false,
 
   isDiscarding: false,
 
@@ -654,6 +655,13 @@ const gitSyncReducer = createReducer(initialState, {
     isGitSettingsModalOpen: action.payload.open,
     activeGitSettingsModalTab: action.payload.tab || GitSettingsTab.GENERAL,
   }),
+  [ReduxActionTypes.GIT_SHOW_BRANCH_POPUP]: (
+    state,
+    action: ReduxAction<{ show: boolean }>,
+  ) => ({
+    ...state,
+    showBranchPopup: action.payload.show,
+  }),
 });
 
 export interface GitStatusData {
@@ -780,6 +788,7 @@ export type GitSyncReducerState = GitBranchDeleteState & {
   globalGitConfig: GitConfig;
 
   branches: Array<{ branchName: string; default: boolean }>;
+  showBranchPopup: boolean;
 
   localGitConfig: GitConfig;
   gitStatus?: GitStatusData;
diff --git a/app/client/src/reducers/uiReducers/ideReducer.ts b/app/client/src/reducers/uiReducers/ideReducer.ts
index 4c647ef489..0c811c9398 100644
--- a/app/client/src/reducers/uiReducers/ideReducer.ts
+++ b/app/client/src/reducers/uiReducers/ideReducer.ts
@@ -14,7 +14,6 @@ export const IDETabsDefaultValue = {
 
 const initialState: IDEState = {
   view: EditorViewMode.FullScreen,
-  pagesActive: false,
   tabs: IDETabsDefaultValue,
   showCreateModal: false,
 };
@@ -24,10 +23,6 @@ const ideReducer = createReducer(initialState, {
     state: IDEState,
     action: ReduxAction<{ view: EditorViewMode }>,
   ) => ({ ...state, view: action.payload.view }),
-  [ReduxActionTypes.SET_IDE_EDITOR_PAGES_ACTIVE_STATUS]: (
-    state: IDEState,
-    action: ReduxAction<{ pagesActive: boolean }>,
-  ) => ({ ...state, pagesActive: action.payload.pagesActive }),
   [ReduxActionTypes.SET_IDE_JS_TABS]: (
     state: IDEState,
     action: ReduxAction<string[]>,
@@ -80,7 +75,7 @@ const ideReducer = createReducer(initialState, {
       showCreateModal: action.payload,
     };
   },
-  [ReduxActionTypes.CLOSE_JS_ACTION_TAB]: (
+  [ReduxActionTypes.CLOSE_JS_ACTION_TAB_SUCCESS]: (
     state: IDEState,
     action: ReduxAction<{ id: string }>,
   ) => ({
@@ -92,7 +87,7 @@ const ideReducer = createReducer(initialState, {
       ),
     },
   }),
-  [ReduxActionTypes.CLOSE_QUERY_ACTION_TAB]: (
+  [ReduxActionTypes.CLOSE_QUERY_ACTION_TAB_SUCCESS]: (
     state: IDEState,
     action: ReduxAction<{ id: string }>,
   ) => ({
@@ -108,7 +103,6 @@ const ideReducer = createReducer(initialState, {
 
 export interface IDEState {
   view: EditorViewMode;
-  pagesActive: boolean;
   tabs: IDETabs;
   showCreateModal: boolean;
 }
diff --git a/app/client/src/reducers/uiReducers/layoutConversionReducer.ts b/app/client/src/reducers/uiReducers/layoutConversionReducer.ts
index 5f1e4e948c..72481ae35d 100644
--- a/app/client/src/reducers/uiReducers/layoutConversionReducer.ts
+++ b/app/client/src/reducers/uiReducers/layoutConversionReducer.ts
@@ -21,8 +21,8 @@ export enum CONVERSION_STATES {
   RESTORING_SNAPSHOT_SPINNER = "RESTORING_SNAPSHOT_SPINNER",
 }
 
-export interface SnapShotDetails {
-  lastUpdatedTime: string;
+export interface SnapshotDetails {
+  updatedTime: string;
 }
 
 const initialState: layoutConversionReduxState = {
@@ -58,14 +58,14 @@ const layoutConversionReducer = createImmerReducer(initialState, {
   },
   [ReduxActionTypes.UPDATE_SNAPSHOT_DETAILS]: (
     state: layoutConversionReduxState,
-    action: ReduxAction<SnapShotDetails | undefined>,
+    action: ReduxAction<SnapshotDetails | undefined>,
   ) => {
     state.snapshotDetails = action.payload;
   },
 });
 
 export interface layoutConversionReduxState {
-  snapshotDetails: SnapShotDetails | undefined;
+  snapshotDetails: SnapshotDetails | undefined;
   conversionError: Error | undefined;
   conversionState: CONVERSION_STATES;
   isConverting: boolean;
diff --git a/app/client/src/reflow/reflowHelpers.ts b/app/client/src/reflow/reflowHelpers.ts
index 060488bcf3..7c7793d43f 100644
--- a/app/client/src/reflow/reflowHelpers.ts
+++ b/app/client/src/reflow/reflowHelpers.ts
@@ -497,8 +497,8 @@ function getCollisionTreeHelper(
       (accessors.isHorizontal
         ? HORIZONTAL_RESIZE_MIN_LIMIT
         : collidingSpace.fixedHeight && accessors.directionIndicator < 0
-        ? collidingSpace.fixedHeight
-        : VERTICAL_RESIZE_MIN_LIMIT),
+          ? collidingSpace.fixedHeight
+          : VERTICAL_RESIZE_MIN_LIMIT),
   };
 }
 
@@ -769,8 +769,8 @@ function getMovementMapHelper(
       (accessors.isHorizontal
         ? HORIZONTAL_RESIZE_MIN_LIMIT
         : collisionTree.fixedHeight && accessors.directionIndicator < 0
-        ? collisionTree.fixedHeight
-        : VERTICAL_RESIZE_MIN_LIMIT),
+          ? collisionTree.fixedHeight
+          : VERTICAL_RESIZE_MIN_LIMIT),
     currentEmptySpaces,
   };
 }
diff --git a/app/client/src/reflow/reflowUtils.ts b/app/client/src/reflow/reflowUtils.ts
index 7e99590b3e..a12362be97 100644
--- a/app/client/src/reflow/reflowUtils.ts
+++ b/app/client/src/reflow/reflowUtils.ts
@@ -305,9 +305,8 @@ export function getCollidingSpaceMap(
   const collidingSpaceMap: CollisionMap = {};
   let order = 1;
   const orientationalAccessor = getOrientationAccessor(isHorizontalMove);
-  const oppositeOrientationalAccessor = getOrientationAccessor(
-    !isHorizontalMove,
-  );
+  const oppositeOrientationalAccessor =
+    getOrientationAccessor(!isHorizontalMove);
 
   let reflowableOccSpaces = [...occupiedSpaces],
     currSpacePositions = [...newSpacePositions];
@@ -1537,9 +1536,8 @@ export function checkReCollisionWithOtherNewSpacePositions(
   const { isHorizontal: globalIsHorizontal } = getAccessor(globalDirection);
   const { prevCollidingSpaceMap, prevSpacesMap } = prevReflowState;
   const orientationalAccessor = getOrientationAccessor(globalIsHorizontal);
-  const oppositeOrientationalAccessor = getOrientationAccessor(
-    !globalIsHorizontal,
-  );
+  const oppositeOrientationalAccessor =
+    getOrientationAccessor(!globalIsHorizontal);
   let stopCollisionCheck = false;
 
   for (const newSpacePosition of newSpacePositions) {
@@ -2201,8 +2199,8 @@ export function modifyResizePosition(
   const minDimension = isHorizontal
     ? HORIZONTAL_RESIZE_MIN_LIMIT
     : newSpacePosition.fixedHeight === undefined
-    ? VERTICAL_RESIZE_MIN_LIMIT
-    : newSpacePosition.fixedHeight;
+      ? VERTICAL_RESIZE_MIN_LIMIT
+      : newSpacePosition.fixedHeight;
 
   spacePosition[directionAccessor] = Math[oppositeMathComparator](
     spacePosition[directionAccessor],
diff --git a/app/client/src/sagas/ActionExecution/NavigateActionSaga.ts b/app/client/src/sagas/ActionExecution/NavigateActionSaga.ts
index 3773cd13e1..70835fcdd0 100644
--- a/app/client/src/sagas/ActionExecution/NavigateActionSaga.ts
+++ b/app/client/src/sagas/ActionExecution/NavigateActionSaga.ts
@@ -5,7 +5,7 @@ import {
   ReduxActionTypes,
   type Page,
 } from "@appsmith/constants/ReduxActionConstants";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getAppMode } from "@appsmith/selectors/applicationSelectors";
 import { APP_MODE } from "entities/App";
 import { getQueryStringfromObject } from "@appsmith/entities/URLRedirect/URLAssembly";
diff --git a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
index 2a7b8c1aaa..8da86d8cc3 100644
--- a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
+++ b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
@@ -76,7 +76,7 @@ import {
   validateResponse,
 } from "sagas/ErrorSagas";
 import type { EventName } from "@appsmith/utils/analyticsUtilTypes";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import type { Action } from "entities/Action";
 import { ActionExecutionContext } from "entities/Action";
 import { PluginType } from "entities/Action";
@@ -570,8 +570,8 @@ export default function* executePluginActionTriggerSaga(
     eventType === EventType.ON_NEXT_PAGE
       ? "NEXT"
       : eventType === EventType.ON_PREV_PAGE
-      ? "PREV"
-      : undefined;
+        ? "PREV"
+        : undefined;
   AppsmithConsole.info({
     text: "Execution started from widget request",
     source: {
diff --git a/app/client/src/sagas/ActionExecution/errorUtils.ts b/app/client/src/sagas/ActionExecution/errorUtils.ts
index 20315cd414..fef6c8a931 100644
--- a/app/client/src/sagas/ActionExecution/errorUtils.ts
+++ b/app/client/src/sagas/ActionExecution/errorUtils.ts
@@ -8,12 +8,9 @@ import type { Types } from "utils/TypeHelpers";
 import type { ActionTriggerKeys } from "@appsmith/workers/Evaluation/fns/index";
 import { getActionTriggerFunctionNames } from "@appsmith/workers/Evaluation/fns/index";
 import { getAppMode } from "@appsmith/selectors/applicationSelectors";
-import AnalyticsUtil from "../../utils/AnalyticsUtil";
-import {
-  setDebuggerSelectedTab,
-  showDebugger,
-} from "../../actions/debuggerActions";
-import { DEBUGGER_TAB_KEYS } from "../../components/editorComponents/Debugger/helpers";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
+import { setDebuggerSelectedTab, showDebugger } from "actions/debuggerActions";
+import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/helpers";
 import store from "store";
 import showToast from "sagas/ToastSagas";
 import { call } from "redux-saga/effects";
diff --git a/app/client/src/sagas/ActionSagas.ts b/app/client/src/sagas/ActionSagas.ts
index c608eb6391..71ce1fc9b2 100644
--- a/app/client/src/sagas/ActionSagas.ts
+++ b/app/client/src/sagas/ActionSagas.ts
@@ -30,6 +30,7 @@ import type {
   SetActionPropertyPayload,
 } from "actions/pluginActionActions";
 import {
+  closeQueryActionTabSuccess,
   copyActionError,
   copyActionSuccess,
   createActionInit,
@@ -48,7 +49,7 @@ import { getDynamicBindingsChangesSaga } from "utils/DynamicBindingUtils";
 import { validateResponse } from "./ErrorSagas";
 import { transformRestAction } from "transformers/RestActionTransformer";
 import { getCurrentPageId } from "selectors/editorSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import type {
   Action,
   ActionViewMode,
@@ -232,8 +233,8 @@ export function* createDefaultActionPayload({
       plugin?.type === PluginType.API
         ? defaultApiActionConfig
         : !!defaultActionConfig
-        ? defaultActionConfig
-        : {},
+          ? defaultActionConfig
+          : {},
     name: newActionName,
   };
 
@@ -654,6 +655,7 @@ export function* deleteActionSaga(
     });
 
     yield put(deleteActionSuccess({ id }));
+    yield put(closeQueryActionTabSuccess({ id }));
   } catch (error) {
     yield put({
       type: ReduxActionErrorTypes.DELETE_ACTION_ERROR,
@@ -1198,5 +1200,8 @@ export function* closeActionTabSaga(
   }>,
 ) {
   const id = actionPayload.payload.id;
+  const currentUrl = window.location.pathname;
+  yield call(FocusRetention.handleRemoveFocusHistory, currentUrl);
   yield call(handleQueryEntityRedirect, id);
+  yield put(closeQueryActionTabSuccess({ id }));
 }
diff --git a/app/client/src/sagas/AnalyticsSaga.ts b/app/client/src/sagas/AnalyticsSaga.ts
index e814b159c8..1790faaad8 100644
--- a/app/client/src/sagas/AnalyticsSaga.ts
+++ b/app/client/src/sagas/AnalyticsSaga.ts
@@ -3,7 +3,7 @@ import {
   type ReduxActionType,
 } from "@appsmith/constants/ReduxActionConstants";
 import type { Action } from "entities/Action";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import {
   RequestPayloadAnalyticsPath,
   cleanValuesInObjectForHashing,
diff --git a/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts b/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts
index 6b85ab7cd0..c891ec2071 100644
--- a/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts
+++ b/app/client/src/sagas/CanvasSagas/DraggingCanvasSagas.ts
@@ -50,7 +50,7 @@ import {
   getOccupiedSpacesSelectorForContainer,
 } from "selectors/editorSelectors";
 import { getLayoutSystemType } from "selectors/layoutSystemSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { collisionCheckPostReflow } from "utils/reflowHookUtils";
 import type { WidgetProps } from "widgets/BaseWidget";
 
diff --git a/app/client/src/sagas/CurlImportSagas.ts b/app/client/src/sagas/CurlImportSagas.ts
index 25cd9d3809..8a95b6f6b6 100644
--- a/app/client/src/sagas/CurlImportSagas.ts
+++ b/app/client/src/sagas/CurlImportSagas.ts
@@ -8,7 +8,7 @@ import { validateResponse } from "sagas/ErrorSagas";
 import type { CurlImportRequest } from "api/ImportApi";
 import CurlImportApi from "api/ImportApi";
 import type { ApiResponse } from "api/ApiResponses";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getCurrentWorkspaceId } from "@appsmith/selectors/selectedWorkspaceSelectors";
 import transformCurlImport from "transformers/CurlImportTransformer";
 import history from "utils/history";
diff --git a/app/client/src/sagas/DatasourcesSagas.ts b/app/client/src/sagas/DatasourcesSagas.ts
index 96ba39d369..3102b5d87e 100644
--- a/app/client/src/sagas/DatasourcesSagas.ts
+++ b/app/client/src/sagas/DatasourcesSagas.ts
@@ -94,7 +94,7 @@ import {
   DATASOURCE_REST_API_FORM,
 } from "@appsmith/constants/forms";
 import { validateResponse } from "./ErrorSagas";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import type { GetFormData } from "selectors/formSelectors";
 import { getFormData } from "selectors/formSelectors";
 import { getCurrentWorkspaceId } from "@appsmith/selectors/selectedWorkspaceSelectors";
diff --git a/app/client/src/sagas/DebuggerSagas.ts b/app/client/src/sagas/DebuggerSagas.ts
index ec52960bb0..7e476ef697 100644
--- a/app/client/src/sagas/DebuggerSagas.ts
+++ b/app/client/src/sagas/DebuggerSagas.ts
@@ -43,7 +43,9 @@ import { getConfigTree } from "selectors/dataTreeSelectors";
 import { createLogTitleString } from "components/editorComponents/Debugger/helpers";
 import AppsmithConsole from "utils/AppsmithConsole";
 import { getWidget } from "./selectors";
-import AnalyticsUtil, { AnalyticsEventType } from "utils/AnalyticsUtil";
+import AnalyticsUtil, {
+  AnalyticsEventType,
+} from "@appsmith/utils/AnalyticsUtil";
 import type { Plugin } from "api/PluginApi";
 import { getCurrentPageId } from "selectors/editorSelectors";
 import type { WidgetProps } from "widgets/BaseWidget";
diff --git a/app/client/src/sagas/EvalErrorHandler.ts b/app/client/src/sagas/EvalErrorHandler.ts
index 0dde75ec27..cfcdf524c8 100644
--- a/app/client/src/sagas/EvalErrorHandler.ts
+++ b/app/client/src/sagas/EvalErrorHandler.ts
@@ -18,7 +18,7 @@ import LOG_TYPE from "entities/AppsmithConsole/logtype";
 import { select } from "redux-saga/effects";
 import AppsmithConsole from "utils/AppsmithConsole";
 import * as Sentry from "@sentry/react";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import {
   createMessage,
   ERROR_EVAL_ERROR_GENERIC,
diff --git a/app/client/src/sagas/EvaluationsSaga.ts b/app/client/src/sagas/EvaluationsSaga.ts
index 2456c74035..88c513f915 100644
--- a/app/client/src/sagas/EvaluationsSaga.ts
+++ b/app/client/src/sagas/EvaluationsSaga.ts
@@ -103,7 +103,7 @@ import { parseUpdatesAndDeleteUndefinedUpdates } from "./EvaluationSaga.utils";
 import { getFeatureFlagsFetched } from "selectors/usersSelectors";
 import { getIsCurrentEditorWorkflowType } from "@appsmith/selectors/workflowSelectors";
 import { evalErrorHandler } from "./EvalErrorHandler";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { endSpan, startRootSpan } from "UITelemetry/generateTraces";
 
 const APPSMITH_CONFIGS = getAppsmithConfigs();
diff --git a/app/client/src/sagas/GitSyncSagas.ts b/app/client/src/sagas/GitSyncSagas.ts
index 8cba8d67a7..a489e8e74d 100644
--- a/app/client/src/sagas/GitSyncSagas.ts
+++ b/app/client/src/sagas/GitSyncSagas.ts
@@ -39,6 +39,7 @@ import {
   fetchGitProtectedBranchesInit,
   updateGitProtectedBranchesInit,
   clearCommitSuccessfulState,
+  setShowBranchPopupAction,
 } from "actions/gitSyncActions";
 import {
   commitToRepoSuccess,
@@ -377,6 +378,10 @@ function* switchBranch(action: ReduxAction<string>) {
     const page = response.data.pages.find(
       (page) => page.id === entityInfo.params.pageId,
     );
+
+    yield put(setShowBranchPopupAction(false));
+    yield put({ type: ReduxActionTypes.SWITCH_GIT_BRANCH_SUCCESS });
+
     const homePage = response.data.pages.find((page) => page.isDefault);
     if (!page) {
       if (homePage) {
@@ -386,7 +391,6 @@ function* switchBranch(action: ReduxAction<string>) {
         return;
       }
     }
-
     // Page exists, so we will try to go to the destination
     history.push(destinationHref);
 
@@ -421,8 +425,6 @@ function* switchBranch(action: ReduxAction<string>) {
         );
       }
     }
-
-    yield put({ type: ReduxActionTypes.SWITCH_GIT_BRANCH_SUCCESS });
   } catch (e) {
     // non api error
     yield put({ type: ReduxActionTypes.SWITCH_GIT_BRANCH_ERROR });
diff --git a/app/client/src/sagas/IDESaga.tsx b/app/client/src/sagas/IDESaga.tsx
index 1931fd6b0b..1c817ec395 100644
--- a/app/client/src/sagas/IDESaga.tsx
+++ b/app/client/src/sagas/IDESaga.tsx
@@ -18,14 +18,8 @@ import {
   queryAddURL,
   queryListURL,
 } from "@appsmith/RouteBuilder";
-import type { EditorSegmentList } from "@appsmith/selectors/appIDESelectors";
-import { groupAndSortEntitySegmentList } from "@appsmith/selectors/appIDESelectors";
 import type { EntityItem } from "@appsmith/entities/IDE/constants";
-import {
-  getCurrentPageId,
-  getJSSegmentItems,
-  getQuerySegmentItems,
-} from "@appsmith/selectors/entitiesSelector";
+import { getCurrentPageId } from "@appsmith/selectors/entitiesSelector";
 import { getQueryEntityItemUrl } from "@appsmith/pages/Editor/IDE/EditorPane/Query/utils";
 import { getJSEntityItemUrl } from "@appsmith/pages/Editor/IDE/EditorPane/JS/utils";
 import log from "loglevel";
@@ -33,6 +27,10 @@ import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants";
 import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 import type { EditorViewMode } from "@appsmith/entities/IDE/constants";
 import { retrieveIDEViewMode, storeIDEViewMode } from "utils/storage";
+import {
+  selectJSSegmentEditorTabs,
+  selectQuerySegmentEditorTabs,
+} from "@appsmith/selectors/appIDESelectors";
 
 export function* updateIDETabsOnRouteChangeSaga(entityInfo: FocusEntityInfo) {
   const { entity, id } = entityInfo;
@@ -68,8 +66,8 @@ function* getUpdatedTabs(newId: string, currentTabs: string[]) {
 
 export function* handleJSEntityRedirect(deletedId: string) {
   const pageId: string = yield select(getCurrentPageId);
-  const allJsItems: EntityItem[] = yield select(getJSSegmentItems);
-  const redirectAction = getNextEntityAfterDelete(deletedId, allJsItems);
+  const jsTabs: EntityItem[] = yield select(selectJSSegmentEditorTabs);
+  const redirectAction = getNextEntityAfterRemove(deletedId, jsTabs);
   switch (redirectAction.action) {
     case RedirectAction.LIST:
       history.push(jsCollectionListURL({ pageId }));
@@ -88,8 +86,8 @@ export function* handleJSEntityRedirect(deletedId: string) {
 
 export function* handleQueryEntityRedirect(deletedId: string) {
   const pageId: string = yield select(getCurrentPageId);
-  const allQueryItems: EntityItem[] = yield select(getQuerySegmentItems);
-  const redirectAction = getNextEntityAfterDelete(deletedId, allQueryItems);
+  const queryTabs: EntityItem[] = yield select(selectQuerySegmentEditorTabs);
+  const redirectAction = getNextEntityAfterRemove(deletedId, queryTabs);
   switch (redirectAction.action) {
     case RedirectAction.LIST:
       history.push(queryListURL({ pageId }));
@@ -123,53 +121,48 @@ interface RedirectActionDescription {
   payload?: EntityItem;
 }
 
-export function getNextEntityAfterDelete(
-  deletedId: string,
-  allItems: EntityItem[],
+export function getNextEntityAfterRemove(
+  removedId: string,
+  tabs: EntityItem[],
 ): RedirectActionDescription {
   const currentSelectedEntity = identifyEntityFromPath(
     window.location.pathname,
   );
-  const isSelectedActionDeleted = currentSelectedEntity.id === deletedId;
+  const isSelectedActionRemoved = currentSelectedEntity.id === removedId;
 
-  // If deleted item is not currently selected, don't redirect
-  if (!isSelectedActionDeleted) {
+  // If removed item is not currently selected, don't redirect
+  if (!isSelectedActionRemoved) {
     return {
       action: RedirectAction.NA,
     };
   }
 
-  const otherItems = allItems.filter((a) => deletedId !== a.key);
-  // If no other action is remaining, navigate to the creation url
-  if (otherItems.length === 0) {
-    return {
-      action: RedirectAction.LIST,
-    };
-  }
-
-  // Check if another action is present in the group and redirect to it, or else
-  // navigate to tht top of the list
-  const currentSortedList: EditorSegmentList =
-    groupAndSortEntitySegmentList(allItems);
-
-  let remainingGroupEntities: EntityItem[] = [];
-  for (const { items } of currentSortedList) {
-    if (items.find((a) => a.key === deletedId)) {
-      remainingGroupEntities = items.filter((a) => a.key !== deletedId);
-      break;
-    }
-  }
-
-  if (remainingGroupEntities.length === 0) {
-    return {
-      action: RedirectAction.ITEM,
-      payload: otherItems[0],
-    };
-  } else {
-    return {
-      action: RedirectAction.ITEM,
-      payload: remainingGroupEntities[0],
-    };
+  const indexOfTab = tabs.findIndex((item) => item.key === removedId);
+  switch (indexOfTab) {
+    case -1:
+      // If no other action is remaining, navigate to the creation url
+      return {
+        action: RedirectAction.LIST,
+      };
+    case 0:
+      // if the removed item is first item, then if tabs present, tabs + 1
+      // else otherItems[0] -> TODO: consider changing this logic after discussion with
+      // design team. May be new listing UI for side by side
+      if (tabs.length > 1) {
+        return {
+          action: RedirectAction.ITEM,
+          payload: tabs[1],
+        };
+      } else {
+        return {
+          action: RedirectAction.LIST,
+        };
+      }
+    default:
+      return {
+        action: RedirectAction.ITEM,
+        payload: tabs[indexOfTab - 1],
+      };
   }
 }
 
diff --git a/app/client/src/sagas/InitSagas.ts b/app/client/src/sagas/InitSagas.ts
index 7a67d29c1f..2a2dd3af51 100644
--- a/app/client/src/sagas/InitSagas.ts
+++ b/app/client/src/sagas/InitSagas.ts
@@ -62,7 +62,7 @@ import {
 } from "@appsmith/pages/Editor/Explorer/helpers";
 import { APP_MODE } from "../entities/App";
 import { GIT_BRANCH_QUERY_KEY, matchViewerPath } from "../constants/routes";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getAppMode } from "@appsmith/selectors/applicationSelectors";
 import { getDebuggerErrors } from "selectors/debuggerSelectors";
 import { deleteErrorLog } from "actions/debuggerActions";
diff --git a/app/client/src/sagas/JSLibrarySaga.ts b/app/client/src/sagas/JSLibrarySaga.ts
index 4eb5c3eda7..142509941e 100644
--- a/app/client/src/sagas/JSLibrarySaga.ts
+++ b/app/client/src/sagas/JSLibrarySaga.ts
@@ -28,7 +28,7 @@ import { EvalWorker } from "./EvaluationsSaga";
 import log from "loglevel";
 import { APP_MODE } from "entities/App";
 import { getAppMode } from "@appsmith/selectors/applicationSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import type { JSLibrary } from "workers/common/JSLibrary";
 import { getUsedActionNames } from "selectors/actionSelectors";
 import AppsmithConsole from "utils/AppsmithConsole";
diff --git a/app/client/src/sagas/JSPaneSagas.ts b/app/client/src/sagas/JSPaneSagas.ts
index 8b38565919..d6ba81658f 100644
--- a/app/client/src/sagas/JSPaneSagas.ts
+++ b/app/client/src/sagas/JSPaneSagas.ts
@@ -68,7 +68,6 @@ import {
   JS_EXECUTION_FAILURE,
   JS_FUNCTION_CREATE_SUCCESS,
   JS_FUNCTION_DELETE_SUCCESS,
-  JS_EXECUTION_SUCCESS_TOASTER,
 } from "@appsmith/constants/messages";
 import { validateResponse } from "./ErrorSagas";
 import AppsmithConsole from "utils/AppsmithConsole";
@@ -87,18 +86,13 @@ import type { ApiResponse } from "api/ApiResponses";
 import { ModalType } from "reducers/uiReducers/modalActionReducer";
 import { requestModalConfirmationSaga } from "sagas/UtilSagas";
 import { UserCancelledActionExecutionError } from "sagas/ActionExecution/errorUtils";
-import { APP_MODE } from "entities/App";
-import { getAppMode } from "@appsmith/selectors/applicationSelectors";
 import type { EventLocation } from "@appsmith/utils/analyticsUtilTypes";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { checkAndLogErrorsIfCyclicDependency } from "./helper";
 import { toast } from "design-system";
 import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/helpers";
 import { getIsServerDSLMigrationsEnabled } from "selectors/pageSelectors";
-import {
-  getJSActionNameToDisplay,
-  getJSActionPathNameToDisplay,
-} from "@appsmith/utils/actionExecutionUtils";
+import { getJSActionPathNameToDisplay } from "@appsmith/utils/actionExecutionUtils";
 import { getJsPaneDebuggerState } from "selectors/jsPaneSelectors";
 import { logMainJsActionExecution } from "@appsmith/utils/analyticsHelpers";
 import { logActionExecutionForAudit } from "@appsmith/actions/auditLogsAction";
@@ -401,16 +395,9 @@ export function* handleExecuteJSFunctionSaga(data: {
   onPageLoad: boolean;
   openDebugger?: boolean;
 }) {
-  const {
-    action,
-    collection,
-    isExecuteJSFunc,
-    onPageLoad,
-    openDebugger = false,
-  } = data;
+  const { action, collection, onPageLoad, openDebugger = false } = data;
   const { id: collectionId } = collection;
   const actionId = action.id;
-  const appMode: APP_MODE = yield select(getAppMode);
   yield put(
     executeJSFunctionInit({
       collection,
@@ -479,8 +466,6 @@ export function* handleExecuteJSFunctionSaga(data: {
       }),
     );
 
-    const jsActionNameToDisplay = getJSActionNameToDisplay(action);
-
     AppsmithConsole.info({
       text: createMessage(JS_EXECUTION_SUCCESS),
       source: {
@@ -490,20 +475,6 @@ export function* handleExecuteJSFunctionSaga(data: {
       },
       state: { response: result },
     });
-    const showSuccessToast = appMode === APP_MODE.EDIT && !isDirty;
-
-    if (
-      showSuccessToast &&
-      isExecuteJSFunc &&
-      !doesURLPathContainCollectionId
-    ) {
-      toast.show(
-        createMessage(JS_EXECUTION_SUCCESS_TOASTER, jsActionNameToDisplay),
-        {
-          kind: "success",
-        },
-      );
-    }
   } catch (error) {
     // open response tab in debugger on runnning js action.
     if (doesURLPathContainCollectionId) {
diff --git a/app/client/src/sagas/OnboardingSagas.ts b/app/client/src/sagas/OnboardingSagas.ts
index ba944376be..8f5abb4eff 100644
--- a/app/client/src/sagas/OnboardingSagas.ts
+++ b/app/client/src/sagas/OnboardingSagas.ts
@@ -34,7 +34,7 @@ import {
   getCurrentApplicationId,
   getIsEditorInitialized,
 } from "selectors/editorSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import type { User } from "constants/userConstants";
 import { builderURL } from "@appsmith/RouteBuilder";
 import type { SIGNPOSTING_STEP } from "pages/Editor/FirstTimeUserOnboarding/Utils";
diff --git a/app/client/src/sagas/OneClickBindingSaga.ts b/app/client/src/sagas/OneClickBindingSaga.ts
index da4006121c..78a996514d 100644
--- a/app/client/src/sagas/OneClickBindingSaga.ts
+++ b/app/client/src/sagas/OneClickBindingSaga.ts
@@ -44,7 +44,7 @@ import type { ApiResponse } from "api/ApiResponses";
 import type { ActionCreateUpdateResponse } from "api/ActionAPI";
 import ActionAPI from "api/ActionAPI";
 import { validateResponse } from "./ErrorSagas";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import AppsmithConsole from "utils/AppsmithConsole";
 import { ENTITY_TYPE } from "@appsmith/entities/AppsmithConsole/utils";
 import { fetchActions, runAction } from "actions/pluginActionActions";
diff --git a/app/client/src/sagas/PostEvaluationSagas.ts b/app/client/src/sagas/PostEvaluationSagas.ts
index 189850cc74..76d19182ff 100644
--- a/app/client/src/sagas/PostEvaluationSagas.ts
+++ b/app/client/src/sagas/PostEvaluationSagas.ts
@@ -26,7 +26,7 @@ import LOG_TYPE from "entities/AppsmithConsole/logtype";
 import { call, put, select } from "redux-saga/effects";
 import type { AnyReduxAction } from "@appsmith/constants/ReduxActionConstants";
 import AppsmithConsole from "utils/AppsmithConsole";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import {
   createMessage,
   JS_EXECUTION_FAILURE,
diff --git a/app/client/src/sagas/QueryPaneSagas.ts b/app/client/src/sagas/QueryPaneSagas.ts
index dd757fac7c..7f6a4f1d86 100644
--- a/app/client/src/sagas/QueryPaneSagas.ts
+++ b/app/client/src/sagas/QueryPaneSagas.ts
@@ -60,7 +60,7 @@ import {
 import { updateReplayEntity } from "actions/pageActions";
 import { ENTITY_TYPE } from "@appsmith/entities/AppsmithConsole/utils";
 import type { EventLocation } from "@appsmith/utils/analyticsUtilTypes";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import {
   datasourcesEditorIdURL,
   generateTemplateFormURL,
diff --git a/app/client/src/sagas/ReplaySaga.ts b/app/client/src/sagas/ReplaySaga.ts
index aafd1b98fe..50d9557f57 100644
--- a/app/client/src/sagas/ReplaySaga.ts
+++ b/app/client/src/sagas/ReplaySaga.ts
@@ -30,7 +30,7 @@ import {
   scrollWidgetIntoView,
   switchTab,
 } from "utils/replayHelpers";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import {
   getCurrentApplicationId,
   snipingModeSelector,
diff --git a/app/client/src/sagas/SnapshotSagas.ts b/app/client/src/sagas/SnapshotSagas.ts
index e95fc19624..2d330679a9 100644
--- a/app/client/src/sagas/SnapshotSagas.ts
+++ b/app/client/src/sagas/SnapshotSagas.ts
@@ -7,7 +7,7 @@ import ApplicationApi from "@appsmith/api/ApplicationApi";
 import type { PageDefaultMeta } from "@appsmith/api/ApplicationApi";
 import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 import log from "loglevel";
-import type { SnapShotDetails } from "reducers/uiReducers/layoutConversionReducer";
+import type { SnapshotDetails } from "reducers/uiReducers/layoutConversionReducer";
 import { CONVERSION_STATES } from "reducers/uiReducers/layoutConversionReducer";
 import { all, call, put, select, takeLatest } from "redux-saga/effects";
 import { getCurrentApplicationId } from "selectors/editorSelectors";
@@ -15,7 +15,7 @@ import { getLogToSentryFromResponse } from "utils/helpers";
 import { validateResponse } from "./ErrorSagas";
 import { updateApplicationLayoutType } from "./AutoLayoutUpdateSagas";
 import { LayoutSystemTypes } from "layoutSystems/types";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getLayoutSystemType } from "selectors/layoutSystemSelectors";
 
 //Saga to create application snapshot
@@ -43,7 +43,7 @@ export function* createSnapshotSaga() {
 
 //Saga to fetch application snapshot
 export function* fetchSnapshotSaga() {
-  let response: ApiResponse<SnapShotDetails> | undefined;
+  let response: ApiResponse<SnapshotDetails> | undefined;
   try {
     const applicationId: string = yield select(getCurrentApplicationId);
     response = yield ApplicationApi.getSnapShotDetails({
@@ -57,9 +57,7 @@ export function* fetchSnapshotSaga() {
     );
 
     if (isValidResponse) {
-      const snapShotDetails = response?.data;
-
-      return snapShotDetails;
+      return response?.data;
     }
   } catch (error) {
     if (getLogToSentryFromResponse(response)) {
@@ -169,15 +167,9 @@ export function* deleteApplicationSnapshotSaga() {
 //Saga to update snapshot details by fetching info from backend
 function* updateSnapshotDetailsSaga() {
   try {
-    const snapShotDetails: { updatedTime: Date } | undefined =
+    const snapshotDetails: SnapshotDetails | undefined =
       yield call(fetchSnapshotSaga);
-    yield put(
-      updateSnapshotDetails(
-        snapShotDetails && snapShotDetails.updatedTime
-          ? { lastUpdatedTime: snapShotDetails.updatedTime?.toString() }
-          : undefined,
-      ),
-    );
+    yield put(updateSnapshotDetails(snapshotDetails));
   } catch (error) {
     throw error;
   }
diff --git a/app/client/src/sagas/SnipingModeSagas.ts b/app/client/src/sagas/SnipingModeSagas.ts
index fb848b56b7..f4fdfd7c56 100644
--- a/app/client/src/sagas/SnipingModeSagas.ts
+++ b/app/client/src/sagas/SnipingModeSagas.ts
@@ -8,7 +8,7 @@ import {
   batchUpdateWidgetDynamicProperty,
   batchUpdateWidgetProperty,
 } from "actions/controlActions";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 import {
   SNIPING_NOT_SUPPORTED,
diff --git a/app/client/src/sagas/WebsocketSagas/versionUpdatePrompt.ts b/app/client/src/sagas/WebsocketSagas/versionUpdatePrompt.ts
index e6082344df..282ac0f45d 100644
--- a/app/client/src/sagas/WebsocketSagas/versionUpdatePrompt.ts
+++ b/app/client/src/sagas/WebsocketSagas/versionUpdatePrompt.ts
@@ -12,7 +12,7 @@ import {
   removeVersionUpdateState,
   setVersionUpdateState,
 } from "utils/storage";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 enum UpdateStateEvent {
   PROMPT_SHOWN = "PROMPT_SHOWN",
diff --git a/app/client/src/sagas/WidgetAdditionSagas.ts b/app/client/src/sagas/WidgetAdditionSagas.ts
index 81857b53af..9cfbfb05e9 100644
--- a/app/client/src/sagas/WidgetAdditionSagas.ts
+++ b/app/client/src/sagas/WidgetAdditionSagas.ts
@@ -616,27 +616,29 @@ function* getBuildingBlocksDropMousePosition(
   return mousePosition;
 }
 
+function* runSingleAction(actionId: string) {
+  yield put(runAction(actionId));
+  yield take(ReduxActionTypes.RUN_ACTION_SUCCESS);
+}
+
 function* runNewlyCreatedActions(
   actionsBeforeAddingBuildingBlock: ActionDataState,
   actionsAfterAddingBuildingBlocks: ActionDataState,
 ) {
-  // Extract unique ids from the actionsBeforeAddingBuildingBlocks array
   const actionIdsBeforeAddingBB = actionsBeforeAddingBuildingBlock.map(
     (obj) => obj.config.id,
   );
 
-  // Filter the after array to find new actions not present in actionsBeforeAddingBuildingBlocks array
   const newlyAddedActions = actionsAfterAddingBuildingBlocks.filter(
     (obj) => !actionIdsBeforeAddingBB.includes(obj.config.id),
   );
 
-  // run all newly created actions
-  if (newlyAddedActions && newlyAddedActions.length > 0) {
-    yield all(
-      newlyAddedActions.map(function* (action) {
-        yield put(runAction(action.config.id));
-      }),
-    );
+  // Run each action sequentially. We have a max of 2-3 actions per building block.
+  // If we run this in parallel, we will have a racing condition when multiple building blocks are drag and dropped quickly.
+  for (const action of newlyAddedActions) {
+    if (action.config.executeOnLoad) {
+      yield runSingleAction(action.config.id);
+    }
   }
 }
 
diff --git a/app/client/src/sagas/WidgetDeletionSagas.ts b/app/client/src/sagas/WidgetDeletionSagas.ts
index 96244746ed..9dfb8110c9 100644
--- a/app/client/src/sagas/WidgetDeletionSagas.ts
+++ b/app/client/src/sagas/WidgetDeletionSagas.ts
@@ -26,7 +26,7 @@ import {
   getIsAutoLayoutMobileBreakPoint,
 } from "selectors/editorSelectors";
 import { getSelectedWidgets } from "selectors/ui";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import AppsmithConsole from "utils/AppsmithConsole";
 import type { WidgetProps } from "widgets/BaseWidget";
 import {
diff --git a/app/client/src/sagas/WidgetOperationSagas.tsx b/app/client/src/sagas/WidgetOperationSagas.tsx
index ea3795c1d9..ce2b4fd697 100644
--- a/app/client/src/sagas/WidgetOperationSagas.tsx
+++ b/app/client/src/sagas/WidgetOperationSagas.tsx
@@ -41,7 +41,7 @@ import {
   getIsAutoLayout,
   getIsAutoLayoutMobileBreakPoint,
 } from "selectors/editorSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { convertToString } from "utils/AppsmithUtils";
 import type {
   BatchUpdateDynamicPropertyUpdates,
@@ -1142,14 +1142,14 @@ export function calculateNewWidgetPosition(
       !isThereACollision && shouldGroup
         ? widget.topRow
         : parentBottomRow
-        ? nextAvailableRow + widget.topRow
-        : nextAvailableRow,
+          ? nextAvailableRow + widget.topRow
+          : nextAvailableRow,
     bottomRow:
       !isThereACollision && shouldGroup
         ? widget.bottomRow
         : parentBottomRow
-        ? nextAvailableRow + widget.bottomRow
-        : nextAvailableRow + (widget.bottomRow - widget.topRow),
+          ? nextAvailableRow + widget.bottomRow
+          : nextAvailableRow + (widget.bottomRow - widget.topRow),
   };
 }
 
diff --git a/app/client/src/sagas/WidgetSelectionSagas.ts b/app/client/src/sagas/WidgetSelectionSagas.ts
index 7fb857de20..ab2d5fb154 100644
--- a/app/client/src/sagas/WidgetSelectionSagas.ts
+++ b/app/client/src/sagas/WidgetSelectionSagas.ts
@@ -58,7 +58,7 @@ import {
 import { getModalWidgetType } from "selectors/widgetSelectors";
 import { getWidgetSelectorByWidgetId } from "selectors/layoutSystemSelectors";
 import { getAppViewerPageIdFromPath } from "@appsmith/pages/Editor/Explorer/helpers";
-import AnalyticsUtil from "../utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getIsAnvilLayout } from "layoutSystems/anvil/integrations/selectors";
 
 // The following is computed to be used in the entity explorer
diff --git a/app/client/src/sagas/getNextEntityAfterDelete.test.ts b/app/client/src/sagas/getNextEntityAfterDelete.test.ts
deleted file mode 100644
index 0eea8bf6c4..0000000000
--- a/app/client/src/sagas/getNextEntityAfterDelete.test.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { EditorState, type EntityItem } from "@appsmith/entities/IDE/constants";
-import { PluginType } from "entities/Action";
-import * as FocusEntityObj from "navigation/FocusEntity";
-import { RedirectAction, getNextEntityAfterDelete } from "./IDESaga";
-import { FocusEntity } from "navigation/FocusEntity";
-
-/**
- *
- * @return action   -> RedirectAction.NA if the deleted item is not current one
- * @return action   -> RedirectAction.LIST if no items left in the list
- * @return action   -> RedirectAction.ITEM if there is no item left in the same group
- *         payload  -> first item from the all items list
- * @return action   -> RedirectAction.ITEM if there is there are items left in the same group
- *         payload  -> first item from the grouped list
- *
- */
-describe("getNextEntityAfterDelete function", () => {
-  const items: EntityItem[] = [
-    {
-      title: "API 1",
-      type: PluginType.API,
-      key: "1",
-      group: "Users",
-    },
-    {
-      title: "Google sheet 1",
-      type: PluginType.SAAS,
-      key: "2",
-      group: "AbGsheet",
-    },
-  ];
-
-  jest
-    .spyOn(FocusEntityObj, "identifyEntityFromPath")
-    .mockImplementation(() => ({
-      entity: FocusEntity.QUERY,
-      id: "2",
-      appState: EditorState.EDITOR,
-      params: {},
-    }));
-
-  it("1. Deleted item is not the current item then no redirect", () => {
-    expect(getNextEntityAfterDelete("5", [])).toEqual({
-      action: RedirectAction.NA,
-    });
-  });
-
-  it("2. Redirect to add, if nothing left after deletion", () => {
-    expect(getNextEntityAfterDelete("2", [])).toEqual({
-      action: RedirectAction.LIST,
-    });
-  });
-
-  it("3. Redirect to the first item, if nothing left in the same group", () => {
-    expect(getNextEntityAfterDelete("2", items)).toEqual({
-      action: RedirectAction.ITEM,
-      payload: items[0],
-    });
-  });
-
-  it("4. Redirect to the first item in the group", () => {
-    items.push({
-      title: "Google sheet 2",
-      type: PluginType.SAAS,
-      key: "3",
-      group: "AbGsheet",
-    });
-    expect(getNextEntityAfterDelete("2", items)).toEqual({
-      action: RedirectAction.ITEM,
-      payload: items[2],
-    });
-  });
-});
diff --git a/app/client/src/sagas/getNextEntityAfterRemove.test.ts b/app/client/src/sagas/getNextEntityAfterRemove.test.ts
new file mode 100644
index 0000000000..328e59d8ba
--- /dev/null
+++ b/app/client/src/sagas/getNextEntityAfterRemove.test.ts
@@ -0,0 +1,57 @@
+import { EditorState, type EntityItem } from "@appsmith/entities/IDE/constants";
+import { PluginType } from "entities/Action";
+import * as FocusEntityObj from "navigation/FocusEntity";
+import { RedirectAction, getNextEntityAfterRemove } from "./IDESaga";
+import { FocusEntity } from "navigation/FocusEntity";
+
+describe("getNextEntityAfterRemove function", () => {
+  const items: EntityItem[] = [
+    {
+      title: "API 1",
+      type: PluginType.API,
+      key: "1",
+      group: "Users",
+    },
+    {
+      title: "Google sheet 1",
+      type: PluginType.SAAS,
+      key: "2",
+      group: "AbGsheet",
+    },
+  ];
+
+  jest
+    .spyOn(FocusEntityObj, "identifyEntityFromPath")
+    .mockImplementation(() => ({
+      entity: FocusEntity.QUERY,
+      id: "2",
+      appState: EditorState.EDITOR,
+      params: {},
+    }));
+
+  it("1. Removed item is not the current item then no redirect", () => {
+    expect(getNextEntityAfterRemove("5", items)).toEqual({
+      action: RedirectAction.NA,
+    });
+  });
+
+  it("2. Redirect to add, if nothing left after deletion", () => {
+    expect(getNextEntityAfterRemove("2", [])).toEqual({
+      action: RedirectAction.LIST,
+    });
+  });
+
+  it("3. Redirect to the previous item if current tab is not the first one", () => {
+    expect(getNextEntityAfterRemove("2", items)).toEqual({
+      action: RedirectAction.ITEM,
+      payload: items[0],
+    });
+  });
+
+  it("4. Redirect to the next item if current tab is the first one", () => {
+    expect(getNextEntityAfterRemove("2", items.reverse())).toEqual({
+      action: RedirectAction.ITEM,
+      payload: items[1],
+    });
+  });
+});
diff --git a/app/client/src/sagas/layoutConversionSagas.ts b/app/client/src/sagas/layoutConversionSagas.ts
index df131641d8..7d5c4d4712 100644
--- a/app/client/src/sagas/layoutConversionSagas.ts
+++ b/app/client/src/sagas/layoutConversionSagas.ts
@@ -25,7 +25,7 @@ import {
   getPageList,
 } from "selectors/editorSelectors";
 import { updateApplicationLayoutType } from "./AutoLayoutUpdateSagas";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { nestDSL } from "@shared/dsl";
 
 /**
diff --git a/app/client/src/selectors/autoLayoutSelectors.tsx b/app/client/src/selectors/autoLayoutSelectors.tsx
index ea2770eec0..c20029d98b 100644
--- a/app/client/src/selectors/autoLayoutSelectors.tsx
+++ b/app/client/src/selectors/autoLayoutSelectors.tsx
@@ -25,7 +25,7 @@ export const getFlexLayers = (parentId: string) => {
 };
 
 export const getSnapshotUpdatedTime = (state: AppState) =>
-  state.ui.layoutConversion.snapshotDetails?.lastUpdatedTime;
+  state.ui.layoutConversion.snapshotDetails?.updatedTime;
 
 export const getLayerIndex = (widgetId: string, parentId: string) => {
   return createSelector(
diff --git a/app/client/src/selectors/gitSyncSelectors.tsx b/app/client/src/selectors/gitSyncSelectors.tsx
index 4f4855251c..73fa17e8ee 100644
--- a/app/client/src/selectors/gitSyncSelectors.tsx
+++ b/app/client/src/selectors/gitSyncSelectors.tsx
@@ -121,6 +121,9 @@ export const getCurrentGitBranch = (state: AppState): string | undefined => {
   return gitApplicationMetadata?.branchName;
 };
 
+export const showBranchPopupSelector = (state: AppState) =>
+  state.ui.gitSync.showBranchPopup;
+
 export const getPullFailed = (state: AppState) => state.ui.gitSync.pullFailed;
 
 export const getPullInProgress = (state: AppState) =>
diff --git a/app/client/src/selectors/ideSelectors.tsx b/app/client/src/selectors/ideSelectors.tsx
index 74c32d55ed..2055ed54ef 100644
--- a/app/client/src/selectors/ideSelectors.tsx
+++ b/app/client/src/selectors/ideSelectors.tsx
@@ -25,9 +25,6 @@ export const getIDEViewMode = createSelector(
   },
 );
 
-export const getPagesActiveStatus = (state: AppState) =>
-  state.ui.ide.pagesActive;
-
 export const getActionsCount = (pageId: string) =>
   createSelector(getPageActions(pageId), (actions) => {
     return actions.length || 0;
diff --git a/app/client/src/selectors/jsPaneSelectors.ts b/app/client/src/selectors/jsPaneSelectors.ts
index e425fe9c82..5dfb7d7314 100644
--- a/app/client/src/selectors/jsPaneSelectors.ts
+++ b/app/client/src/selectors/jsPaneSelectors.ts
@@ -1,26 +1,22 @@
 import type { AppState } from "@appsmith/reducers";
-import {
-  getCurrentPageId,
-  getJSSegmentItems,
-} from "@appsmith/selectors/entitiesSelector";
+import { getCurrentPageId } from "@appsmith/selectors/entitiesSelector";
 import { getJSEntityItemUrl } from "@appsmith/pages/Editor/IDE/EditorPane/JS/utils";
 import type { FocusEntityInfo } from "navigation/FocusEntity";
 import { identifyEntityFromPath } from "navigation/FocusEntity";
+import { selectJSSegmentEditorTabs } from "@appsmith/selectors/appIDESelectors";
 
 export const getJSPaneConfigSelectedTab = (state: AppState) =>
   state.ui.jsPane.selectedConfigTab;
 
-export const getFirstJSObject = (
-  state: AppState,
-): FocusEntityInfo | undefined => {
-  const currentJSActions = getJSSegmentItems(state);
+export const getJsPaneDebuggerState = (state: AppState) =>
+  state.ui.jsPane.debugger;
+
+export const getLastJSTab = (state: AppState): FocusEntityInfo | undefined => {
+  const tabs = selectJSSegmentEditorTabs(state);
   const pageId = getCurrentPageId(state);
-  if (currentJSActions.length) {
-    const url = getJSEntityItemUrl(currentJSActions[0], pageId);
+  if (tabs.length) {
+    const url = getJSEntityItemUrl(tabs[tabs.length - 1], pageId);
     const urlWithoutQueryParams = url.split("?")[0];
     return identifyEntityFromPath(urlWithoutQueryParams);
   }
 };
-
-export const getJsPaneDebuggerState = (state: AppState) =>
-  state.ui.jsPane.debugger;
diff --git a/app/client/src/selectors/queryPaneSelectors.ts b/app/client/src/selectors/queryPaneSelectors.ts
index 651452bd59..7cd57855ec 100644
--- a/app/client/src/selectors/queryPaneSelectors.ts
+++ b/app/client/src/selectors/queryPaneSelectors.ts
@@ -1,23 +1,13 @@
 import type { AppState } from "@appsmith/reducers";
-import { getQuerySegmentItems } from "@appsmith/selectors/entitiesSelector";
 import { getCurrentPageId } from "./editorSelectors";
 import type { FocusEntityInfo } from "../navigation/FocusEntity";
 import { identifyEntityFromPath } from "../navigation/FocusEntity";
 import { getQueryEntityItemUrl } from "@appsmith/pages/Editor/IDE/EditorPane/Query/utils";
+import { selectQuerySegmentEditorTabs } from "@appsmith/selectors/appIDESelectors";
 
 export const getQueryPaneConfigSelectedTabIndex = (state: AppState) =>
   state.ui.queryPane.selectedConfigTabIndex;
 
-export const getFirstQuery = (state: AppState): FocusEntityInfo | undefined => {
-  const queryItems = getQuerySegmentItems(state);
-  const pageId = getCurrentPageId(state);
-  if (queryItems.length) {
-    const url = getQueryEntityItemUrl(queryItems[0], pageId);
-    const urlWithoutQueryParams = url.split("?")[0];
-    return identifyEntityFromPath(urlWithoutQueryParams);
-  }
-};
-
 export const getQueryPaneDebuggerState = (state: AppState) =>
   state.ui.queryPane.debugger;
 
@@ -30,3 +20,15 @@ export const getQueryIsRunning = (state: AppState, id: string): boolean => {
   const { isRunning } = state.ui.queryPane;
   return !!isRunning[id];
 };
+
+export const getLastQueryTab = (
+  state: AppState,
+): FocusEntityInfo | undefined => {
+  const tabs = selectQuerySegmentEditorTabs(state);
+  const pageId = getCurrentPageId(state);
+  if (tabs.length) {
+    const url = getQueryEntityItemUrl(tabs[tabs.length - 1], pageId);
+    const urlWithoutQueryParams = url.split("?")[0];
+    return identifyEntityFromPath(urlWithoutQueryParams);
+  }
+};
diff --git a/app/client/src/usagePulse/utils.ts b/app/client/src/usagePulse/utils.ts
index 292478d2a6..57c2b6e733 100644
--- a/app/client/src/usagePulse/utils.ts
+++ b/app/client/src/usagePulse/utils.ts
@@ -4,7 +4,7 @@ import { isNil } from "lodash";
 import nanoid from "nanoid";
 import { getAppMode } from "@appsmith/selectors/entitiesSelector";
 import store from "store";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { FALLBACK_KEY } from "@appsmith/constants/UsagePulse";
 
 //TODO (Dipyaman): We should return a promise that will get resolved only on success or rejected after the retries
diff --git a/app/client/src/utils/AppsmithUtils.tsx b/app/client/src/utils/AppsmithUtils.tsx
index 605853a8d0..4ec0106e3f 100644
--- a/app/client/src/utils/AppsmithUtils.tsx
+++ b/app/client/src/utils/AppsmithUtils.tsx
@@ -10,7 +10,7 @@ import * as log from "loglevel";
 import { osName } from "react-device-detect";
 import type { ActionDataState } from "@appsmith/reducers/entityReducers/actionsReducer";
 import type { JSCollectionData } from "@appsmith/reducers/entityReducers/jsActionsReducer";
-import AnalyticsUtil from "./AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import type { CreateNewActionKeyInterface } from "@appsmith/entities/Engine/actionHelpers";
 import { CreateNewActionKey } from "@appsmith/entities/Engine/actionHelpers";
 
diff --git a/app/client/src/utils/autocomplete/CodemirrorTernService.ts b/app/client/src/utils/autocomplete/CodemirrorTernService.ts
index 3a7ef92cca..19059ebec2 100644
--- a/app/client/src/utils/autocomplete/CodemirrorTernService.ts
+++ b/app/client/src/utils/autocomplete/CodemirrorTernService.ts
@@ -18,7 +18,7 @@ import {
   getCodeMirrorNamespaceFromDoc,
   getCodeMirrorNamespaceFromEditor,
 } from "../getCodeMirrorNamespace";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { findIndex, isString } from "lodash";
 import { renderTernTooltipContent } from "./ternDocTooltip";
 
diff --git a/app/client/src/utils/editorContextUtils.ts b/app/client/src/utils/editorContextUtils.ts
index 482c571a6d..522654a831 100644
--- a/app/client/src/utils/editorContextUtils.ts
+++ b/app/client/src/utils/editorContextUtils.ts
@@ -264,8 +264,8 @@ export function getDefaultTemplateActionConfig(
         defaultTableName = !!dsPreviewTable
           ? dsPreviewTable
           : !!dsStructure.tables && dsStructure.tables.length > 0
-          ? dsStructure.tables[0].name
-          : "";
+            ? dsStructure.tables[0].name
+            : "";
       }
     }
 
diff --git a/app/client/src/utils/helpers.tsx b/app/client/src/utils/helpers.tsx
index b07139d724..9241e8b6fd 100644
--- a/app/client/src/utils/helpers.tsx
+++ b/app/client/src/utils/helpers.tsx
@@ -352,18 +352,9 @@ function getWidgetElementToScroll(
   }
 }
 
-export const resolveAsSpaceChar = (value: string, limit?: number) => {
-  // ensures that all special characters are disallowed
-  // while allowing all utf-8 characters
-  const removeSpecialCharsRegex =
-    /`|\~|\!|\@|\#|\$|\%|\^|\&|\*|\(|\)|\+|\=|\[|\{|\]|\}|\||\\|\'|\<|\,|\.|\>|\?|\/|\""|\;|\:|\s/;
-  const duplicateSpaceRegex = /\s+/;
-  return value
-    .split(removeSpecialCharsRegex)
-    .join(" ")
-    .split(duplicateSpaceRegex)
-    .join(" ")
-    .slice(0, limit || 30);
+export const toValidPageName = (value: string) => {
+  // Ensure that `/`, `\` and `:` are not allowed in page names, aligning with server-side validation.
+  return value.replaceAll(/[/\\:]+/g, "").slice(0, 30);
 };
 
 export const PLATFORM_OS = {
diff --git a/app/client/src/utils/hooks/useHoverToFocusWidget.ts b/app/client/src/utils/hooks/useHoverToFocusWidget.ts
index 2ac017ac2f..f35a3465ad 100644
--- a/app/client/src/utils/hooks/useHoverToFocusWidget.ts
+++ b/app/client/src/utils/hooks/useHoverToFocusWidget.ts
@@ -5,6 +5,8 @@ import { getAnvilSpaceDistributionStatus } from "layoutSystems/anvil/integration
 import { combinedPreviewModeSelector } from "selectors/editorSelectors";
 import type { AppState } from "@appsmith/reducers";
 import type React from "react";
+import { useCurrentAppState } from "pages/Editor/IDE/hooks";
+import { EditorState } from "@appsmith/entities/IDE/constants";
 
 export const useHoverToFocusWidget = (
   widgetId: string,
@@ -16,6 +18,11 @@ export const useHoverToFocusWidget = (
   // The value is the widgetId of the focused widget.
   const isFocused = useSelector(isCurrentWidgetFocused(widgetId));
 
+  // This state tells the current IDE state
+  const ideState = useCurrentAppState();
+  // Check if in the editor state
+  const isEditor = ideState === EditorState.EDITOR;
+
   // This state tells us whether a `ResizableComponent` is resizing
   const isResizing = useSelector(
     (state: AppState) => state.ui.widgetDragResize.isResizing,
@@ -34,6 +41,7 @@ export const useHoverToFocusWidget = (
     focusWidget &&
       !isResizingOrDragging &&
       !isFocused &&
+      isEditor &&
       !isDistributingSpace &&
       !resizeDisabled &&
       !isPreviewMode &&
diff --git a/app/client/src/utils/hooks/useOnUpgrade.ts b/app/client/src/utils/hooks/useOnUpgrade.ts
index 1ac5c0a8a1..acf4548da1 100644
--- a/app/client/src/utils/hooks/useOnUpgrade.ts
+++ b/app/client/src/utils/hooks/useOnUpgrade.ts
@@ -5,7 +5,7 @@ import {
   PRICING_PAGE_URL,
 } from "constants/ThirdPartyConstants";
 import type { EventName } from "@appsmith/utils/analyticsUtilTypes";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { getAppsmithConfigs } from "@appsmith/configs";
 import { pricingPageUrlSource } from "@appsmith/utils/licenseHelpers";
 import type {
diff --git a/app/client/src/utils/hooks/usePositionedContainerZIndex.ts b/app/client/src/utils/hooks/usePositionedContainerZIndex.ts
index 482985b62c..6975a9d20c 100644
--- a/app/client/src/utils/hooks/usePositionedContainerZIndex.ts
+++ b/app/client/src/utils/hooks/usePositionedContainerZIndex.ts
@@ -33,8 +33,8 @@ export const usePositionedContainerZIndex = (
       return focused
         ? Layers.focusedWidget
         : selected
-        ? Layers.selectedWidget
-        : Layers.positionedWidget;
+          ? Layers.selectedWidget
+          : Layers.positionedWidget;
     }
   }, [isDragging, isThisWidgetDragging, droppableWidget, selected, focused]);
 
diff --git a/app/client/src/utils/replayHelpers.tsx b/app/client/src/utils/replayHelpers.tsx
index df9bbc7e04..24c09d8cee 100644
--- a/app/client/src/utils/replayHelpers.tsx
+++ b/app/client/src/utils/replayHelpers.tsx
@@ -97,8 +97,8 @@ export const showUndoRedoToast = (
   const actionKey = shouldUndo
     ? `${modText()} Z`
     : isMacOrIOS()
-    ? `${modText()} ${shiftText()} Z`
-    : `${modText()} Y`;
+      ? `${modText()} ${shiftText()} Z`
+      : `${modText()} Y`;
 
   toast.show(`${actionText}. Press ${actionKey} to ${action}`);
 };
diff --git a/app/client/src/widgets/AudioRecorderWidget/widget/index.tsx b/app/client/src/widgets/AudioRecorderWidget/widget/index.tsx
index 15ec8e178e..c4090d4abd 100644
--- a/app/client/src/widgets/AudioRecorderWidget/widget/index.tsx
+++ b/app/client/src/widgets/AudioRecorderWidget/widget/index.tsx
@@ -259,7 +259,7 @@ class AudioRecorderWidget extends BaseWidget<
     if (this.props.blobURL) {
       URL.revokeObjectURL(this.props.blobURL);
     }
-
+    this.props.updateWidgetMetaProperty("blobURL", null);
     this.props.updateWidgetMetaProperty("dataURL", undefined);
     this.props.updateWidgetMetaProperty("rawBinary", undefined);
 
diff --git a/app/client/src/widgets/ButtonGroupWidget/component/index.tsx b/app/client/src/widgets/ButtonGroupWidget/component/index.tsx
index a93670ff29..c165962359 100644
--- a/app/client/src/widgets/ButtonGroupWidget/component/index.tsx
+++ b/app/client/src/widgets/ButtonGroupWidget/component/index.tsx
@@ -202,8 +202,8 @@ const StyledButton = styled.button<ThemeProp & ButtonStyleProps>`
         getCustomBackgroundColor(buttonVariant, buttonColor) !== "none"
           ? getCustomBackgroundColor(buttonVariant, buttonColor)
           : buttonVariant === ButtonVariantTypes.PRIMARY
-          ? theme.colors.button.primary.primary.bgColor
-          : "none"
+            ? theme.colors.button.primary.primary.bgColor
+            : "none"
       } !important;
       flex-direction : ${iconAlign === "right" ? "row-reverse" : "row"};
       .bp3-icon {
@@ -221,8 +221,8 @@ const StyledButton = styled.button<ThemeProp & ButtonStyleProps>`
       getCustomBorderColor(buttonVariant, buttonColor) !== "none"
         ? `1px solid ${getCustomBorderColor(buttonVariant, buttonColor)}`
         : buttonVariant === ButtonVariantTypes.SECONDARY
-        ? `1px solid ${theme.colors.button.primary.secondary.borderColor}`
-        : "none"
+          ? `1px solid ${theme.colors.button.primary.secondary.borderColor}`
+          : "none"
     } ${buttonVariant === ButtonVariantTypes.PRIMARY ? "" : "!important"};
 
     & span {
diff --git a/app/client/src/widgets/ButtonWidget/component/index.tsx b/app/client/src/widgets/ButtonWidget/component/index.tsx
index 78ce74c6e2..ddb83bc01d 100644
--- a/app/client/src/widgets/ButtonWidget/component/index.tsx
+++ b/app/client/src/widgets/ButtonWidget/component/index.tsx
@@ -84,8 +84,8 @@ const buttonBaseStyle = css<ThemeProp & ButtonStyleProps>`
       getCustomBackgroundColor(buttonVariant, buttonColor) !== "none"
         ? getCustomBackgroundColor(buttonVariant, buttonColor)
         : buttonVariant === ButtonVariantTypes.PRIMARY
-        ? theme.colors.button.primary.primary.bgColor
-        : "none"
+          ? theme.colors.button.primary.primary.bgColor
+          : "none"
     } !important;
 
 
@@ -109,8 +109,8 @@ const buttonBaseStyle = css<ThemeProp & ButtonStyleProps>`
     getCustomBorderColor(buttonVariant, buttonColor) !== "none"
       ? `1px solid ${getCustomBorderColor(buttonVariant, buttonColor)}`
       : buttonVariant === ButtonVariantTypes.SECONDARY
-      ? `1px solid ${theme.colors.button.primary.secondary.borderColor}`
-      : "none"
+        ? `1px solid ${theme.colors.button.primary.secondary.borderColor}`
+        : "none"
   } !important;
 
   & > * {
diff --git a/app/client/src/widgets/ButtonWidget/component/utils.tsx b/app/client/src/widgets/ButtonWidget/component/utils.tsx
index 8638addcf1..93c31e14de 100644
--- a/app/client/src/widgets/ButtonWidget/component/utils.tsx
+++ b/app/client/src/widgets/ButtonWidget/component/utils.tsx
@@ -19,10 +19,10 @@ export const buttonHoverActiveStyles = css<ButtonContainerProps>`
           getCustomHoverColor(theme, buttonVariant, buttonColor) !== "none"
             ? getCustomHoverColor(theme, buttonVariant, buttonColor)
             : buttonVariant === ButtonVariantTypes.SECONDARY
-            ? theme.colors.button.primary.secondary.hoverColor
-            : buttonVariant === ButtonVariantTypes.TERTIARY
-            ? theme.colors.button.primary.tertiary.hoverColor
-            : theme.colors.button.primary.primary.hoverColor
+              ? theme.colors.button.primary.secondary.hoverColor
+              : buttonVariant === ButtonVariantTypes.TERTIARY
+                ? theme.colors.button.primary.tertiary.hoverColor
+                : theme.colors.button.primary.primary.hoverColor
         } !important;
       `;
     }
diff --git a/app/client/src/widgets/CheckboxGroupWidget/component/index.tsx b/app/client/src/widgets/CheckboxGroupWidget/component/index.tsx
index 251cf9fbe7..983c30a749 100644
--- a/app/client/src/widgets/CheckboxGroupWidget/component/index.tsx
+++ b/app/client/src/widgets/CheckboxGroupWidget/component/index.tsx
@@ -42,10 +42,10 @@ const InputContainer = styled.div<ThemeProp & InputContainerProps>`
     !!optionAlignment
       ? optionAlignment
       : optionCount > 1
-      ? `space-between`
-      : inline
-      ? `flex-start`
-      : `center`};
+        ? `space-between`
+        : inline
+          ? `flex-start`
+          : `center`};
   width: 100%;
   flex-grow: 1;
   height: 100%;
@@ -183,8 +183,8 @@ function CheckboxGroupComponent(props: CheckboxGroupComponentProps) {
   const selectAllState = selectAllChecked
     ? SelectAllStates.CHECKED
     : selectAllIndeterminate
-    ? SelectAllStates.INDETERMINATE
-    : SelectAllStates.UNCHECKED;
+      ? SelectAllStates.INDETERMINATE
+      : SelectAllStates.UNCHECKED;
 
   let optionCount = (options || []).length;
   if (isSelectAll) {
diff --git a/app/client/src/widgets/CustomWidget/component/index.tsx b/app/client/src/widgets/CustomWidget/component/index.tsx
index 8d796d9a30..9099f70913 100644
--- a/app/client/src/widgets/CustomWidget/component/index.tsx
+++ b/app/client/src/widgets/CustomWidget/component/index.tsx
@@ -21,7 +21,7 @@ import { connect } from "react-redux";
 import type { AppState } from "@appsmith/reducers";
 import { combinedPreviewModeSelector } from "selectors/editorSelectors";
 import { getWidgetPropsForPropertyPane } from "selectors/propertyPaneSelectors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { EVENTS } from "./customWidgetscript";
 import { DynamicHeight } from "utils/WidgetFeatures";
 import { getAppsmithConfigs } from "@appsmith/configs";
diff --git a/app/client/src/widgets/CustomWidget/widget/index.tsx b/app/client/src/widgets/CustomWidget/widget/index.tsx
index b829d3ebd6..58f7a3320a 100644
--- a/app/client/src/widgets/CustomWidget/widget/index.tsx
+++ b/app/client/src/widgets/CustomWidget/widget/index.tsx
@@ -32,7 +32,7 @@ import { Link } from "design-system";
 import styled from "styled-components";
 import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
 import { Colors } from "constants/Colors";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 import { DynamicHeight, type WidgetFeatures } from "utils/WidgetFeatures";
 
 const StyledLink = styled(Link)`
diff --git a/app/client/src/widgets/DividerWidget/component/index.tsx b/app/client/src/widgets/DividerWidget/component/index.tsx
index ae547a2b91..f1b79f9763 100644
--- a/app/client/src/widgets/DividerWidget/component/index.tsx
+++ b/app/client/src/widgets/DividerWidget/component/index.tsx
@@ -61,8 +61,8 @@ const CapWrapper = styled.div<{
         ? "left: 0px;"
         : "top: 0px;"
       : props.isHorizontal
-      ? "right: 0px;"
-      : "bottom: 0px;"}
+        ? "right: 0px;"
+        : "bottom: 0px;"}
   ${(props) => (props.isHorizontal ? "top" : "left")}: 50%;
   ${(props) =>
     props.isHorizontal
@@ -83,8 +83,8 @@ const CapWrapper = styled.div<{
             ? "transform: rotate(0deg);"
             : "transform: rotate(90deg);"
           : props.isHorizontal
-          ? "transform: rotate(180deg);"
-          : "transform: rotate(270deg);"}
+            ? "transform: rotate(180deg);"
+            : "transform: rotate(270deg);"}
 
       path {
         transform: translateX(-3px);
diff --git a/app/client/src/widgets/DropdownWidget/component/index.styled.tsx b/app/client/src/widgets/DropdownWidget/component/index.styled.tsx
index 3abaa9c2c7..d15912c4f3 100644
--- a/app/client/src/widgets/DropdownWidget/component/index.styled.tsx
+++ b/app/client/src/widgets/DropdownWidget/component/index.styled.tsx
@@ -58,8 +58,8 @@ export const StyledLabel = styled(Label)<{
     props.$labelTextColor
       ? props.$labelTextColor
       : props.$disabled
-      ? Colors.GREY_8
-      : "inherit"};
+        ? Colors.GREY_8
+        : "inherit"};
   font-size: ${(props) =>
     props.$labelTextSize ? TEXT_SIZES[props.$labelTextSize] : "14px"};
   font-weight: ${(props) =>
diff --git a/app/client/src/widgets/FilepickerWidget/widget/index.tsx b/app/client/src/widgets/FilepickerWidget/widget/index.tsx
index 599833dda8..e5374342ea 100644
--- a/app/client/src/widgets/FilepickerWidget/widget/index.tsx
+++ b/app/client/src/widgets/FilepickerWidget/widget/index.tsx
@@ -455,8 +455,8 @@ class FilePickerWidget extends BaseWidget<
                     this.props.fileDataType === FileDataTypes.Base64
                       ? base64data
                       : this.props.fileDataType === FileDataTypes.Binary
-                      ? rawData
-                      : text,
+                        ? rawData
+                        : text,
                   name: file.meta ? file.meta.name : undefined,
                 };
 
diff --git a/app/client/src/widgets/IconButtonWidget/component/index.tsx b/app/client/src/widgets/IconButtonWidget/component/index.tsx
index fae7eeb477..47c4e344b3 100644
--- a/app/client/src/widgets/IconButtonWidget/component/index.tsx
+++ b/app/client/src/widgets/IconButtonWidget/component/index.tsx
@@ -81,10 +81,10 @@ const IconButtonContainer = styled.div<IconButtonContainerProps>`
         getCustomHoverColor(theme, buttonVariant, buttonColor) !== "none"
           ? getCustomHoverColor(theme, buttonVariant, buttonColor)
           : buttonVariant === ButtonVariantTypes.SECONDARY
-          ? theme.colors.button.primary.secondary.hoverColor
-          : buttonVariant === ButtonVariantTypes.TERTIARY
-          ? theme.colors.button.primary.tertiary.hoverColor
-          : theme.colors.button.primary.primary.hoverColor
+            ? theme.colors.button.primary.secondary.hoverColor
+            : buttonVariant === ButtonVariantTypes.TERTIARY
+              ? theme.colors.button.primary.tertiary.hoverColor
+              : theme.colors.button.primary.primary.hoverColor
       } !important;
     }`
       : ""
@@ -144,8 +144,8 @@ export const StyledButton = styled((props) => (
         getCustomBackgroundColor(buttonVariant, buttonColor) !== "none"
           ? getCustomBackgroundColor(buttonVariant, buttonColor)
           : buttonVariant === ButtonVariantTypes.PRIMARY
-          ? theme.colors.button.primary.primary.bgColor
-          : "none"
+            ? theme.colors.button.primary.primary.bgColor
+            : "none"
       } !important;
     }
 
@@ -156,10 +156,10 @@ export const StyledButton = styled((props) => (
           getCustomHoverColor(theme, buttonVariant, buttonColor) !== "none"
             ? getCustomHoverColor(theme, buttonVariant, buttonColor)
             : buttonVariant === ButtonVariantTypes.SECONDARY
-            ? theme.colors.button.primary.secondary.hoverColor
-            : buttonVariant === ButtonVariantTypes.TERTIARY
-            ? theme.colors.button.primary.tertiary.hoverColor
-            : theme.colors.button.primary.primary.hoverColor
+              ? theme.colors.button.primary.secondary.hoverColor
+              : buttonVariant === ButtonVariantTypes.TERTIARY
+                ? theme.colors.button.primary.tertiary.hoverColor
+                : theme.colors.button.primary.primary.hoverColor
         } !important;
       }`
         : ""
@@ -197,8 +197,8 @@ export const StyledButton = styled((props) => (
       getCustomBorderColor(buttonVariant, buttonColor) !== "none"
         ? `1px solid ${getCustomBorderColor(buttonVariant, buttonColor)}`
         : buttonVariant === ButtonVariantTypes.SECONDARY
-        ? `1px solid ${theme.colors.button.primary.secondary.borderColor}`
-        : "none"
+          ? `1px solid ${theme.colors.button.primary.secondary.borderColor}`
+          : "none"
     } !important;
 
     & > span {
@@ -212,11 +212,11 @@ export const StyledButton = styled((props) => (
         buttonVariant === ButtonVariantTypes.PRIMARY
           ? getComplementaryGrayscaleColor(buttonColor)
           : getCustomBackgroundColor(
-              ButtonVariantTypes.PRIMARY,
-              buttonColor,
-            ) !== "none"
-          ? getCustomBackgroundColor(ButtonVariantTypes.PRIMARY, buttonColor)
-          : `${theme.colors.button.primary.secondary.textColor}`
+                ButtonVariantTypes.PRIMARY,
+                buttonColor,
+              ) !== "none"
+            ? getCustomBackgroundColor(ButtonVariantTypes.PRIMARY, buttonColor)
+            : `${theme.colors.button.primary.secondary.textColor}`
       } !important;
     }
 
diff --git a/app/client/src/widgets/InputWidget/component/index.tsx b/app/client/src/widgets/InputWidget/component/index.tsx
index 08201529c8..57ef1e12a0 100644
--- a/app/client/src/widgets/InputWidget/component/index.tsx
+++ b/app/client/src/widgets/InputWidget/component/index.tsx
@@ -204,12 +204,12 @@ const InputComponentWrapper = styled((props) => (
       labelPosition === LabelPosition.Top
         ? `flex-start`
         : compactMode
-        ? `center`
-        : labelPosition === LabelPosition.Left
-        ? checkInputTypeText(inputType)
-          ? `stretch`
-          : `center`
-        : `flex-start`};
+          ? `center`
+          : labelPosition === LabelPosition.Left
+            ? checkInputTypeText(inputType)
+              ? `stretch`
+              : `center`
+            : `flex-start`};
   }
 `;
 
diff --git a/app/client/src/widgets/JSONFormWidget/widget/helper.ts b/app/client/src/widgets/JSONFormWidget/widget/helper.ts
index 87d07dd8a7..28f19ec728 100644
--- a/app/client/src/widgets/JSONFormWidget/widget/helper.ts
+++ b/app/client/src/widgets/JSONFormWidget/widget/helper.ts
@@ -1,7 +1,7 @@
 import equal from "fast-deep-equal/es6";
 import { difference, isEmpty } from "lodash";
 import log from "loglevel";
-import AnalyticsUtil from "utils/AnalyticsUtil";
+import AnalyticsUtil from "@appsmith/utils/AnalyticsUtil";
 
 import { isDynamicValue } from "utils/DynamicBindingUtils";
 import type { MetaInternalFieldState } from ".";
diff --git a/app/client/src/widgets/JSONFormWidget/widget/index.tsx b/app/client/src/widgets/JSONFormWidget/widget/index.tsx
index a06f054186..7e95a2233e 100644
--- a/app/client/src/widgets/JSONFormWidget/widget/index.tsx
+++ b/app/client/src/widgets/JSONFormWidget/widget/index.tsx
@@ -271,10 +271,9 @@ 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/MenuButtonWidget/component/index.tsx b/app/client/src/widgets/MenuButtonWidget/component/index.tsx
index 223f02179b..43ef98a620 100644
--- a/app/client/src/widgets/MenuButtonWidget/component/index.tsx
+++ b/app/client/src/widgets/MenuButtonWidget/component/index.tsx
@@ -105,8 +105,8 @@ const BaseButton = styled(Button)<ThemeProp & BaseStyleProps>`
         getCustomBackgroundColor(buttonVariant, buttonColor) !== "none"
           ? getCustomBackgroundColor(buttonVariant, buttonColor)
           : buttonVariant === ButtonVariantTypes.PRIMARY
-          ? theme.colors.button.primary.primary.bgColor
-          : "none"
+            ? theme.colors.button.primary.primary.bgColor
+            : "none"
       } !important;
 
     &:hover, &:active, &:focus {
@@ -114,10 +114,10 @@ const BaseButton = styled(Button)<ThemeProp & BaseStyleProps>`
         getCustomHoverColor(theme, buttonVariant, buttonColor) !== "none"
           ? getCustomHoverColor(theme, buttonVariant, buttonColor)
           : buttonVariant === ButtonVariantTypes.SECONDARY
-          ? theme.colors.button.primary.secondary.hoverColor
-          : buttonVariant === ButtonVariantTypes.TERTIARY
-          ? theme.colors.button.primary.tertiary.hoverColor
-          : theme.colors.button.primary.primary.hoverColor
+            ? theme.colors.button.primary.secondary.hoverColor
+            : buttonVariant === ButtonVariantTypes.TERTIARY
+              ? theme.colors.button.primary.tertiary.hoverColor
+              : theme.colors.button.primary.primary.hoverColor
       } !important;
     }
 
@@ -143,8 +143,8 @@ const BaseButton = styled(Button)<ThemeProp & BaseStyleProps>`
       getCustomBorderColor(buttonVariant, buttonColor) !== "none"
         ? `1px solid ${getCustomBorderColor(buttonVariant, buttonColor)}`
         : buttonVariant === ButtonVariantTypes.SECONDARY
-        ? `1px solid ${theme.colors.button.primary.secondary.borderColor}`
-        : "none"
+          ? `1px solid ${theme.colors.button.primary.secondary.borderColor}`
+          : "none"
     } !important;
 
     & > span {
@@ -158,11 +158,11 @@ const BaseButton = styled(Button)<ThemeProp & BaseStyleProps>`
         buttonVariant === ButtonVariantTypes.PRIMARY
           ? getComplementaryGrayscaleColor(buttonColor)
           : getCustomBackgroundColor(
-              ButtonVariantTypes.PRIMARY,
-              buttonColor,
-            ) !== "none"
-          ? getCustomBackgroundColor(ButtonVariantTypes.PRIMARY, buttonColor)
-          : `${theme.colors.button.primary.secondary.textColor}`
+                ButtonVariantTypes.PRIMARY,
+                buttonColor,
+              ) !== "none"
+            ? getCustomBackgroundColor(ButtonVariantTypes.PRIMARY, buttonColor)
+            : `${theme.colors.button.primary.secondary.textColor}`
       } !important;
     }
   `}
diff --git a/app/client/src/widgets/MultiSelectWidget/component/index.tsx b/app/client/src/widgets/MultiSelectWidget/component/index.tsx
index 37e94b277b..c4dc8df9f0 100644
--- a/app/client/src/widgets/MultiSelectWidget/component/index.tsx
+++ b/app/client/src/widgets/MultiSelectWidget/component/index.tsx
@@ -149,12 +149,10 @@ 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/TableWidget/component/AutoToolTipComponent.tsx b/app/client/src/widgets/TableWidget/component/AutoToolTipComponent.tsx
index e092ff9a5c..5997a6c53e 100644
--- a/app/client/src/widgets/TableWidget/component/AutoToolTipComponent.tsx
+++ b/app/client/src/widgets/TableWidget/component/AutoToolTipComponent.tsx
@@ -1,4 +1,5 @@
 import React, { createRef, memo, useEffect, useState } from "react";
+import type { PopoverPosition, PopperBoundary } from "@blueprintjs/core";
 import { Tooltip } from "@blueprintjs/core";
 import { CellWrapper, ColumnWrapper } from "./TableStyledWrappers";
 import type { CellLayoutProperties } from "./Constants";
@@ -38,6 +39,8 @@ interface Props {
   cellProperties?: CellLayoutProperties;
   tableWidth?: number;
   columnType?: string;
+  position?: PopoverPosition;
+  boundary?: PopperBoundary;
 }
 
 function LinkWrapper(props: Props) {
@@ -74,7 +77,7 @@ function LinkWrapper(props: Props) {
               </TooltipContentWrapper>
             }
             hoverOpenDelay={1000}
-            position="top"
+            position={props.position || "top"}
           >
             {<Content ref={ref}>{props.children}</Content>}
           </Tooltip>
@@ -100,6 +103,7 @@ function AutoToolTipComponent(props: Props) {
       updateToolTip(false);
     }
   }, [props.children, ref.current]);
+
   if (props.columnType === ColumnTypes.URL && props.title) {
     return <LinkWrapper {...props} />;
   }
@@ -115,13 +119,14 @@ function AutoToolTipComponent(props: Props) {
         {useToolTip && props.children ? (
           <Tooltip
             autoFocus={false}
+            boundary={props.boundary}
             content={
               <TooltipContentWrapper width={(props.tableWidth || 300) - 32}>
                 {props.title}
               </TooltipContentWrapper>
             }
             hoverOpenDelay={1000}
-            position="top"
+            position={props.position || "top"}
           >
             <Content ref={ref}>{props.children}</Content>
           </Tooltip>
diff --git a/app/client/src/widgets/TableWidget/component/CommonUtilities.ts b/app/client/src/widgets/TableWidget/component/CommonUtilities.ts
index 835a0cccad..394b8fa025 100644
--- a/app/client/src/widgets/TableWidget/component/CommonUtilities.ts
+++ b/app/client/src/widgets/TableWidget/component/CommonUtilities.ts
@@ -25,16 +25,16 @@ export function sortTableFunction(
                 ? 1
                 : -1
               : Number(b[sortedColumn]) > Number(a[sortedColumn])
-              ? 1
-              : -1;
+                ? 1
+                : -1;
           case ColumnTypes.DATE:
             return sortOrder
               ? moment(a[sortedColumn]).isAfter(b[sortedColumn])
                 ? 1
                 : -1
               : moment(b[sortedColumn]).isAfter(a[sortedColumn])
-              ? 1
-              : -1;
+                ? 1
+                : -1;
           default:
             return sortOrder
               ? a[sortedColumn].toString().toUpperCase() >
@@ -42,9 +42,9 @@ export function sortTableFunction(
                 ? 1
                 : -1
               : b[sortedColumn].toString().toUpperCase() >
-                a[sortedColumn].toString().toUpperCase()
-              ? 1
-              : -1;
+                  a[sortedColumn].toString().toUpperCase()
+                ? 1
+                : -1;
         }
       } else {
         return sortOrder ? 1 : 0;
diff --git a/app/client/src/widgets/TableWidget/component/TableUtilities.tsx b/app/client/src/widgets/TableWidget/component/TableUtilities.tsx
index aa9fe57281..d849017832 100644
--- a/app/client/src/widgets/TableWidget/component/TableUtilities.tsx
+++ b/app/client/src/widgets/TableWidget/component/TableUtilities.tsx
@@ -180,8 +180,8 @@ export const renderCell = (
           {value && columnType === ColumnTypes.URL && cellProperties.displayText
             ? cellProperties.displayText
             : !isNil(value) && !isNaN(value)
-            ? value.toString()
-            : ""}
+              ? value.toString()
+              : ""}
         </AutoToolTipComponent>
       );
   }
diff --git a/app/client/src/widgets/TableWidget/component/components/menuButtonTableComponent.tsx b/app/client/src/widgets/TableWidget/component/components/menuButtonTableComponent.tsx
index 8cbf336ed1..e036b0b085 100644
--- a/app/client/src/widgets/TableWidget/component/components/menuButtonTableComponent.tsx
+++ b/app/client/src/widgets/TableWidget/component/components/menuButtonTableComponent.tsx
@@ -96,8 +96,8 @@ const BaseButton = styled(Button)<ThemeProp & BaseStyleProps>`
         getCustomBackgroundColor(buttonVariant, buttonColor) !== "none"
           ? getCustomBackgroundColor(buttonVariant, buttonColor)
           : buttonVariant === ButtonVariantTypes.PRIMARY
-          ? theme.colors.button.primary.primary.bgColor
-          : "none"
+            ? theme.colors.button.primary.primary.bgColor
+            : "none"
       } !important;
     }
 
@@ -106,10 +106,10 @@ const BaseButton = styled(Button)<ThemeProp & BaseStyleProps>`
         getCustomHoverColor(theme, buttonVariant, buttonColor) !== "none"
           ? getCustomHoverColor(theme, buttonVariant, buttonColor)
           : buttonVariant === ButtonVariantTypes.SECONDARY
-          ? theme.colors.button.primary.secondary.hoverColor
-          : buttonVariant === ButtonVariantTypes.TERTIARY
-          ? theme.colors.button.primary.tertiary.hoverColor
-          : theme.colors.button.primary.primary.hoverColor
+            ? theme.colors.button.primary.secondary.hoverColor
+            : buttonVariant === ButtonVariantTypes.TERTIARY
+              ? theme.colors.button.primary.tertiary.hoverColor
+              : theme.colors.button.primary.primary.hoverColor
       } !important;
     }
 
@@ -125,8 +125,8 @@ const BaseButton = styled(Button)<ThemeProp & BaseStyleProps>`
       getCustomBorderColor(buttonVariant, buttonColor) !== "none"
         ? `1px solid ${getCustomBorderColor(buttonVariant, buttonColor)}`
         : buttonVariant === ButtonVariantTypes.SECONDARY
-        ? `1px solid ${theme.colors.button.primary.secondary.borderColor}`
-        : "none"
+          ? `1px solid ${theme.colors.button.primary.secondary.borderColor}`
+          : "none"
     } !important;
 
     & > span {
diff --git a/app/client/src/widgets/TableWidget/widget/derived.js b/app/client/src/widgets/TableWidget/widget/derived.js
index 58fd6d6f5c..d188b413ec 100644
--- a/app/client/src/widgets/TableWidget/widget/derived.js
+++ b/app/client/src/widgets/TableWidget/widget/derived.js
@@ -295,8 +295,8 @@ export default {
                     ? 1
                     : -1
                   : Number(b[sortedColumn]) > Number(a[sortedColumn])
-                  ? 1
-                  : -1;
+                    ? 1
+                    : -1;
               case "date":
                 try {
                   return sortOrder
@@ -306,10 +306,10 @@ export default {
                       ? 1
                       : -1
                     : moment(b[sortedColumn], inputFormat).isAfter(
-                        moment(a[sortedColumn], inputFormat),
-                      )
-                    ? 1
-                    : -1;
+                          moment(a[sortedColumn], inputFormat),
+                        )
+                      ? 1
+                      : -1;
                 } catch (e) {
                   return -1;
                 }
@@ -320,9 +320,9 @@ export default {
                     ? 1
                     : -1
                   : b[sortedColumn].toString().toUpperCase() >
-                    a[sortedColumn].toString().toUpperCase()
-                  ? 1
-                  : -1;
+                      a[sortedColumn].toString().toUpperCase()
+                    ? 1
+                    : -1;
             }
           }
         } else {
diff --git a/app/client/src/widgets/TableWidget/widget/index.tsx b/app/client/src/widgets/TableWidget/widget/index.tsx
index 2561deef58..b09c419d22 100644
--- a/app/client/src/widgets/TableWidget/widget/index.tsx
+++ b/app/client/src/widgets/TableWidget/widget/index.tsx
@@ -764,8 +764,8 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
                   isString(value) || isNumber(value)
                     ? value
                     : isNil(value)
-                    ? ""
-                    : JSON.stringify(value);
+                      ? ""
+                      : JSON.stringify(value);
                 tableRow[accessor] = data;
                 break;
             }
diff --git a/app/client/src/widgets/TableWidget/widget/utilities.ts b/app/client/src/widgets/TableWidget/widget/utilities.ts
index 1b33c503e7..d43c5b7af2 100644
--- a/app/client/src/widgets/TableWidget/widget/utilities.ts
+++ b/app/client/src/widgets/TableWidget/widget/utilities.ts
@@ -58,8 +58,8 @@ export const selectRowIndices = (
     Array.isArray(selectedRowIndicesProp) && primaryColumnId
       ? selectedRowIndicesProp
       : Array.isArray(defaultSelectedRow)
-      ? defaultSelectedRow
-      : [];
+        ? defaultSelectedRow
+        : [];
   const selectedRowIndices = rowIndices
     .map((index: number) => {
       const rowIndex = getOriginalRowIndex(oldTableData, newTableData, index);
diff --git a/app/client/src/widgets/TableWidgetV2/component/Table.tsx b/app/client/src/widgets/TableWidgetV2/component/Table.tsx
index 5f8940543a..83e8c77935 100644
--- a/app/client/src/widgets/TableWidgetV2/component/Table.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/Table.tsx
@@ -422,8 +422,8 @@ export function Table(props: TableProps) {
             props.isLoading
               ? Classes.SKELETON
               : shouldUseVirtual
-              ? "tableWrap virtual"
-              : "tableWrap"
+                ? "tableWrap virtual"
+                : "tableWrap"
           }
           ref={tableWrapperRef}
         >
diff --git a/app/client/src/widgets/TableWidgetV2/component/cellComponents/menuButtonTableComponent.tsx b/app/client/src/widgets/TableWidgetV2/component/cellComponents/menuButtonTableComponent.tsx
index bd3d9dcdf0..0bd26de7bc 100644
--- a/app/client/src/widgets/TableWidgetV2/component/cellComponents/menuButtonTableComponent.tsx
+++ b/app/client/src/widgets/TableWidgetV2/component/cellComponents/menuButtonTableComponent.tsx
@@ -110,8 +110,8 @@ const BaseButton = styled(Button)<ThemeProp & BaseStyleProps>`
         getCustomBackgroundColor(buttonVariant, buttonColor) !== "none"
           ? getCustomBackgroundColor(buttonVariant, buttonColor)
           : buttonVariant === ButtonVariantTypes.PRIMARY
-          ? theme.colors.button.primary.primary.bgColor
-          : "none"
+            ? theme.colors.button.primary.primary.bgColor
+            : "none"
       } !important;
     }
 
@@ -120,10 +120,10 @@ const BaseButton = styled(Button)<ThemeProp & BaseStyleProps>`
         getCustomHoverColor(theme, buttonVariant, buttonColor) !== "none"
           ? getCustomHoverColor(theme, buttonVariant, buttonColor)
           : buttonVariant === ButtonVariantTypes.SECONDARY
-          ? theme.colors.button.primary.secondary.hoverColor
-          : buttonVariant === ButtonVariantTypes.TERTIARY
-          ? theme.colors.button.primary.tertiary.hoverColor
-          : theme.colors.button.primary.primary.hoverColor
+            ? theme.colors.button.primary.secondary.hoverColor
+            : buttonVariant === ButtonVariantTypes.TERTIARY
+              ? theme.colors.button.primary.tertiary.hoverColor
+              : theme.colors.button.primary.primary.hoverColor
       } !important;
     }
 
@@ -136,8 +136,8 @@ const BaseButton = styled(Button)<ThemeProp & BaseStyleProps>`
       getCustomBorderColor(buttonVariant, buttonColor) !== "none"
         ? `1px solid ${getCustomBorderColor(buttonVariant, buttonColor)}`
         : buttonVariant === ButtonVariantTypes.SECONDARY
-        ? `1px solid ${theme.colors.button.primary.secondary.borderColor}`
-        : "none"
+          ? `1px solid ${theme.colors.button.primary.secondary.borderColor}`
+          : "none"
     } !important;
 
     & > span {
diff --git a/app/client/src/widgets/TableWidgetV2/widget/utilities.ts b/app/client/src/widgets/TableWidgetV2/widget/utilities.ts
index cae3e18557..384eeeba88 100644
--- a/app/client/src/widgets/TableWidgetV2/widget/utilities.ts
+++ b/app/client/src/widgets/TableWidgetV2/widget/utilities.ts
@@ -266,8 +266,8 @@ export const getPropertyValue = (
     return isSourceData
       ? getValueForSourceData(value, index)
       : preserveCase
-      ? value[index].toString()
-      : value[index].toString().toUpperCase();
+        ? value[index].toString()
+        : value[index].toString().toUpperCase();
   } else if (value) {
     return preserveCase ? value.toString() : value.toString().toUpperCase();
   } else {
@@ -679,9 +679,8 @@ export const createEditActionColumn = (props: TableWidgetProps) => {
 
         const js = combineDynamicBindings(jsSnippets, stringSegments);
 
-        themeProps[
-          key
-        ] = `{{${props.widgetName}.processedTableData.map((currentRow, currentIndex) => ( ${js}))}}`;
+        themeProps[key] =
+          `{{${props.widgetName}.processedTableData.map((currentRow, currentIndex) => ( ${js}))}}`;
       },
     );
   }
diff --git a/app/client/src/widgets/TabsWidget/widget/index.tsx b/app/client/src/widgets/TabsWidget/widget/index.tsx
index 83820a87aa..ded290425e 100644
--- a/app/client/src/widgets/TabsWidget/widget/index.tsx
+++ b/app/client/src/widgets/TabsWidget/widget/index.tsx
@@ -619,8 +619,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/wds/WDSTableWidget/component/Table.tsx b/app/client/src/widgets/wds/WDSTableWidget/component/Table.tsx
index e001febd98..fe2a414ab4 100644
--- a/app/client/src/widgets/wds/WDSTableWidget/component/Table.tsx
+++ b/app/client/src/widgets/wds/WDSTableWidget/component/Table.tsx
@@ -344,8 +344,8 @@ export function Table(props: TableProps) {
             props.isLoading
               ? Classes.SKELETON
               : shouldUseVirtual
-              ? " virtual"
-              : ""
+                ? " virtual"
+                : ""
           }`}
           data-table-wrapper=""
         >
diff --git a/app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/menuButtonTableComponent.tsx b/app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/menuButtonTableComponent.tsx
index b83bb8776f..a2df411b3a 100644
--- a/app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/menuButtonTableComponent.tsx
+++ b/app/client/src/widgets/wds/WDSTableWidget/component/cellComponents/menuButtonTableComponent.tsx
@@ -110,8 +110,8 @@ const BaseButton = styled(Button)<ThemeProp & BaseStyleProps>`
         getCustomBackgroundColor(buttonVariant, buttonColor) !== "none"
           ? getCustomBackgroundColor(buttonVariant, buttonColor)
           : buttonVariant === ButtonVariantTypes.PRIMARY
-          ? theme.colors.button.primary.primary.bgColor
-          : "none"
+            ? theme.colors.button.primary.primary.bgColor
+            : "none"
       } !important;
     }
 
@@ -120,10 +120,10 @@ const BaseButton = styled(Button)<ThemeProp & BaseStyleProps>`
         getCustomHoverColor(theme, buttonVariant, buttonColor) !== "none"
           ? getCustomHoverColor(theme, buttonVariant, buttonColor)
           : buttonVariant === ButtonVariantTypes.SECONDARY
-          ? theme.colors.button.primary.secondary.hoverColor
-          : buttonVariant === ButtonVariantTypes.TERTIARY
-          ? theme.colors.button.primary.tertiary.hoverColor
-          : theme.colors.button.primary.primary.hoverColor
+            ? theme.colors.button.primary.secondary.hoverColor
+            : buttonVariant === ButtonVariantTypes.TERTIARY
+              ? theme.colors.button.primary.tertiary.hoverColor
+              : theme.colors.button.primary.primary.hoverColor
       } !important;
     }
 
@@ -136,8 +136,8 @@ const BaseButton = styled(Button)<ThemeProp & BaseStyleProps>`
       getCustomBorderColor(buttonVariant, buttonColor) !== "none"
         ? `1px solid ${getCustomBorderColor(buttonVariant, buttonColor)}`
         : buttonVariant === ButtonVariantTypes.SECONDARY
-        ? `1px solid ${theme.colors.button.primary.secondary.borderColor}`
-        : "none"
+          ? `1px solid ${theme.colors.button.primary.secondary.borderColor}`
+          : "none"
     } !important;
 
     & > span {
diff --git a/app/client/src/widgets/wds/WDSTableWidget/widget/utilities.ts b/app/client/src/widgets/wds/WDSTableWidget/widget/utilities.ts
index a13706ef8e..d7eefbab3d 100644
--- a/app/client/src/widgets/wds/WDSTableWidget/widget/utilities.ts
+++ b/app/client/src/widgets/wds/WDSTableWidget/widget/utilities.ts
@@ -261,8 +261,8 @@ export const getPropertyValue = (
     return isSourceData
       ? getValueForSourceData(value, index)
       : preserveCase
-      ? value[index].toString()
-      : value[index].toString().toUpperCase();
+        ? value[index].toString()
+        : value[index].toString().toUpperCase();
   } else if (value) {
     return preserveCase ? value.toString() : value.toString().toUpperCase();
   } else {
diff --git a/app/client/start-caddy.sh b/app/client/start-caddy.sh
new file mode 100755
index 0000000000..f67e2c5d1b
--- /dev/null
+++ b/app/client/start-caddy.sh
@@ -0,0 +1,165 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+if [[ -n ${TRACE-} ]]; then
+    set -o xtrace
+fi
+
+cd "$(dirname "$0")"
+
+if [[ ${1-} =~ ^-*h(elp)?$ ]]; then
+    echo 'Run '"$0"' [option...]
+ --http: Require start with http, instead of the default HTTPS.
+
+--https-port: Port to use for https. Default: 443.
+ --http-port: Port to use for http. Default: 80.
+
+        If neither of the above are set, then we use 443 for https, and 80 for http.
+
+--env-file: Specify an alternate env file. Defaults to ".env" at the root of the project.
+
+A single positional argument can be given to set the backend server proxy address. Example:
+
+'"$0"' https://localhost:8080
+'"$0"' https://host.docker.internal:8080
+'"$0"' https://release.app.appsmith.com
+'"$0"' release  # This is identical to the one above
+' >&2
+    exit
+fi
+
+use_https=1
+run_as=caddy
+
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --https)
+            shift
+            ;;
+        --http)
+            use_https=0
+            shift
+            ;;
+        --https-port)
+            https_listen_port=$2
+            shift 2
+            ;;
+        --http-port)
+            http_listen_port=$2
+            shift 2
+            ;;
+        --env-file)
+            env_file=$2
+            shift
+            shift
+            ;;
+        -*|--*)
+            echo "Unknown option $1" >&2
+            exit 1
+            ;;
+        *)
+            backend="$1"
+            shift
+            ;;
+    esac
+done
+
+if [[ ${backend-} == release ]]; then
+  # Special shortcut for release environment.
+  backend=https://release.app.appsmith.com
+fi
+
+working_dir="$PWD/caddy"
+mkdir -pv "$working_dir"
+
+domain=dev.appsmith.com
+
+upstream_host=localhost
+
+frontend_host=${frontend_host-$upstream_host}
+backend_host=${backend_host-$upstream_host}
+rts_host=${rts_host-$upstream_host}
+
+http_listen_port="${http_listen_port-80}"
+https_listen_port="${https_listen_port-443}"
+
+if [[ -n ${env_file-} && ! -f $env_file ]]; then
+    echo "I got --env-file as '$env_file', but I cannot access it." >&2
+    exit 1
+elif [[ -n ${env_file-} || -f ../../.env ]]; then
+    set -o allexport
+    # shellcheck disable=SC1090
+    source "${env_file-../../.env}"
+    set +o allexport
+else
+    echo "
+        Please populate the .env at the root of the project and run again
+        Or add the environment variables defined in .env.example to the environment
+        -- to enable features
+    " >&2
+fi
+
+caddy_dev_conf="$working_dir/Caddyfile"
+
+APPSMITH_CUSTOM_DOMAIN="$domain" \
+    TMP="$working_dir" \
+    node \
+    "$(git rev-parse --show-toplevel)/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs" \
+    --no-finalize-index-html
+
+changed="$(awk '
+/ root / || /import file_server/ { next }
+/acme_ca_root/ { print "log {\n output file '"$working_dir/logs.txt"'\n}"; next }
+/output stdout/ { print "output file '"$working_dir/logs.txt"'"; next }
+/ handle {/ { skip = 1; print "handle {\n import reverse_proxy 3000\n templates {\n  mime \"text/html; charset=utf-8\"\n }\n}\n" }
+/ handle \/info {/ { skip = 0 }
+!skip { print }
+/https:\/\/'"$domain"' / { print "tls internal" }
+' "$caddy_dev_conf")"
+
+echo "$changed" | caddy fmt - > "$caddy_dev_conf"
+
+# Have to stop and start, instead of reload, so that any new env variables are picked up for Caddy's templating.
+caddy stop --config "$caddy_dev_conf" || true
+remaining_listeners="$(
+    lsof -nP "-iTCP:$http_listen_port" -sTCP:LISTEN || true
+    lsof -nP "-iTCP:$https_listen_port" -sTCP:LISTEN || true
+)"
+if [[ -n $remaining_listeners ]]; then
+    echo $'\nThe following processes are listening on the ports we want to use:\n'"$remaining_listeners"$'\n' >&2
+    answer=
+    for attempt in 1 2 3; do
+        echo -n 'Kill and proceed? [y/n] ' >&2
+        read -rn1 answer
+        if [[ $answer == y ]]; then
+            (lsof -t "-iTCP:$http_listen_port" -sTCP:LISTEN | xargs kill) || true
+            (lsof -t "-iTCP:$https_listen_port" -sTCP:LISTEN | xargs kill) || true
+            break
+        elif [[ $answer == n || $attempt == 3 ]]; then
+            echo $'\nAborting.' >&2
+            exit 1
+        fi
+    done
+fi
+
+caddy start --config "$caddy_dev_conf"
+stop_cmd="caddy --config \"$caddy_dev_conf\" stop"
+
+url_to_open=""
+if [[ $use_https == 1 ]]; then
+    url_to_open="https://$domain"
+    if [[ $https_listen_port != 443 ]]; then
+        url_to_open="$url_to_open:$https_listen_port"
+    fi
+else
+    url_to_open="http://localhost"
+    if [[ $http_listen_port != 80 ]]; then
+        url_to_open="$url_to_open:$http_listen_port"
+    fi
+fi
+
+echo '✅ Started Caddy'
+echo "ℹ️  Stop with: $stop_cmd"
+echo "🎉 $url_to_open"
diff --git a/app/client/start-https.sh b/app/client/start-https.sh
index 46938964e8..b49747d7fe 100755
--- a/app/client/start-https.sh
+++ b/app/client/start-https.sh
@@ -7,6 +7,14 @@ if [[ -n ${TRACE-} ]]; then
     set -o xtrace
 fi
 
+{
+  echo
+  echo "-----------------------------------"
+  echo " ⚠️ This script is deprecated. Please 'brew install caddy' and use start-caddy.sh instead."
+  echo "-----------------------------------"
+  echo
+} >&2
+
 cd "$(dirname "$0")"
 
 if [[ ${1-} =~ ^-*h(elp)?$ ]]; then
@@ -205,6 +213,12 @@ rm -rf "$nginx_dev_conf"
 
 worker_connections=1024
 
+substitutions="$(
+  grep -Eo '{{env "APPSMITH_\w+"}}' public/index.html \
+    | cut -d\" -f2 \
+    | awk '{print "sub_filter '\''{{env \"" $0 "\"}}'\'' '\''" ENVIRON[$0] "'\'';"}'
+)"
+
 echo "
 worker_processes  1;
 
@@ -275,25 +289,7 @@ $(if [[ $use_https == 1 ]]; then echo "
         sub_filter_once off;
         location / {
             proxy_pass $frontend;
-            sub_filter __APPSMITH_SENTRY_DSN__ '${APPSMITH_SENTRY_DSN-}';
-            sub_filter __APPSMITH_SMART_LOOK_ID__ '${APPSMITH_SMART_LOOK_ID-}';
-            sub_filter __APPSMITH_SEGMENT_KEY__ '${APPSMITH_SEGMENT_KEY-}';
-            sub_filter __APPSMITH_ALGOLIA_API_ID__ '${APPSMITH_ALGOLIA_API_ID-}';
-            sub_filter __APPSMITH_ALGOLIA_SEARCH_INDEX_NAME__ '${APPSMITH_ALGOLIA_SEARCH_INDEX_NAME-}';
-            sub_filter __APPSMITH_ALGOLIA_API_KEY__ '${APPSMITH_ALGOLIA_API_KEY-}';
-            sub_filter __APPSMITH_CLIENT_LOG_LEVEL__ '${APPSMITH_CLIENT_LOG_LEVEL-}';
-            sub_filter __APPSMITH_SENTRY_RELEASE__ '${APPSMITH_SENTRY_RELEASE-}';
-            sub_filter __APPSMITH_SENTRY_ENVIRONMENT__ '${APPSMITH_SENTRY_ENVIRONMENT-}';
-            sub_filter __APPSMITH_VERSION_ID__ '${APPSMITH_VERSION_ID-}';
-            sub_filter __APPSMITH_VERSION_RELEASE_DATE__ '${APPSMITH_VERSION_RELEASE_DATE-}';
-            sub_filter __APPSMITH_INTERCOM_APP_ID__ '${APPSMITH_INTERCOM_APP_ID-}';
-            sub_filter __APPSMITH_MAIL_ENABLED__ '${APPSMITH_MAIL_ENABLED-}';
-            sub_filter __APPSMITH_CLOUD_SERVICES_BASE_URL__ '${APPSMITH_CLOUD_SERVICES_BASE_URL-}';
-            sub_filter __APPSMITH_RECAPTCHA_SITE_KEY__ '${APPSMITH_RECAPTCHA_SITE_KEY-}';
-            sub_filter __APPSMITH_DISABLE_INTERCOM__ '${APPSMITH_DISABLE_INTERCOM-}';
-            sub_filter __APPSMITH_ZIPY_SDK_KEY__ '${APPSMITH_ZIPY_SDK_KEY-}';
-            sub_filter __APPSMITH_HIDE_WATERMARK__ '${APPSMITH_HIDE_WATERMARK-}';
-            sub_filter __APPSMITH_DISABLE_IFRAME_WIDGET_SANDBOX__ '${APPSMITH_DISABLE_IFRAME_WIDGET_SANDBOX-}';
+            $substitutions
         }
 
         location /api {
diff --git a/app/client/yarn.lock b/app/client/yarn.lock
index e5a6408ca3..6e71e8ae28 100644
--- a/app/client/yarn.lock
+++ b/app/client/yarn.lock
@@ -861,13 +861,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.8.3":
-  version: 7.23.5
-  resolution: "@babel/code-frame@npm:7.23.5"
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.24.1, @babel/code-frame@npm:^7.24.2, @babel/code-frame@npm:^7.8.3":
+  version: 7.24.2
+  resolution: "@babel/code-frame@npm:7.24.2"
   dependencies:
-    "@babel/highlight": ^7.23.4
-    chalk: ^2.4.2
-  checksum: d90981fdf56a2824a9b14d19a4c0e8db93633fd488c772624b4e83e0ceac6039a27cd298a247c3214faa952bf803ba23696172ae7e7235f3b97f43ba278c569a
+    "@babel/highlight": ^7.24.2
+    picocolors: ^1.0.0
+  checksum: 70e867340cfe09ca5488b2f36372c45cabf43c79a5b6426e6df5ef0611ff5dfa75a57dda841895693de6008f32c21a7c97027a8c7bcabd63a7d17416cbead6f8
   languageName: node
   linkType: hard
 
@@ -878,26 +878,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.1.0, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.16.0, @babel/core@npm:^7.18.9, @babel/core@npm:^7.19.6, @babel/core@npm:^7.20.12, @babel/core@npm:^7.21.3, @babel/core@npm:^7.23.0, @babel/core@npm:^7.23.2, @babel/core@npm:^7.7.2, @babel/core@npm:^7.8.0":
-  version: 7.23.9
-  resolution: "@babel/core@npm:7.23.9"
+"@babel/core@npm:^7.1.0, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.16.0, @babel/core@npm:^7.18.9, @babel/core@npm:^7.19.6, @babel/core@npm:^7.21.3, @babel/core@npm:^7.23.0, @babel/core@npm:^7.23.2, @babel/core@npm:^7.23.5, @babel/core@npm:^7.23.9, @babel/core@npm:^7.7.2, @babel/core@npm:^7.8.0":
+  version: 7.24.4
+  resolution: "@babel/core@npm:7.24.4"
   dependencies:
     "@ampproject/remapping": ^2.2.0
-    "@babel/code-frame": ^7.23.5
-    "@babel/generator": ^7.23.6
+    "@babel/code-frame": ^7.24.2
+    "@babel/generator": ^7.24.4
     "@babel/helper-compilation-targets": ^7.23.6
     "@babel/helper-module-transforms": ^7.23.3
-    "@babel/helpers": ^7.23.9
-    "@babel/parser": ^7.23.9
-    "@babel/template": ^7.23.9
-    "@babel/traverse": ^7.23.9
-    "@babel/types": ^7.23.9
+    "@babel/helpers": ^7.24.4
+    "@babel/parser": ^7.24.4
+    "@babel/template": ^7.24.0
+    "@babel/traverse": ^7.24.1
+    "@babel/types": ^7.24.0
     convert-source-map: ^2.0.0
     debug: ^4.1.0
     gensync: ^1.0.0-beta.2
     json5: ^2.2.3
     semver: ^6.3.1
-  checksum: 634a511f74db52a5f5a283c1121f25e2227b006c095b84a02a40a9213842489cd82dc7d61cdc74e10b5bcd9bb0a4e28bab47635b54c7e2256d47ab57356e2a76
+  checksum: 15ecad7581f3329995956ba461961b1af7bed48901f14fe962ccd3217edca60049e9e6ad4ce48134618397e6c90230168c842e2c28e47ef1f16c97dbbf663c61
   languageName: node
   linkType: hard
 
@@ -915,15 +915,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.23.0, @babel/generator@npm:^7.23.6, @babel/generator@npm:^7.7.2":
-  version: 7.23.6
-  resolution: "@babel/generator@npm:7.23.6"
+"@babel/generator@npm:^7.23.0, @babel/generator@npm:^7.24.1, @babel/generator@npm:^7.24.4, @babel/generator@npm:^7.7.2":
+  version: 7.24.4
+  resolution: "@babel/generator@npm:7.24.4"
   dependencies:
-    "@babel/types": ^7.23.6
-    "@jridgewell/gen-mapping": ^0.3.2
-    "@jridgewell/trace-mapping": ^0.3.17
+    "@babel/types": ^7.24.0
+    "@jridgewell/gen-mapping": ^0.3.5
+    "@jridgewell/trace-mapping": ^0.3.25
     jsesc: ^2.5.1
-  checksum: 1a1a1c4eac210f174cd108d479464d053930a812798e09fee069377de39a893422df5b5b146199ead7239ae6d3a04697b45fc9ac6e38e0f6b76374390f91fc6c
+  checksum: 1b6146c31386c9df3eb594a2c36b5c98da4f67f7c06edb3d68a442b92516b21bb5ba3ad7dbe0058fe76625ed24d66923e15c95b0df75ef1907d4068921a699b8
   languageName: node
   linkType: hard
 
@@ -1089,10 +1089,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.16.7, @babel/helper-plugin-utils@npm:^7.17.12, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
-  version: 7.22.5
-  resolution: "@babel/helper-plugin-utils@npm:7.22.5"
-  checksum: c0fc7227076b6041acd2f0e818145d2e8c41968cc52fb5ca70eed48e21b8fe6dd88a0a91cbddf4951e33647336eb5ae184747ca706817ca3bef5e9e905151ff5
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.16.7, @babel/helper-plugin-utils@npm:^7.17.12, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.0, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
+  version: 7.24.0
+  resolution: "@babel/helper-plugin-utils@npm:7.24.0"
+  checksum: e2baa0eede34d2fa2265947042aa84d444aa48dc51e9feedea55b67fc1bc3ab051387e18b33ca7748285a6061390831ab82f8a2c767d08470b93500ec727e9b9
   languageName: node
   linkType: hard
 
@@ -1181,34 +1181,35 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.23.9":
-  version: 7.23.9
-  resolution: "@babel/helpers@npm:7.23.9"
+"@babel/helpers@npm:^7.24.4":
+  version: 7.24.4
+  resolution: "@babel/helpers@npm:7.24.4"
   dependencies:
-    "@babel/template": ^7.23.9
-    "@babel/traverse": ^7.23.9
-    "@babel/types": ^7.23.9
-  checksum: 2678231192c0471dbc2fc403fb19456cc46b1afefcfebf6bc0f48b2e938fdb0fef2e0fe90c8c8ae1f021dae5012b700372e4b5d15867f1d7764616532e4a6324
+    "@babel/template": ^7.24.0
+    "@babel/traverse": ^7.24.1
+    "@babel/types": ^7.24.0
+  checksum: ecd2dc0b3b32e24b97fa3bcda432dd3235b77c2be1e16eafc35b8ef8f6c461faa99796a8bc2431a408c98b4aabfd572c160e2b67ecea4c5c9dd3a8314a97994a
   languageName: node
   linkType: hard
 
-"@babel/highlight@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/highlight@npm:7.23.4"
+"@babel/highlight@npm:^7.24.2":
+  version: 7.24.2
+  resolution: "@babel/highlight@npm:7.24.2"
   dependencies:
     "@babel/helper-validator-identifier": ^7.22.20
     chalk: ^2.4.2
     js-tokens: ^4.0.0
-  checksum: 643acecdc235f87d925979a979b539a5d7d1f31ae7db8d89047269082694122d11aa85351304c9c978ceeb6d250591ccadb06c366f358ccee08bb9c122476b89
+    picocolors: ^1.0.0
+  checksum: 5f17b131cc3ebf3ab285a62cf98a404aef1bd71a6be045e748f8d5bf66d6a6e1aefd62f5972c84369472e8d9f22a614c58a89cd331eb60b7ba965b31b1bbeaf5
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.0, @babel/parser@npm:^7.23.9":
-  version: 7.23.9
-  resolution: "@babel/parser@npm:7.23.9"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.0, @babel/parser@npm:^7.24.0, @babel/parser@npm:^7.24.1, @babel/parser@npm:^7.24.4":
+  version: 7.24.4
+  resolution: "@babel/parser@npm:7.24.4"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: e7cd4960ac8671774e13803349da88d512f9292d7baa952173260d3e8f15620a28a3701f14f709d769209022f9e7b79965256b8be204fc550cfe783cdcabe7c7
+  checksum: 94c9e3e592894cd6fc57c519f4e06b65463df9be5f01739bb0d0bfce7ffcf99b3c2fdadd44dc59cc858ba2739ce6e469813a941c2f2dfacf333a3b2c9c5c8465
   languageName: node
   linkType: hard
 
@@ -2115,25 +2116,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx-self@npm:^7.18.6":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-react-jsx-self@npm:7.22.5"
+"@babel/plugin-transform-react-jsx-self@npm:^7.23.3":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-react-jsx-self@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.24.0
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 671eebfabd14a0c7d6ae805fff7e289dfdb7ba984bb100ea2ef6dad1d6a665ebbb09199ab2e64fca7bc78bd0fdc80ca897b07996cf215fafc32c67bc564309af
+  checksum: a0ff893b946bb0e501ad5aab43ce4b321ed9e74b94c0bc7191e2ee6409014fc96ee1a47dcb1ecdf445c44868564667ae16507ed4516dcacf6aa9c37a0ad28382
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx-source@npm:^7.19.6":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-react-jsx-source@npm:7.22.5"
+"@babel/plugin-transform-react-jsx-source@npm:^7.23.3":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-react-jsx-source@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.24.0
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 4ca2bd62ca14f8bbdcda9139f3f799e1c1c1bae504b67c1ca9bca142c53d81926d1a2b811f66a625f20999b2d352131053d886601f1ba3c1e9378c104d884277
+  checksum: 396ce878dc588e74113d38c5a1773e0850bb878a073238a74f8cdf62d968d56a644f5485bf4032dc095fe8863fe2bd9fbbbab6abc3adf69542e038ac5c689d4c
   languageName: node
   linkType: hard
 
@@ -2525,43 +2526,43 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.22.15, @babel/template@npm:^7.23.9, @babel/template@npm:^7.3.3":
-  version: 7.23.9
-  resolution: "@babel/template@npm:7.23.9"
+"@babel/template@npm:^7.22.15, @babel/template@npm:^7.24.0, @babel/template@npm:^7.3.3":
+  version: 7.24.0
+  resolution: "@babel/template@npm:7.24.0"
   dependencies:
     "@babel/code-frame": ^7.23.5
-    "@babel/parser": ^7.23.9
-    "@babel/types": ^7.23.9
-  checksum: 6e67414c0f7125d7ecaf20c11fab88085fa98a96c3ef10da0a61e962e04fdf3a18a496a66047005ddd1bb682a7cc7842d556d1db2f3f3f6ccfca97d5e445d342
+    "@babel/parser": ^7.24.0
+    "@babel/types": ^7.24.0
+  checksum: f257b003c071a0cecdbfceca74185f18fe62c055469ab5c1d481aab12abeebed328e67e0a19fd978a2a8de97b28953fa4bc3da6d038a7345fdf37923b9fcdec8
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.23.9, @babel/traverse@npm:^7.4.5, @babel/traverse@npm:^7.7.2":
-  version: 7.23.9
-  resolution: "@babel/traverse@npm:7.23.9"
+"@babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.24.1, @babel/traverse@npm:^7.4.5, @babel/traverse@npm:^7.7.2":
+  version: 7.24.1
+  resolution: "@babel/traverse@npm:7.24.1"
   dependencies:
-    "@babel/code-frame": ^7.23.5
-    "@babel/generator": ^7.23.6
+    "@babel/code-frame": ^7.24.1
+    "@babel/generator": ^7.24.1
     "@babel/helper-environment-visitor": ^7.22.20
     "@babel/helper-function-name": ^7.23.0
     "@babel/helper-hoist-variables": ^7.22.5
     "@babel/helper-split-export-declaration": ^7.22.6
-    "@babel/parser": ^7.23.9
-    "@babel/types": ^7.23.9
+    "@babel/parser": ^7.24.1
+    "@babel/types": ^7.24.0
     debug: ^4.3.1
     globals: ^11.1.0
-  checksum: a932f7aa850e158c00c97aad22f639d48c72805c687290f6a73e30c5c4957c07f5d28310c9bf59648e2980fe6c9d16adeb2ff92a9ca0f97fa75739c1328fc6c3
+  checksum: 92a5ca906abfba9df17666d2001ab23f18600035f706a687055a0e392a690ae48d6fec67c8bd4ef19ba18699a77a5b7f85727e36b83f7d110141608fe0c24fe9
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.3, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.6, @babel/types@npm:^7.23.9, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.23.9
-  resolution: "@babel/types@npm:7.23.9"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.3, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.24.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.24.0
+  resolution: "@babel/types@npm:7.24.0"
   dependencies:
     "@babel/helper-string-parser": ^7.23.4
     "@babel/helper-validator-identifier": ^7.22.20
     to-fast-properties: ^2.0.0
-  checksum: 0a9b008e9bfc89beb8c185e620fa0f8ed6c771f1e1b2e01e1596870969096fec7793898a1d64a035176abf1dd13e2668ee30bf699f2d92c210a8128f4b151e65
+  checksum: 4b574a37d490f621470ff36a5afaac6deca5546edcb9b5e316d39acbb20998e9c2be42f3fc0bf2b55906fc49ff2a5a6a097e8f5a726ee3f708a0b0ca93aed807
   languageName: node
   linkType: hard
 
@@ -2701,6 +2702,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@chromatic-com/storybook@npm:^1.3.3":
+  version: 1.3.3
+  resolution: "@chromatic-com/storybook@npm:1.3.3"
+  dependencies:
+    chromatic: ^11.3.0
+    filesize: ^10.0.12
+    jsonfile: ^6.1.0
+    react-confetti: ^6.1.0
+    strip-ansi: ^7.1.0
+  checksum: c61819e318642c4530b4a1edc02b428798e70b83d827ab433bff4dd62a05bc947dce4e7ba5b09213216f1f5fcd0fdb54ad306ffe885a2affb23da6648f5219ac
+  languageName: node
+  linkType: hard
+
 "@colors/colors@npm:1.5.0":
   version: 1.5.0
   resolution: "@colors/colors@npm:1.5.0"
@@ -2997,37 +3011,33 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@design-system/storybook@workspace:packages/storybook"
   dependencies:
+    "@chromatic-com/storybook": ^1.3.3
     "@design-system/headless": "workspace:^"
     "@design-system/theming": "workspace:^"
     "@design-system/widgets": "workspace:^"
     "@design-system/widgets-old": "workspace:^"
-    "@storybook/addon-a11y": ^7.6.12
-    "@storybook/addon-controls": ^7.6.12
-    "@storybook/addon-docs": ^7.6.12
-    "@storybook/addon-measure": ^7.6.12
-    "@storybook/addon-outline": ^7.6.12
-    "@storybook/addon-toolbars": ^7.6.12
-    "@storybook/addon-viewport": ^7.6.12
-    "@storybook/blocks": ^7.6.12
-    "@storybook/builder-vite": ^7.6.12
-    "@storybook/components": ^7.6.12
-    "@storybook/manager-api": ^7.6.12
-    "@storybook/preset-create-react-app": ^7.6.12
-    "@storybook/react-vite": ^7.6.12
-    "@storybook/theming": ^7.6.12
+    "@storybook/addon-a11y": ^8.0.8
+    "@storybook/addon-controls": ^8.0.8
+    "@storybook/addon-docs": ^8.0.8
+    "@storybook/addon-measure": ^8.0.8
+    "@storybook/addon-outline": ^8.0.8
+    "@storybook/addon-toolbars": ^8.0.8
+    "@storybook/addon-viewport": ^8.0.8
+    "@storybook/blocks": ^8.0.8
+    "@storybook/builder-vite": ^8.0.8
+    "@storybook/components": ^8.0.8
+    "@storybook/manager-api": ^8.0.8
+    "@storybook/preset-create-react-app": ^8.0.8
+    "@storybook/react-vite": ^8.0.8
+    "@storybook/theming": ^8.0.8
+    "@vitejs/plugin-react": ^4.2.1
     babel-loader: 9.1.2
-    chromatic: ^6.20.0
+    chromatic: ^11.3.0
     colorjs.io: ^0.4.3
-    postcss: "*"
-    postcss-at-rules-variables: "*"
-    postcss-each: "*"
-    postcss-import: "*"
-    postcss-loader: "*"
-    postcss-modules-values: "*"
     react-docgen-typescript: ^2.2.2
-    storybook: ^7.6.12
-    vite: ^4.5.2
-    vite-plugin-svgr: ^3.2.0
+    storybook: ^8.0.8
+    vite: ^5.2.9
+    vite-plugin-svgr: ^4.2.0
   languageName: unknown
   linkType: soft
 
@@ -3293,12 +3303,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emotion/use-insertion-effect-with-fallbacks@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@emotion/use-insertion-effect-with-fallbacks@npm:1.0.0"
+"@emotion/use-insertion-effect-with-fallbacks@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "@emotion/use-insertion-effect-with-fallbacks@npm:1.0.1"
   peerDependencies:
     react: ">=16.8.0"
-  checksum: 4f06a3b48258c832aa8022a262572061a31ff078d377e9164cccc99951309d70f4466e774fe704461b2f8715007a82ed625a54a5c7a127c89017d3ce3187d4f1
+  checksum: 700b6e5bbb37a9231f203bb3af11295eed01d73b2293abece0bc2a2237015e944d7b5114d4887ad9a79776504aa51ed2a8b0ddbc117c54495dd01a6b22f93786
   languageName: node
   linkType: hard
 
@@ -3330,10 +3340,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/android-arm64@npm:0.18.20"
-  conditions: os=android & cpu=arm64
+"@esbuild/aix-ppc64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/aix-ppc64@npm:0.20.2"
+  conditions: os=aix & cpu=ppc64
   languageName: node
   linkType: hard
 
@@ -3344,10 +3354,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/android-arm@npm:0.18.20"
-  conditions: os=android & cpu=arm
+"@esbuild/android-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/android-arm64@npm:0.20.2"
+  conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
 
@@ -3358,10 +3368,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-x64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/android-x64@npm:0.18.20"
-  conditions: os=android & cpu=x64
+"@esbuild/android-arm@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/android-arm@npm:0.20.2"
+  conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
 
@@ -3372,10 +3382,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/darwin-arm64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/darwin-arm64@npm:0.18.20"
-  conditions: os=darwin & cpu=arm64
+"@esbuild/android-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/android-x64@npm:0.20.2"
+  conditions: os=android & cpu=x64
   languageName: node
   linkType: hard
 
@@ -3386,10 +3396,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/darwin-x64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/darwin-x64@npm:0.18.20"
-  conditions: os=darwin & cpu=x64
+"@esbuild/darwin-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/darwin-arm64@npm:0.20.2"
+  conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
@@ -3400,10 +3410,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-arm64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/freebsd-arm64@npm:0.18.20"
-  conditions: os=freebsd & cpu=arm64
+"@esbuild/darwin-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/darwin-x64@npm:0.20.2"
+  conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
@@ -3414,10 +3424,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-x64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/freebsd-x64@npm:0.18.20"
-  conditions: os=freebsd & cpu=x64
+"@esbuild/freebsd-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/freebsd-arm64@npm:0.20.2"
+  conditions: os=freebsd & cpu=arm64
   languageName: node
   linkType: hard
 
@@ -3428,10 +3438,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-arm64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-arm64@npm:0.18.20"
-  conditions: os=linux & cpu=arm64
+"@esbuild/freebsd-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/freebsd-x64@npm:0.20.2"
+  conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
 
@@ -3442,10 +3452,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-arm@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-arm@npm:0.18.20"
-  conditions: os=linux & cpu=arm
+"@esbuild/linux-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-arm64@npm:0.20.2"
+  conditions: os=linux & cpu=arm64
   languageName: node
   linkType: hard
 
@@ -3456,10 +3466,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-ia32@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-ia32@npm:0.18.20"
-  conditions: os=linux & cpu=ia32
+"@esbuild/linux-arm@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-arm@npm:0.20.2"
+  conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
@@ -3470,10 +3480,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-loong64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-loong64@npm:0.18.20"
-  conditions: os=linux & cpu=loong64
+"@esbuild/linux-ia32@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-ia32@npm:0.20.2"
+  conditions: os=linux & cpu=ia32
   languageName: node
   linkType: hard
 
@@ -3484,10 +3494,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-mips64el@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-mips64el@npm:0.18.20"
-  conditions: os=linux & cpu=mips64el
+"@esbuild/linux-loong64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-loong64@npm:0.20.2"
+  conditions: os=linux & cpu=loong64
   languageName: node
   linkType: hard
 
@@ -3498,10 +3508,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-ppc64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-ppc64@npm:0.18.20"
-  conditions: os=linux & cpu=ppc64
+"@esbuild/linux-mips64el@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-mips64el@npm:0.20.2"
+  conditions: os=linux & cpu=mips64el
   languageName: node
   linkType: hard
 
@@ -3512,10 +3522,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-riscv64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-riscv64@npm:0.18.20"
-  conditions: os=linux & cpu=riscv64
+"@esbuild/linux-ppc64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-ppc64@npm:0.20.2"
+  conditions: os=linux & cpu=ppc64
   languageName: node
   linkType: hard
 
@@ -3526,10 +3536,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-s390x@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-s390x@npm:0.18.20"
-  conditions: os=linux & cpu=s390x
+"@esbuild/linux-riscv64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-riscv64@npm:0.20.2"
+  conditions: os=linux & cpu=riscv64
   languageName: node
   linkType: hard
 
@@ -3540,10 +3550,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-x64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-x64@npm:0.18.20"
-  conditions: os=linux & cpu=x64
+"@esbuild/linux-s390x@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-s390x@npm:0.20.2"
+  conditions: os=linux & cpu=s390x
   languageName: node
   linkType: hard
 
@@ -3554,10 +3564,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/netbsd-x64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/netbsd-x64@npm:0.18.20"
-  conditions: os=netbsd & cpu=x64
+"@esbuild/linux-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-x64@npm:0.20.2"
+  conditions: os=linux & cpu=x64
   languageName: node
   linkType: hard
 
@@ -3568,10 +3578,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/openbsd-x64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/openbsd-x64@npm:0.18.20"
-  conditions: os=openbsd & cpu=x64
+"@esbuild/netbsd-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/netbsd-x64@npm:0.20.2"
+  conditions: os=netbsd & cpu=x64
   languageName: node
   linkType: hard
 
@@ -3582,10 +3592,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/sunos-x64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/sunos-x64@npm:0.18.20"
-  conditions: os=sunos & cpu=x64
+"@esbuild/openbsd-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/openbsd-x64@npm:0.20.2"
+  conditions: os=openbsd & cpu=x64
   languageName: node
   linkType: hard
 
@@ -3596,10 +3606,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/win32-arm64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/win32-arm64@npm:0.18.20"
-  conditions: os=win32 & cpu=arm64
+"@esbuild/sunos-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/sunos-x64@npm:0.20.2"
+  conditions: os=sunos & cpu=x64
   languageName: node
   linkType: hard
 
@@ -3610,10 +3620,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/win32-ia32@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/win32-ia32@npm:0.18.20"
-  conditions: os=win32 & cpu=ia32
+"@esbuild/win32-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/win32-arm64@npm:0.20.2"
+  conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
@@ -3624,10 +3634,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/win32-x64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/win32-x64@npm:0.18.20"
-  conditions: os=win32 & cpu=x64
+"@esbuild/win32-ia32@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/win32-ia32@npm:0.20.2"
+  conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
@@ -3638,6 +3648,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/win32-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/win32-x64@npm:0.20.2"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@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"
@@ -4508,7 +4525,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/transform@npm:^29.3.1, @jest/transform@npm:^29.5.0":
+"@jest/transform@npm:^29.5.0":
   version: 29.6.2
   resolution: "@jest/transform@npm:29.6.2"
   dependencies:
@@ -4600,28 +4617,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.2":
-  version: 0.3.2
-  resolution: "@jridgewell/gen-mapping@npm:0.3.2"
+"@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.2, @jridgewell/gen-mapping@npm:^0.3.5":
+  version: 0.3.5
+  resolution: "@jridgewell/gen-mapping@npm:0.3.5"
   dependencies:
-    "@jridgewell/set-array": ^1.0.1
+    "@jridgewell/set-array": ^1.2.1
     "@jridgewell/sourcemap-codec": ^1.4.10
-    "@jridgewell/trace-mapping": ^0.3.9
-  checksum: 1832707a1c476afebe4d0fbbd4b9434fdb51a4c3e009ab1e9938648e21b7a97049fa6009393bdf05cab7504108413441df26d8a3c12193996e65493a4efb6882
+    "@jridgewell/trace-mapping": ^0.3.24
+  checksum: ff7a1764ebd76a5e129c8890aa3e2f46045109dabde62b0b6c6a250152227647178ff2069ea234753a690d8f3c4ac8b5e7b267bbee272bffb7f3b0a370ab6e52
   languageName: node
   linkType: hard
 
-"@jridgewell/resolve-uri@npm:3.1.0, @jridgewell/resolve-uri@npm:^3.0.3":
-  version: 3.1.0
-  resolution: "@jridgewell/resolve-uri@npm:3.1.0"
-  checksum: b5ceaaf9a110fcb2780d1d8f8d4a0bfd216702f31c988d8042e5f8fbe353c55d9b0f55a1733afdc64806f8e79c485d2464680ac48a0d9fcadb9548ee6b81d267
+"@jridgewell/resolve-uri@npm:^3.0.3, @jridgewell/resolve-uri@npm:^3.1.0":
+  version: 3.1.2
+  resolution: "@jridgewell/resolve-uri@npm:3.1.2"
+  checksum: 83b85f72c59d1c080b4cbec0fef84528963a1b5db34e4370fa4bd1e3ff64a0d80e0cee7369d11d73c704e0286fb2865b530acac7a871088fbe92b5edf1000870
   languageName: node
   linkType: hard
 
-"@jridgewell/set-array@npm:^1.0.0, @jridgewell/set-array@npm:^1.0.1":
-  version: 1.1.2
-  resolution: "@jridgewell/set-array@npm:1.1.2"
-  checksum: 69a84d5980385f396ff60a175f7177af0b8da4ddb81824cb7016a9ef914eee9806c72b6b65942003c63f7983d4f39a5c6c27185bbca88eb4690b62075602e28e
+"@jridgewell/set-array@npm:^1.0.0, @jridgewell/set-array@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "@jridgewell/set-array@npm:1.2.1"
+  checksum: 832e513a85a588f8ed4f27d1279420d8547743cc37fcad5a5a76fc74bb895b013dfe614d0eed9cb860048e6546b798f8f2652020b4b2ba0561b05caa8c654b10
   languageName: node
   linkType: hard
 
@@ -4635,14 +4652,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/sourcemap-codec@npm:1.4.14":
-  version: 1.4.14
-  resolution: "@jridgewell/sourcemap-codec@npm:1.4.14"
-  checksum: 61100637b6d173d3ba786a5dff019e1a74b1f394f323c1fee337ff390239f053b87266c7a948777f4b1ee68c01a8ad0ab61e5ff4abb5a012a0b091bec391ab97
-  languageName: node
-  linkType: hard
-
-"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.13, @jridgewell/sourcemap-codec@npm:^1.4.15":
+"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.13, @jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.15":
   version: 1.4.15
   resolution: "@jridgewell/sourcemap-codec@npm:1.4.15"
   checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8
@@ -4659,13 +4669,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.15, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.18, @jridgewell/trace-mapping@npm:^0.3.9":
-  version: 0.3.18
-  resolution: "@jridgewell/trace-mapping@npm:0.3.18"
+"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.15, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.18, @jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25, @jridgewell/trace-mapping@npm:^0.3.9":
+  version: 0.3.25
+  resolution: "@jridgewell/trace-mapping@npm:0.3.25"
   dependencies:
-    "@jridgewell/resolve-uri": 3.1.0
-    "@jridgewell/sourcemap-codec": 1.4.14
-  checksum: 0572669f855260808c16fe8f78f5f1b4356463b11d3f2c7c0b5580c8ba1cbf4ae53efe9f627595830856e57dbac2325ac17eb0c3dd0ec42102e6f227cc289c02
+    "@jridgewell/resolve-uri": ^3.1.0
+    "@jridgewell/sourcemap-codec": ^1.4.14
+  checksum: 9d3c40d225e139987b50c48988f8717a54a8c994d8a948ee42e1412e08988761d0754d7d10b803061cc3aebf35f92a5dbbab493bd0e1a9ef9e89a2130e83ba34
   languageName: node
   linkType: hard
 
@@ -4714,15 +4724,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@mdx-js/react@npm:^2.1.5":
-  version: 2.3.0
-  resolution: "@mdx-js/react@npm:2.3.0"
+"@mdx-js/react@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "@mdx-js/react@npm:3.0.1"
   dependencies:
     "@types/mdx": ^2.0.0
-    "@types/react": ">=16"
   peerDependencies:
+    "@types/react": ">=16"
     react: ">=16"
-  checksum: f45fe779556e6cd9a787f711274480e0638b63c460f192ebdcd77cc07ffa61e23c98cb46dd46e577093e1cb4997a232a848d1fb0ba850ae204422cf603add524
+  checksum: 1063a597264f6a8840aa13274a99beef8983a88dd45b0c5b8e48e6216bc23d33e247da8e2d95d6e1874483f8b4e0903b166ce5046874aa7ffa2b1333057dcddf
   languageName: node
   linkType: hard
 
@@ -5393,15 +5403,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@radix-ui/number@npm:1.0.1":
-  version: 1.0.1
-  resolution: "@radix-ui/number@npm:1.0.1"
-  dependencies:
-    "@babel/runtime": ^7.13.10
-  checksum: 621ea8b7d4195d1a65a9c0aee918e8335e7f198088eec91577512c89c2ba3a3bab4a767cfb872a2b9c3092a78ff41cad9a924845a939f6bb87fe9356241ea0ea
-  languageName: node
-  linkType: hard
-
 "@radix-ui/primitive@npm:1.0.0":
   version: 1.0.0
   resolution: "@radix-ui/primitive@npm:1.0.0"
@@ -5469,29 +5470,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@radix-ui/react-collection@npm:1.0.3":
-  version: 1.0.3
-  resolution: "@radix-ui/react-collection@npm:1.0.3"
-  dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/react-compose-refs": 1.0.1
-    "@radix-ui/react-context": 1.0.1
-    "@radix-ui/react-primitive": 1.0.3
-    "@radix-ui/react-slot": 1.0.2
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-    react-dom: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: acfbc9b0b2c553d343c22f02c9f098bc5cfa99e6e48df91c0d671855013f8b877ade9c657b7420a7aa523b5aceadea32a60dd72c23b1291f415684fb45d00cff
-  languageName: node
-  linkType: hard
-
 "@radix-ui/react-compose-refs@npm:1.0.0":
   version: 1.0.0
   resolution: "@radix-ui/react-compose-refs@npm:1.0.0"
@@ -5581,21 +5559,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@radix-ui/react-direction@npm:1.0.1":
-  version: 1.0.1
-  resolution: "@radix-ui/react-direction@npm:1.0.1"
-  dependencies:
-    "@babel/runtime": ^7.13.10
-  peerDependencies:
-    "@types/react": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 5336a8b0d4f1cde585d5c2b4448af7b3d948bb63a1aadb37c77771b0e5902dc6266e409cf35fd0edaca7f33e26424be19e64fb8f9d7f7be2d6f1714ea2764210
-  languageName: node
-  linkType: hard
-
 "@radix-ui/react-dismissable-layer@npm:1.0.3":
   version: 1.0.3
   resolution: "@radix-ui/react-dismissable-layer@npm:1.0.3"
@@ -6085,94 +6048,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@radix-ui/react-roving-focus@npm:1.0.4":
-  version: 1.0.4
-  resolution: "@radix-ui/react-roving-focus@npm:1.0.4"
-  dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/primitive": 1.0.1
-    "@radix-ui/react-collection": 1.0.3
-    "@radix-ui/react-compose-refs": 1.0.1
-    "@radix-ui/react-context": 1.0.1
-    "@radix-ui/react-direction": 1.0.1
-    "@radix-ui/react-id": 1.0.1
-    "@radix-ui/react-primitive": 1.0.3
-    "@radix-ui/react-use-callback-ref": 1.0.1
-    "@radix-ui/react-use-controllable-state": 1.0.1
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-    react-dom: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 69b1c82c2d9db3ba71549a848f2704200dab1b2cd22d050c1e081a78b9a567dbfdc7fd0403ee010c19b79652de69924d8ca2076cd031d6552901e4213493ffc7
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-select@npm:^1.2.2":
-  version: 1.2.2
-  resolution: "@radix-ui/react-select@npm:1.2.2"
-  dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/number": 1.0.1
-    "@radix-ui/primitive": 1.0.1
-    "@radix-ui/react-collection": 1.0.3
-    "@radix-ui/react-compose-refs": 1.0.1
-    "@radix-ui/react-context": 1.0.1
-    "@radix-ui/react-direction": 1.0.1
-    "@radix-ui/react-dismissable-layer": 1.0.4
-    "@radix-ui/react-focus-guards": 1.0.1
-    "@radix-ui/react-focus-scope": 1.0.3
-    "@radix-ui/react-id": 1.0.1
-    "@radix-ui/react-popper": 1.1.2
-    "@radix-ui/react-portal": 1.0.3
-    "@radix-ui/react-primitive": 1.0.3
-    "@radix-ui/react-slot": 1.0.2
-    "@radix-ui/react-use-callback-ref": 1.0.1
-    "@radix-ui/react-use-controllable-state": 1.0.1
-    "@radix-ui/react-use-layout-effect": 1.0.1
-    "@radix-ui/react-use-previous": 1.0.1
-    "@radix-ui/react-visually-hidden": 1.0.3
-    aria-hidden: ^1.1.1
-    react-remove-scroll: 2.5.5
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-    react-dom: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: af7b63cc9e2c6006ec08163392d244941e9e03534e7add1b7c5a86059d0eb8a0398d4f3e80d43ff22126874a02b985e44f1722d1de9218922f7aa653d09412e3
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-separator@npm:1.0.3":
-  version: 1.0.3
-  resolution: "@radix-ui/react-separator@npm:1.0.3"
-  dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/react-primitive": 1.0.3
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-    react-dom: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 42f8c95e404de2ce9387040d78049808a48d423cd4c3bad8cca92c4b0bcbdcb3566b5b52a920d4e939a74b51188697f20a012221f0e630fc7f56de64096c15d2
-  languageName: node
-  linkType: hard
-
 "@radix-ui/react-slot@npm:1.0.1":
   version: 1.0.1
   resolution: "@radix-ui/react-slot@npm:1.0.1"
@@ -6185,7 +6060,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@radix-ui/react-slot@npm:1.0.2":
+"@radix-ui/react-slot@npm:1.0.2, @radix-ui/react-slot@npm:^1.0.2":
   version: 1.0.2
   resolution: "@radix-ui/react-slot@npm:1.0.2"
   dependencies:
@@ -6221,80 +6096,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@radix-ui/react-toggle-group@npm:1.0.4":
-  version: 1.0.4
-  resolution: "@radix-ui/react-toggle-group@npm:1.0.4"
-  dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/primitive": 1.0.1
-    "@radix-ui/react-context": 1.0.1
-    "@radix-ui/react-direction": 1.0.1
-    "@radix-ui/react-primitive": 1.0.3
-    "@radix-ui/react-roving-focus": 1.0.4
-    "@radix-ui/react-toggle": 1.0.3
-    "@radix-ui/react-use-controllable-state": 1.0.1
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-    react-dom: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: b6c11fbbc3ca857ff68c0fa31f293c0d0111bcc8aa0cde2566214c090907530bfcb3b862f81585c2b02d8989b5c7971acff4d5c07c429870d80bd5602e30d376
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-toggle@npm:1.0.3":
-  version: 1.0.3
-  resolution: "@radix-ui/react-toggle@npm:1.0.3"
-  dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/primitive": 1.0.1
-    "@radix-ui/react-primitive": 1.0.3
-    "@radix-ui/react-use-controllable-state": 1.0.1
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-    react-dom: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: ed5407f48254f20cda542017774f259d0b2c0007ea4bd7287d10d751016dbf269cb13d1142591432c269c3ab768cde2f1ba0344743027d36bbec10af909f19de
-  languageName: node
-  linkType: hard
-
-"@radix-ui/react-toolbar@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "@radix-ui/react-toolbar@npm:1.0.4"
-  dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/primitive": 1.0.1
-    "@radix-ui/react-context": 1.0.1
-    "@radix-ui/react-direction": 1.0.1
-    "@radix-ui/react-primitive": 1.0.3
-    "@radix-ui/react-roving-focus": 1.0.4
-    "@radix-ui/react-separator": 1.0.3
-    "@radix-ui/react-toggle-group": 1.0.4
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-    react-dom: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 7ebee1f8add6510108979433c5b38627e2de9d48ef2172ca15274b9edbbc106ff43bcd47ff733b03ed2215b92e7af364ff82c79e5a1728374847e2b1e315552c
-  languageName: node
-  linkType: hard
-
 "@radix-ui/react-use-callback-ref@npm:1.0.0":
   version: 1.0.0
   resolution: "@radix-ui/react-use-callback-ref@npm:1.0.0"
@@ -6403,21 +6204,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@radix-ui/react-use-previous@npm:1.0.1":
-  version: 1.0.1
-  resolution: "@radix-ui/react-use-previous@npm:1.0.1"
-  dependencies:
-    "@babel/runtime": ^7.13.10
-  peerDependencies:
-    "@types/react": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 66b4312e857c58b75f3bf62a2048ef090b79a159e9da06c19a468c93e62336969c33dbef60ff16969f00b20386cc25d138f6a353f1658b35baac0a6eff4761b9
-  languageName: node
-  linkType: hard
-
 "@radix-ui/react-use-rect@npm:1.0.0":
   version: 1.0.0
   resolution: "@radix-ui/react-use-rect@npm:1.0.0"
@@ -6474,26 +6260,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@radix-ui/react-visually-hidden@npm:1.0.3":
-  version: 1.0.3
-  resolution: "@radix-ui/react-visually-hidden@npm:1.0.3"
-  dependencies:
-    "@babel/runtime": ^7.13.10
-    "@radix-ui/react-primitive": 1.0.3
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-dom": "*"
-    react: ^16.8 || ^17.0 || ^18.0
-    react-dom: ^16.8 || ^17.0 || ^18.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-dom":
-      optional: true
-  checksum: 2e9d0c8253f97e7d6ffb2e52a5cfd40ba719f813b39c3e2e42c496d54408abd09ef66b5aec4af9b8ab0553215e32452a5d0934597a49c51dd90dc39181ed0d57
-  languageName: node
-  linkType: hard
-
 "@radix-ui/rect@npm:1.0.0":
   version: 1.0.0
   resolution: "@radix-ui/rect@npm:1.0.0"
@@ -8320,19 +8086,131 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/pluginutils@npm:^5.0.1, @rollup/pluginutils@npm:^5.0.2":
-  version: 5.0.4
-  resolution: "@rollup/pluginutils@npm:5.0.4"
+"@rollup/pluginutils@npm:^5.0.1, @rollup/pluginutils@npm:^5.0.2, @rollup/pluginutils@npm:^5.0.5":
+  version: 5.1.0
+  resolution: "@rollup/pluginutils@npm:5.1.0"
   dependencies:
     "@types/estree": ^1.0.0
     estree-walker: ^2.0.2
     picomatch: ^2.3.1
   peerDependencies:
-    rollup: ^1.20.0||^2.0.0||^3.0.0
+    rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
   peerDependenciesMeta:
     rollup:
       optional: true
-  checksum: 893d5805ac4121fc704926963a0ae4e79e9e2bc8d736c3b28499ab69a404cce5119ca3a4e0c3d3a81d62f1beb3966f35285c36935d94b061794f26e94fed4cd1
+  checksum: 3cc5a6d91452a6eabbfd1ae79b4dd1f1e809d2eecda6e175deb784e75b0911f47e9ecce73f8dd315d6a8b3f362582c91d3c0f66908b6ced69345b3cbe28f8ce8
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-android-arm-eabi@npm:4.14.3":
+  version: 4.14.3
+  resolution: "@rollup/rollup-android-arm-eabi@npm:4.14.3"
+  conditions: os=android & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-android-arm64@npm:4.14.3":
+  version: 4.14.3
+  resolution: "@rollup/rollup-android-arm64@npm:4.14.3"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-darwin-arm64@npm:4.14.3":
+  version: 4.14.3
+  resolution: "@rollup/rollup-darwin-arm64@npm:4.14.3"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-darwin-x64@npm:4.14.3":
+  version: 4.14.3
+  resolution: "@rollup/rollup-darwin-x64@npm:4.14.3"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-arm-gnueabihf@npm:4.14.3":
+  version: 4.14.3
+  resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.14.3"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-arm-musleabihf@npm:4.14.3":
+  version: 4.14.3
+  resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.14.3"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-arm64-gnu@npm:4.14.3":
+  version: 4.14.3
+  resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.14.3"
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-arm64-musl@npm:4.14.3":
+  version: 4.14.3
+  resolution: "@rollup/rollup-linux-arm64-musl@npm:4.14.3"
+  conditions: os=linux & cpu=arm64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-powerpc64le-gnu@npm:4.14.3":
+  version: 4.14.3
+  resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.14.3"
+  conditions: os=linux & cpu=ppc64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-riscv64-gnu@npm:4.14.3":
+  version: 4.14.3
+  resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.14.3"
+  conditions: os=linux & cpu=riscv64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-s390x-gnu@npm:4.14.3":
+  version: 4.14.3
+  resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.14.3"
+  conditions: os=linux & cpu=s390x & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-x64-gnu@npm:4.14.3":
+  version: 4.14.3
+  resolution: "@rollup/rollup-linux-x64-gnu@npm:4.14.3"
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-x64-musl@npm:4.14.3":
+  version: 4.14.3
+  resolution: "@rollup/rollup-linux-x64-musl@npm:4.14.3"
+  conditions: os=linux & cpu=x64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-win32-arm64-msvc@npm:4.14.3":
+  version: 4.14.3
+  resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.14.3"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-win32-ia32-msvc@npm:4.14.3":
+  version: 4.14.3
+  resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.14.3"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-win32-x64-msvc@npm:4.14.3":
+  version: 4.14.3
+  resolution: "@rollup/rollup-win32-x64-msvc@npm:4.14.3"
+  conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
@@ -9137,122 +9015,121 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/addon-a11y@npm:^7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/addon-a11y@npm:7.6.12"
+"@storybook/addon-a11y@npm:^8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/addon-a11y@npm:8.0.8"
   dependencies:
-    "@storybook/addon-highlight": 7.6.12
+    "@storybook/addon-highlight": 8.0.8
     axe-core: ^4.2.0
-  checksum: c40cbe3c541ddf753324e4cc6aa0f44a02cecc72f6dadccb5065d66ca5e84d8b0856ea9f2ad4f6b48415314c5d9aa4ba766a1138e9368055eaafccd7fd4fc502
+  checksum: 492315f0db37bd0b988d771036a95e6a5714c4db8e496051d48dbb07e5f94b5ad8c9095c60e316a8b54aa153da26e753c1f3682b84991cf85117dba17293dcb2
   languageName: node
   linkType: hard
 
-"@storybook/addon-controls@npm:^7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/addon-controls@npm:7.6.12"
+"@storybook/addon-controls@npm:^8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/addon-controls@npm:8.0.8"
   dependencies:
-    "@storybook/blocks": 7.6.12
+    "@storybook/blocks": 8.0.8
     lodash: ^4.17.21
     ts-dedent: ^2.0.0
-  checksum: 1dadd5e547ac2d02fe3dd064d58e682caf7437934c49b730c71fdd16565bb7ffa56b6d5241031a2c9cd38f2c655f0046760c6e8c1eb869e511a9d2adcfe1f287
+  checksum: cb8df1ddb01bbdc523fed16e79375a0b4047bdad8de9af95d0bc30d42e2988d4d8b75d8ee41cf9bf308439fbc2d18241790113eac62565b32f7db3d5ade991d8
   languageName: node
   linkType: hard
 
-"@storybook/addon-docs@npm:^7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/addon-docs@npm:7.6.12"
+"@storybook/addon-docs@npm:^8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/addon-docs@npm:8.0.8"
   dependencies:
-    "@jest/transform": ^29.3.1
-    "@mdx-js/react": ^2.1.5
-    "@storybook/blocks": 7.6.12
-    "@storybook/client-logger": 7.6.12
-    "@storybook/components": 7.6.12
-    "@storybook/csf-plugin": 7.6.12
-    "@storybook/csf-tools": 7.6.12
+    "@babel/core": ^7.12.3
+    "@mdx-js/react": ^3.0.0
+    "@storybook/blocks": 8.0.8
+    "@storybook/client-logger": 8.0.8
+    "@storybook/components": 8.0.8
+    "@storybook/csf-plugin": 8.0.8
+    "@storybook/csf-tools": 8.0.8
     "@storybook/global": ^5.0.0
-    "@storybook/mdx2-csf": ^1.0.0
-    "@storybook/node-logger": 7.6.12
-    "@storybook/postinstall": 7.6.12
-    "@storybook/preview-api": 7.6.12
-    "@storybook/react-dom-shim": 7.6.12
-    "@storybook/theming": 7.6.12
-    "@storybook/types": 7.6.12
+    "@storybook/node-logger": 8.0.8
+    "@storybook/preview-api": 8.0.8
+    "@storybook/react-dom-shim": 8.0.8
+    "@storybook/theming": 8.0.8
+    "@storybook/types": 8.0.8
+    "@types/react": ^16.8.0 || ^17.0.0 || ^18.0.0
     fs-extra: ^11.1.0
-    remark-external-links: ^8.0.0
-    remark-slug: ^6.0.0
-    ts-dedent: ^2.0.0
-  peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: fedf10ffc976e19bdfd17a1bec7f71362a147a352a34c9d2777c3f61919e9ec1dcb333171fe1a9039306149cd6178ba2518e0a0abba92b366deecfa7fb9e9938
+    rehype-external-links: ^3.0.0
+    rehype-slug: ^6.0.0
+    ts-dedent: ^2.0.0
+  checksum: 57f3b2a000a8251aff8d57af202a1025e3530eba2a8fbfb12a96753f303b31d282164f92bec61745dfb500c046fc6aac44b144e9cf4d86679276c6e6ae45b8c9
   languageName: node
   linkType: hard
 
-"@storybook/addon-highlight@npm:7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/addon-highlight@npm:7.6.12"
+"@storybook/addon-highlight@npm:8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/addon-highlight@npm:8.0.8"
   dependencies:
     "@storybook/global": ^5.0.0
-  checksum: c9e92093535facd897f32f15cd7e5bc80059f2dfad62ede2ca59629c5c894378a483ae20dbe516794c11ed27861551afe5b496af130bf20962c8d8d09198f612
+  checksum: a7b90ebbd0a50c3455f9ced4171f24f0cc5546ccbf63b3bc1a583ffd07a5994524765907a09a9e81b6d58d15de0b1bb80d07c6a7488746f0f794da74fef26d22
   languageName: node
   linkType: hard
 
-"@storybook/addon-measure@npm:^7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/addon-measure@npm:7.6.12"
+"@storybook/addon-measure@npm:^8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/addon-measure@npm:8.0.8"
   dependencies:
     "@storybook/global": ^5.0.0
     tiny-invariant: ^1.3.1
-  checksum: 9eb3340bc9e9bcb99333c9de3cb9f07c37bbbf680b4a20116fbb36a445335f759d2a4e8a68c76a9942e098d3a1e5c0ca2092d285183e641eebd33fa7f2b9dab8
+  checksum: 412fdb4ecd314a41f3b2e32d37a755226bcf219ed53abb2cdbff823645885cc4f8bef09e4fde2ef808ce23d4a0108c6c4a18d5012853a932e84a41a573f576b7
   languageName: node
   linkType: hard
 
-"@storybook/addon-outline@npm:^7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/addon-outline@npm:7.6.12"
+"@storybook/addon-outline@npm:^8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/addon-outline@npm:8.0.8"
   dependencies:
     "@storybook/global": ^5.0.0
     ts-dedent: ^2.0.0
-  checksum: c3aee1375ca12278d4ac7232e4336a6b54b6c8bced8cd360d67c32acef324317a29e6177c160321492e59bcd1ed4daf5eb0de03cd7dd6213dec8629a9d083983
+  checksum: 0e6a0ab99167ff33df91830ee996054d0bbe80a1bfa6487400714bd664d6a2cd46127706876197850f24d505576ef4f5a55271fc5b1c186ca9f43f95f2bda688
   languageName: node
   linkType: hard
 
-"@storybook/addon-toolbars@npm:^7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/addon-toolbars@npm:7.6.12"
-  checksum: 613e8f2377c93c413708da9728bf23ff73aacaee141894302c7c4e594485db8b4b05cc666d524582fe92bc8fc12b5f1287e5088b0133ce1ea5c77dff446845a2
+"@storybook/addon-toolbars@npm:^8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/addon-toolbars@npm:8.0.8"
+  checksum: ea58e380b479440cd5944ae4af8a79c65463699fb91fc712e1c3cd64ca006d6a670dc4445a40e5d96c1b74ea06f9489a8461b681bfce2423e881fc5aae42c78d
   languageName: node
   linkType: hard
 
-"@storybook/addon-viewport@npm:^7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/addon-viewport@npm:7.6.12"
+"@storybook/addon-viewport@npm:^8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/addon-viewport@npm:8.0.8"
   dependencies:
     memoizerific: ^1.11.3
-  checksum: a9617f5f8d18a79417f654dcb92de9bb0f11498c997413e537500f251a97f8eafc06a7aa196e62dce2d5aa520a8f323ee62b52be774a2abdbdabb22c6f51485d
+  checksum: 43a371dc256f0586f38d9a64bc2d1079f2ac2a0ffe18e468c726cfa7c2bee44ccca3eabbc315e06e8dc1b589516f232b3413247797ed5c7d5f6f05dba3021b69
   languageName: node
   linkType: hard
 
-"@storybook/blocks@npm:7.6.12, @storybook/blocks@npm:^7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/blocks@npm:7.6.12"
+"@storybook/blocks@npm:8.0.8, @storybook/blocks@npm:^8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/blocks@npm:8.0.8"
   dependencies:
-    "@storybook/channels": 7.6.12
-    "@storybook/client-logger": 7.6.12
-    "@storybook/components": 7.6.12
-    "@storybook/core-events": 7.6.12
+    "@storybook/channels": 8.0.8
+    "@storybook/client-logger": 8.0.8
+    "@storybook/components": 8.0.8
+    "@storybook/core-events": 8.0.8
     "@storybook/csf": ^0.1.2
-    "@storybook/docs-tools": 7.6.12
+    "@storybook/docs-tools": 8.0.8
     "@storybook/global": ^5.0.0
-    "@storybook/manager-api": 7.6.12
-    "@storybook/preview-api": 7.6.12
-    "@storybook/theming": 7.6.12
-    "@storybook/types": 7.6.12
+    "@storybook/icons": ^1.2.5
+    "@storybook/manager-api": 8.0.8
+    "@storybook/preview-api": 8.0.8
+    "@storybook/theming": 8.0.8
+    "@storybook/types": 8.0.8
     "@types/lodash": ^4.14.167
     color-convert: ^2.0.1
     dequal: ^2.0.2
     lodash: ^4.17.21
-    markdown-to-jsx: ^7.1.8
+    markdown-to-jsx: 7.3.2
     memoizerific: ^1.11.3
     polished: ^4.2.2
     react-colorful: ^5.1.2
@@ -9263,46 +9140,50 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: c99e36593a4d9826a6e02ecbf877193d3a566b7152c0ab3968323302e948a2174257a900d5b45759ce18cddd8d41f8dfb876bdba12e67d3e3f440b1c887570bf
+  peerDependenciesMeta:
+    react:
+      optional: true
+    react-dom:
+      optional: true
+  checksum: 3552086e3643775d8b9f0afe25b04164389acfc75909f74308ce4d9fc47a5f9c78f004cc798c348b1500a22d1530693d6460b7e79cdf7356a905dde40d8ef0c8
   languageName: node
   linkType: hard
 
-"@storybook/builder-manager@npm:7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/builder-manager@npm:7.6.12"
+"@storybook/builder-manager@npm:8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/builder-manager@npm:8.0.8"
   dependencies:
     "@fal-works/esbuild-plugin-global-externals": ^2.1.2
-    "@storybook/core-common": 7.6.12
-    "@storybook/manager": 7.6.12
-    "@storybook/node-logger": 7.6.12
+    "@storybook/core-common": 8.0.8
+    "@storybook/manager": 8.0.8
+    "@storybook/node-logger": 8.0.8
     "@types/ejs": ^3.1.1
-    "@types/find-cache-dir": ^3.2.1
     "@yarnpkg/esbuild-plugin-pnp": ^3.0.0-rc.10
     browser-assert: ^1.2.1
     ejs: ^3.1.8
-    esbuild: ^0.18.0
+    esbuild: ^0.18.0 || ^0.19.0 || ^0.20.0
     esbuild-plugin-alias: ^0.2.1
     express: ^4.17.3
-    find-cache-dir: ^3.0.0
     fs-extra: ^11.1.0
     process: ^0.11.10
     util: ^0.12.4
-  checksum: 6a866387546048ac6d87cf6bef78714e921d25a92ae1917a7e87e2a9349d8778668cbde89a7331384eae96c58276eda34aca8133708d9fd2b60f9179478004aa
+  checksum: 491e4bfdff0f942bd8895ffa3c04fe54ab724a251b6ba3d1c60e7163fecf5e56b768db4466b75b06775c98ff5df48e20b80e80ed30121c4b0211511701d59245
   languageName: node
   linkType: hard
 
-"@storybook/builder-vite@npm:7.6.12, @storybook/builder-vite@npm:^7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/builder-vite@npm:7.6.12"
+"@storybook/builder-vite@npm:8.0.8, @storybook/builder-vite@npm:^8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/builder-vite@npm:8.0.8"
   dependencies:
-    "@storybook/channels": 7.6.12
-    "@storybook/client-logger": 7.6.12
-    "@storybook/core-common": 7.6.12
-    "@storybook/csf-plugin": 7.6.12
-    "@storybook/node-logger": 7.6.12
-    "@storybook/preview": 7.6.12
-    "@storybook/preview-api": 7.6.12
-    "@storybook/types": 7.6.12
+    "@storybook/channels": 8.0.8
+    "@storybook/client-logger": 8.0.8
+    "@storybook/core-common": 8.0.8
+    "@storybook/core-events": 8.0.8
+    "@storybook/csf-plugin": 8.0.8
+    "@storybook/node-logger": 8.0.8
+    "@storybook/preview": 8.0.8
+    "@storybook/preview-api": 8.0.8
+    "@storybook/types": 8.0.8
     "@types/find-cache-dir": ^3.2.1
     browser-assert: ^1.2.1
     es-module-lexer: ^0.9.3
@@ -9310,11 +9191,11 @@ __metadata:
     find-cache-dir: ^3.0.0
     fs-extra: ^11.1.0
     magic-string: ^0.30.0
-    rollup: ^2.25.0 || ^3.3.0
+    ts-dedent: ^2.0.0
   peerDependencies:
     "@preact/preset-vite": "*"
     typescript: ">= 4.3.x"
-    vite: ^3.0.0 || ^4.0.0 || ^5.0.0
+    vite: ^4.0.0 || ^5.0.0
     vite-plugin-glimmerx: "*"
   peerDependenciesMeta:
     "@preact/preset-vite":
@@ -9323,40 +9204,38 @@ __metadata:
       optional: true
     vite-plugin-glimmerx:
       optional: true
-  checksum: 0827ace7f7d1bfd80590cad021f689f86fe598db5552d9ae68c0b35c62fd95c1edb94993a52d909e30e0a02ad5f9c14df13b042b0eca7f779536b3b5bb41da54
+  checksum: 64a0d197ca0f29f1554168937c532f90752af29c2ac239503ebf3c4e3473e1cb5510d6561b5aee007642e40bb5e1849325c8065133431f31e5b9ab835b232703
   languageName: node
   linkType: hard
 
-"@storybook/channels@npm:7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/channels@npm:7.6.12"
+"@storybook/channels@npm:8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/channels@npm:8.0.8"
   dependencies:
-    "@storybook/client-logger": 7.6.12
-    "@storybook/core-events": 7.6.12
+    "@storybook/client-logger": 8.0.8
+    "@storybook/core-events": 8.0.8
     "@storybook/global": ^5.0.0
-    qs: ^6.10.0
     telejson: ^7.2.0
     tiny-invariant: ^1.3.1
-  checksum: 275dea29f10eff6fd0887fe323133312226310f39254146045486ad6887a350026ff79a3f31408873a82b6be698bcea64d7d048be6baa0a214bfa8953caed47e
+  checksum: 2638bd99f22be6653c9af2a0bd924f0c7171c444f83a654a22c58ba3d071771cc80c74387ebe5e63496e1bb59514279b96e8a86974da95b1086d984d6820ad0d
   languageName: node
   linkType: hard
 
-"@storybook/cli@npm:7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/cli@npm:7.6.12"
+"@storybook/cli@npm:8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/cli@npm:8.0.8"
   dependencies:
-    "@babel/core": ^7.23.2
-    "@babel/preset-env": ^7.23.2
+    "@babel/core": ^7.23.0
     "@babel/types": ^7.23.0
     "@ndelangen/get-tarball": ^3.0.7
-    "@storybook/codemod": 7.6.12
-    "@storybook/core-common": 7.6.12
-    "@storybook/core-events": 7.6.12
-    "@storybook/core-server": 7.6.12
-    "@storybook/csf-tools": 7.6.12
-    "@storybook/node-logger": 7.6.12
-    "@storybook/telemetry": 7.6.12
-    "@storybook/types": 7.6.12
+    "@storybook/codemod": 8.0.8
+    "@storybook/core-common": 8.0.8
+    "@storybook/core-events": 8.0.8
+    "@storybook/core-server": 8.0.8
+    "@storybook/csf-tools": 8.0.8
+    "@storybook/node-logger": 8.0.8
+    "@storybook/telemetry": 8.0.8
+    "@storybook/types": 8.0.8
     "@types/semver": ^7.3.4
     "@yarnpkg/fslib": 2.10.3
     "@yarnpkg/libzip": 2.3.0
@@ -9366,108 +9245,96 @@ __metadata:
     detect-indent: ^6.1.0
     envinfo: ^7.7.3
     execa: ^5.0.0
-    express: ^4.17.3
     find-up: ^5.0.0
     fs-extra: ^11.1.0
     get-npm-tarball-url: ^2.0.3
-    get-port: ^5.1.1
     giget: ^1.0.0
     globby: ^11.0.2
     jscodeshift: ^0.15.1
     leven: ^3.1.0
     ora: ^5.4.1
-    prettier: ^2.8.0
+    prettier: ^3.1.1
     prompts: ^2.4.0
-    puppeteer-core: ^2.1.1
     read-pkg-up: ^7.0.1
     semver: ^7.3.7
     strip-json-comments: ^3.0.1
     tempy: ^1.0.1
+    tiny-invariant: ^1.3.1
     ts-dedent: ^2.0.0
-    util-deprecate: ^1.0.2
   bin:
     getstorybook: ./bin/index.js
     sb: ./bin/index.js
-  checksum: 52b62155fd95b64b7379093bd84f73e3f0d6f64dac6df0016242b7406bc7297dcb2cd5fefc7d6a877941365073d17c1cac4488cbb3131850c714ad1564c5859a
+  checksum: f3823b0e5cf7bd9af6ff9334ab8a78b93eaa0e8b9cae2cde261c72399a831ce435435aa2fa445c5ab189eb0db9aa9e00d646520176402c3f2a31af93b03a3c78
   languageName: node
   linkType: hard
 
-"@storybook/client-logger@npm:7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/client-logger@npm:7.6.12"
+"@storybook/client-logger@npm:8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/client-logger@npm:8.0.8"
   dependencies:
     "@storybook/global": ^5.0.0
-  checksum: 4a0a1c15fcab93005462b486f4f549d081487471610fffdaabc311247a0ba7ab3df59491800273aaed05f47a85cbf280580eaa768d9a1c7829d30faefbe43d20
+  checksum: 338dfd38f155de32d404685cec3a7a26eed7d00c1589c0a436e4c24aa44c3fe99ea1e5f47198036ba140aa541e46239fe64ac489cdf23a24fab8637f99907c54
   languageName: node
   linkType: hard
 
-"@storybook/codemod@npm:7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/codemod@npm:7.6.12"
+"@storybook/codemod@npm:8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/codemod@npm:8.0.8"
   dependencies:
     "@babel/core": ^7.23.2
     "@babel/preset-env": ^7.23.2
     "@babel/types": ^7.23.0
     "@storybook/csf": ^0.1.2
-    "@storybook/csf-tools": 7.6.12
-    "@storybook/node-logger": 7.6.12
-    "@storybook/types": 7.6.12
+    "@storybook/csf-tools": 8.0.8
+    "@storybook/node-logger": 8.0.8
+    "@storybook/types": 8.0.8
     "@types/cross-spawn": ^6.0.2
     cross-spawn: ^7.0.3
     globby: ^11.0.2
     jscodeshift: ^0.15.1
     lodash: ^4.17.21
-    prettier: ^2.8.0
-    recast: ^0.23.1
-  checksum: a384d528b9ab23790f6a6e3ba5adecedd078f8e2c8459f2303aa8d4620e173db40e120e13de4fab618fbb91193ab5c8f6d4b3d520c053b77cc605e70f678702e
+    prettier: ^3.1.1
+    recast: ^0.23.5
+    tiny-invariant: ^1.3.1
+  checksum: cf3e7c82519e8b38bb022f7eb91e13f6ee9dfcc1b74773ad988f024f4da7f2bdb10a2be53e8e52ac23474d338f4648b6c2cf5c28a5d7c6cfccff7a723d2455db
   languageName: node
   linkType: hard
 
-"@storybook/components@npm:7.6.12, @storybook/components@npm:^7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/components@npm:7.6.12"
+"@storybook/components@npm:8.0.8, @storybook/components@npm:^8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/components@npm:8.0.8"
   dependencies:
-    "@radix-ui/react-select": ^1.2.2
-    "@radix-ui/react-toolbar": ^1.0.4
-    "@storybook/client-logger": 7.6.12
+    "@radix-ui/react-slot": ^1.0.2
+    "@storybook/client-logger": 8.0.8
     "@storybook/csf": ^0.1.2
     "@storybook/global": ^5.0.0
-    "@storybook/theming": 7.6.12
-    "@storybook/types": 7.6.12
+    "@storybook/icons": ^1.2.5
+    "@storybook/theming": 8.0.8
+    "@storybook/types": 8.0.8
     memoizerific: ^1.11.3
-    use-resize-observer: ^9.1.0
     util-deprecate: ^1.0.2
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 2ac43a04ba07d35d87254c1c9155991731b0316f685a7f14997bf3a120fc5f5560bed3929fe581b4b6a3b13f5a9c010c79fe4bd6810bda7ed6c03499323f9bc9
+  checksum: e8ace6eabb57ce229590095b4a3afe3713d21e51ea3cce900904149335d4399d0b6264f4a7b826d33f8a268a9af53c71839c233c6972a31ff4ae7008e809650a
   languageName: node
   linkType: hard
 
-"@storybook/core-client@npm:7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/core-client@npm:7.6.12"
+"@storybook/core-common@npm:8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/core-common@npm:8.0.8"
   dependencies:
-    "@storybook/client-logger": 7.6.12
-    "@storybook/preview-api": 7.6.12
-  checksum: 663df478fd964d5a6f85598ed38305edb911c088dae085438eae20ca9d666ab711b0adc1cd3cfaab4f7599f14f380ca17ead08ed66dc2895a2970ed5e9a096ce
-  languageName: node
-  linkType: hard
-
-"@storybook/core-common@npm:7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/core-common@npm:7.6.12"
-  dependencies:
-    "@storybook/core-events": 7.6.12
-    "@storybook/node-logger": 7.6.12
-    "@storybook/types": 7.6.12
-    "@types/find-cache-dir": ^3.2.1
-    "@types/node": ^18.0.0
-    "@types/node-fetch": ^2.6.4
-    "@types/pretty-hrtime": ^1.0.0
+    "@storybook/core-events": 8.0.8
+    "@storybook/csf-tools": 8.0.8
+    "@storybook/node-logger": 8.0.8
+    "@storybook/types": 8.0.8
+    "@yarnpkg/fslib": 2.10.3
+    "@yarnpkg/libzip": 2.3.0
     chalk: ^4.1.0
-    esbuild: ^0.18.0
+    cross-spawn: ^7.0.3
+    esbuild: ^0.18.0 || ^0.19.0 || ^0.20.0
     esbuild-register: ^3.5.0
+    execa: ^5.0.0
     file-system-cache: 2.3.0
     find-cache-dir: ^3.0.0
     find-up: ^5.0.0
@@ -9480,39 +9347,45 @@ __metadata:
     pkg-dir: ^5.0.0
     pretty-hrtime: ^1.0.3
     resolve-from: ^5.0.0
+    semver: ^7.3.7
+    tempy: ^1.0.1
+    tiny-invariant: ^1.3.1
     ts-dedent: ^2.0.0
-  checksum: 17c4dc4be48d7a35d7fa164696c40addd050d7119d3fd38e7006930f914b98363fa9524a8d34d657931b87172cf08b30d5e1ab6a751b7a5e2b259ef84cf223d7
+    util: ^0.12.4
+  checksum: eac21b6cca6916a60acc463515e3fd3171698459901f813c32b8006efe84bcf436eeb00d0027feee2be15e3fb64739078615a3953fef1a92abb53aa126071a42
   languageName: node
   linkType: hard
 
-"@storybook/core-events@npm:7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/core-events@npm:7.6.12"
+"@storybook/core-events@npm:8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/core-events@npm:8.0.8"
   dependencies:
     ts-dedent: ^2.0.0
-  checksum: d66a18b53fe06a7f51f99e8aa8f6e2fc8de255d4a966d4d7c72f20c2fdfd3b518bc5c0062932a9e9eeb9ccf53c629b3dc8ca8d2462e857b5817a83e5a2c08e4a
+  checksum: 5be3d0310bb1db3bbf1ed5a3b2c9b8f89df3fc1e735702e4b237b16c9bca09b27418948f80b10932b0a139256e1b3c9a870d553849319bdf164a14fd21719aa5
   languageName: node
   linkType: hard
 
-"@storybook/core-server@npm:7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/core-server@npm:7.6.12"
+"@storybook/core-server@npm:8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/core-server@npm:8.0.8"
   dependencies:
     "@aw-web-design/x-default-browser": 1.4.126
+    "@babel/core": ^7.23.9
     "@discoveryjs/json-ext": ^0.5.3
-    "@storybook/builder-manager": 7.6.12
-    "@storybook/channels": 7.6.12
-    "@storybook/core-common": 7.6.12
-    "@storybook/core-events": 7.6.12
+    "@storybook/builder-manager": 8.0.8
+    "@storybook/channels": 8.0.8
+    "@storybook/core-common": 8.0.8
+    "@storybook/core-events": 8.0.8
     "@storybook/csf": ^0.1.2
-    "@storybook/csf-tools": 7.6.12
-    "@storybook/docs-mdx": ^0.1.0
+    "@storybook/csf-tools": 8.0.8
+    "@storybook/docs-mdx": 3.0.0
     "@storybook/global": ^5.0.0
-    "@storybook/manager": 7.6.12
-    "@storybook/node-logger": 7.6.12
-    "@storybook/preview-api": 7.6.12
-    "@storybook/telemetry": 7.6.12
-    "@storybook/types": 7.6.12
+    "@storybook/manager": 8.0.8
+    "@storybook/manager-api": 8.0.8
+    "@storybook/node-logger": 8.0.8
+    "@storybook/preview-api": 8.0.8
+    "@storybook/telemetry": 8.0.8
+    "@storybook/types": 8.0.8
     "@types/detect-port": ^1.3.0
     "@types/node": ^18.0.0
     "@types/pretty-hrtime": ^1.0.0
@@ -9525,7 +9398,7 @@ __metadata:
     express: ^4.17.3
     fs-extra: ^11.1.0
     globby: ^11.0.2
-    ip: ^2.0.0
+    ip: ^2.0.1
     lodash: ^4.17.21
     open: ^8.4.0
     pretty-hrtime: ^1.0.3
@@ -9539,34 +9412,34 @@ __metadata:
     util-deprecate: ^1.0.2
     watchpack: ^2.2.0
     ws: ^8.2.3
-  checksum: a0bd3664ff05046468d3ddd13366f92625e2eeb4b034dcd037338eb2e8e01685ce11d80a79ae1d69e0ef42e7bcacae0f77c226000307d3ac26b82e8b45a0a526
+  checksum: 173802dee1ce799a1c95f3e6d3de4ee6abe013592cc71adcf8d579ba3f7627aeb79d2a88013c29f0c8a96b98855de23c5dec606cde1c8601027395c9e26044b7
   languageName: node
   linkType: hard
 
-"@storybook/csf-plugin@npm:7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/csf-plugin@npm:7.6.12"
+"@storybook/csf-plugin@npm:8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/csf-plugin@npm:8.0.8"
   dependencies:
-    "@storybook/csf-tools": 7.6.12
+    "@storybook/csf-tools": 8.0.8
     unplugin: ^1.3.1
-  checksum: c9232c4933583ec059f972582ae679f2c8d704dd8937f519a8b93e21b0274d4d29b9e1b671a6e769f4258757c0232ff7b67d2ef0abc0a4ba0f0f8ef4de0f46f6
+  checksum: acd59296309739483b1129e878fc971ceef2f53652e210ca6df3992e6b1f33a1272f3c1813066db10e0febc828283416458e46bb9f9a5e2f7fd6af6498c9d305
   languageName: node
   linkType: hard
 
-"@storybook/csf-tools@npm:7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/csf-tools@npm:7.6.12"
+"@storybook/csf-tools@npm:8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/csf-tools@npm:8.0.8"
   dependencies:
     "@babel/generator": ^7.23.0
     "@babel/parser": ^7.23.0
     "@babel/traverse": ^7.23.2
     "@babel/types": ^7.23.0
     "@storybook/csf": ^0.1.2
-    "@storybook/types": 7.6.12
+    "@storybook/types": 8.0.8
     fs-extra: ^11.1.0
-    recast: ^0.23.1
+    recast: ^0.23.5
     ts-dedent: ^2.0.0
-  checksum: 74396f0d63b29bdcb3e5b22f3e44c723f0bed2c4cfa353445b303f10a9e0cd3ae55bc5d5e2568b9127ddba62ad3ccc365f1e83cb3e37e3ade6526b6a83c3e4b9
+  checksum: d74cc18c564a4feec063dd02d3132bb360fe766d0dba5f06250554a4cbeb17d36c192da3f3bbe5aed30530a1270233d50cee963a55a8f5950f515878b79b6286
   languageName: node
   linkType: hard
 
@@ -9588,25 +9461,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/docs-mdx@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "@storybook/docs-mdx@npm:0.1.0"
-  checksum: a7770842c3947a761bcbe776a9c4fd35163d30c3274fca034169f69ff614242eaa4cacaa2c95fd215827081ef9a43f4774d521a6f43a4d063ea5f4ea14b1d69a
+"@storybook/docs-mdx@npm:3.0.0":
+  version: 3.0.0
+  resolution: "@storybook/docs-mdx@npm:3.0.0"
+  checksum: c83d59c1a2d917152adc9e8b3c7d1c089ac3377159c55757d70996b63d1e1d461b72e13c600c2d79d3e210b1cfa3724fe83838147ec45bc51c36f74bbb2bfbd5
   languageName: node
   linkType: hard
 
-"@storybook/docs-tools@npm:7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/docs-tools@npm:7.6.12"
+"@storybook/docs-tools@npm:8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/docs-tools@npm:8.0.8"
   dependencies:
-    "@storybook/core-common": 7.6.12
-    "@storybook/preview-api": 7.6.12
-    "@storybook/types": 7.6.12
+    "@storybook/core-common": 8.0.8
+    "@storybook/preview-api": 8.0.8
+    "@storybook/types": 8.0.8
     "@types/doctrine": ^0.0.3
     assert: ^2.1.0
     doctrine: ^3.0.0
     lodash: ^4.17.21
-  checksum: bb6923793e03795862d9e98016e9375f0a922765ee15e9d1f8789668735ee60449769b89e676e806a3ac9f151462903a7e9d02b4b4864830efa007ab41f5333e
+  checksum: 9a1404d275df8ebe65567e5563a1d0d711fc16fc7d1b834a4445245c8bd34d759aee8fa86e74eea27c2e8bd6b90a04310e94c8a95a516bfbbbe2d47ef91a218a
   languageName: node
   linkType: hard
 
@@ -9617,161 +9490,139 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/manager-api@npm:7.6.12, @storybook/manager-api@npm:^7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/manager-api@npm:7.6.12"
+"@storybook/icons@npm:^1.2.5":
+  version: 1.2.9
+  resolution: "@storybook/icons@npm:1.2.9"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+  checksum: ecb70017f2c7cdf0e9589b52b4c2fa5756b617c6c5ac42cfc71a9920a52ff3bc337ed932a9eb174d584d2121b5157995e0cc055e404c777b3af3cc85015ec2cc
+  languageName: node
+  linkType: hard
+
+"@storybook/manager-api@npm:8.0.8, @storybook/manager-api@npm:^8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/manager-api@npm:8.0.8"
   dependencies:
-    "@storybook/channels": 7.6.12
-    "@storybook/client-logger": 7.6.12
-    "@storybook/core-events": 7.6.12
+    "@storybook/channels": 8.0.8
+    "@storybook/client-logger": 8.0.8
+    "@storybook/core-events": 8.0.8
     "@storybook/csf": ^0.1.2
     "@storybook/global": ^5.0.0
-    "@storybook/router": 7.6.12
-    "@storybook/theming": 7.6.12
-    "@storybook/types": 7.6.12
+    "@storybook/icons": ^1.2.5
+    "@storybook/router": 8.0.8
+    "@storybook/theming": 8.0.8
+    "@storybook/types": 8.0.8
     dequal: ^2.0.2
     lodash: ^4.17.21
     memoizerific: ^1.11.3
     store2: ^2.14.2
     telejson: ^7.2.0
     ts-dedent: ^2.0.0
-  checksum: 91d5947e1d5719ebbfbd2581322e8a8a5b41d984caac9831d5a016ad81558a48b8f304c025eb62af75d823a885f3aebd1ee70d0ced014b23320e5c53c0e551e9
+  checksum: 1d441178aa11e8553ddfd757697d6ed485cbc262c0556ff61507f54ceec3f809137adecaf038221ee89a7fcaae12ea724ade8973aa81f9a871b6f4a9f2ac48a1
   languageName: node
   linkType: hard
 
-"@storybook/manager@npm:7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/manager@npm:7.6.12"
-  checksum: 2e0706adbfb6873df30b57bb800c4c55bf995ab4544263768b89a6c9875cc751d6467f568cf3d0e82aade285ab89a2b809b3b5a468fd8b76acc2491bec0af016
+"@storybook/manager@npm:8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/manager@npm:8.0.8"
+  checksum: 0b6d9027128ff9a8e70bf74c0ecbd337b9242018fea8a1f675617e763f20800c8021982da7e193c6d0c2368d544c92788161fa34df787b0a9c91c70b6b57f131
   languageName: node
   linkType: hard
 
-"@storybook/mdx2-csf@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "@storybook/mdx2-csf@npm:1.1.0"
-  checksum: 5ccdb13f4e59b989499f76e54ffaffb96b5710a696346efe19989b3373f375703adf516780894b270fa64a7e765b55274dc18575fc4a84e7fa92b844a4467c5d
+"@storybook/node-logger@npm:8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/node-logger@npm:8.0.8"
+  checksum: c7d2bc23cace21640b30c7a270c986932007c02b22c24ac271dfe9405bab4f70f45cb5847c630bd18913e45e975f4f69f3c57aa75badfb77757afef41069a278
   languageName: node
   linkType: hard
 
-"@storybook/node-logger@npm:7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/node-logger@npm:7.6.12"
-  checksum: 2f1e06a1204598a6737b20cd7892f2dc1da25ad6e0a0b862196603f6fdc5d331dcb1e907a9bb40c64e6b13fc249d4c26060d159dd19a0a6523fbeb3cad6a3241
-  languageName: node
-  linkType: hard
-
-"@storybook/postinstall@npm:7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/postinstall@npm:7.6.12"
-  checksum: 6230b6689e1965254b1e1d7d0eb47effbd80b12f203db8013b2105f7c8b3334cae1abef0ac5f75d87eac7b215f187cde53eb15854aa395cb78c076af58ab7aac
-  languageName: node
-  linkType: hard
-
-"@storybook/preset-create-react-app@npm:^7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/preset-create-react-app@npm:7.6.12"
+"@storybook/preset-create-react-app@npm:^8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/preset-create-react-app@npm:8.0.8"
   dependencies:
     "@pmmmwh/react-refresh-webpack-plugin": ^0.5.1
-    "@storybook/react-docgen-typescript-plugin": 1.0.6--canary.9.0c3f3b7.0
-    "@storybook/types": 7.6.12
-    "@types/babel__core": ^7.1.7
-    "@types/semver": ^7.3.4
+    "@storybook/types": 8.0.8
+    "@types/semver": ^7.5.6
     pnp-webpack-plugin: ^1.7.0
-    semver: ^7.3.5
+    semver: ^7.5.4
   peerDependencies:
-    "@babel/core": "*"
     react-scripts: ">=5.0.0"
-  checksum: 53411044cd9d18a6af58f0edcdb178de2552c2d30ba4597fef393c994cd1733333c03a4415bb852c5e00ab3bbdb09ab31b2a55af4dc7ec8bf30205d43809f163
+  checksum: 73e9fc3de735dcbf26a86884ff180c548b0b9182e397ba986e55cdef40fa5b7b4d67924f57cfb7d73b30867b35938846dcec96ee228e3b8005f9392e76544f6c
   languageName: node
   linkType: hard
 
-"@storybook/preview-api@npm:7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/preview-api@npm:7.6.12"
+"@storybook/preview-api@npm:8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/preview-api@npm:8.0.8"
   dependencies:
-    "@storybook/channels": 7.6.12
-    "@storybook/client-logger": 7.6.12
-    "@storybook/core-events": 7.6.12
+    "@storybook/channels": 8.0.8
+    "@storybook/client-logger": 8.0.8
+    "@storybook/core-events": 8.0.8
     "@storybook/csf": ^0.1.2
     "@storybook/global": ^5.0.0
-    "@storybook/types": 7.6.12
+    "@storybook/types": 8.0.8
     "@types/qs": ^6.9.5
     dequal: ^2.0.2
     lodash: ^4.17.21
     memoizerific: ^1.11.3
     qs: ^6.10.0
-    synchronous-promise: ^2.0.15
+    tiny-invariant: ^1.3.1
     ts-dedent: ^2.0.0
     util-deprecate: ^1.0.2
-  checksum: 52c2bf313fb12c5bac8ca80e0bdeb2879c120918fc1885d2f8f6ac71c34a8e92a7bc29725db6132887fded52d10e371cbe8a30266d3e2394ecfbfdd543d71c09
+  checksum: 98b19900755843aa171b56d8e8d219cff2c3fd186a063a4f5e50dbdcd708302e6e118a81e1cb2ee101b5b7d10c906ff1042be8a9c967e1541cc3b118102d9b95
   languageName: node
   linkType: hard
 
-"@storybook/preview@npm:7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/preview@npm:7.6.12"
-  checksum: bba55fcfd48b447249e89c393d59b8756283df3223127659c19689b6f64772d99fcd4f273c3f548f3a48237e6b577c30b820552c8561a68ac89536ed04718106
+"@storybook/preview@npm:8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/preview@npm:8.0.8"
+  checksum: 819b59a8963525e89b64bad75f7eef599e0ab43b4ea4d812319b3e891513ac2f3fdfc6d7d23029ce685242b4c493d729f0d07464024b585ad8ea4293b137d686
   languageName: node
   linkType: hard
 
-"@storybook/react-docgen-typescript-plugin@npm:1.0.6--canary.9.0c3f3b7.0":
-  version: 1.0.6--canary.9.0c3f3b7.0
-  resolution: "@storybook/react-docgen-typescript-plugin@npm:1.0.6--canary.9.0c3f3b7.0"
-  dependencies:
-    debug: ^4.1.1
-    endent: ^2.0.1
-    find-cache-dir: ^3.3.1
-    flat-cache: ^3.0.4
-    micromatch: ^4.0.2
-    react-docgen-typescript: ^2.2.2
-    tslib: ^2.0.0
-  peerDependencies:
-    typescript: ">= 4.x"
-    webpack: ">= 4"
-  checksum: 38c59c1dd7f9cdf5533e5ffe1991034f563f8d33c59e3cd33fa86719c72f5fe922276fde50315dd24f23f225d1ad5f3a261ecf4c70e82522805d09782272faff
-  languageName: node
-  linkType: hard
-
-"@storybook/react-dom-shim@npm:7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/react-dom-shim@npm:7.6.12"
+"@storybook/react-dom-shim@npm:8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/react-dom-shim@npm:8.0.8"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 07beffa0a674d15e061dbf7058a3d9ac718f38443dd974c6ad827cb818e676b19f29aa6ad7ff495dfa826fb1be999e6967bbff9b7c13bc2106727285b5824a8b
+  checksum: c3117f4c1fe290d23bdf62260066b9552a02de49c6d0bde1b138e8bf2b7e0405e2ad217b0bbee8ea0ba47cfb4b8f78eee7974dcefd7ca78f203d33f356ddc7ae
   languageName: node
   linkType: hard
 
-"@storybook/react-vite@npm:^7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/react-vite@npm:7.6.12"
+"@storybook/react-vite@npm:^8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/react-vite@npm:8.0.8"
   dependencies:
     "@joshwooding/vite-plugin-react-docgen-typescript": 0.3.0
     "@rollup/pluginutils": ^5.0.2
-    "@storybook/builder-vite": 7.6.12
-    "@storybook/react": 7.6.12
-    "@vitejs/plugin-react": ^3.0.1
+    "@storybook/builder-vite": 8.0.8
+    "@storybook/node-logger": 8.0.8
+    "@storybook/react": 8.0.8
+    find-up: ^5.0.0
     magic-string: ^0.30.0
     react-docgen: ^7.0.0
+    resolve: ^1.22.8
+    tsconfig-paths: ^4.2.0
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    vite: ^3.0.0 || ^4.0.0 || ^5.0.0
-  checksum: 57a8a077311121ca07f6959fecf9a9d8e5b865458f8ccbd9d62c56550d5e9245371f74f0abfa62de5b69c5d67a9125be6943aa82b4cc870683b39078a77d37b6
+    vite: ^4.0.0 || ^5.0.0
+  checksum: bc82fc9d4a7d19dc1c75cd1290e4dac362bc3158944fad0bb3f5e6e0230e9bde67db5dbb813d0cdadfb0241d308c0c82b11ee5577550d7311b72c00b352b209c
   languageName: node
   linkType: hard
 
-"@storybook/react@npm:7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/react@npm:7.6.12"
+"@storybook/react@npm:8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/react@npm:8.0.8"
   dependencies:
-    "@storybook/client-logger": 7.6.12
-    "@storybook/core-client": 7.6.12
-    "@storybook/docs-tools": 7.6.12
+    "@storybook/client-logger": 8.0.8
+    "@storybook/docs-tools": 8.0.8
     "@storybook/global": ^5.0.0
-    "@storybook/preview-api": 7.6.12
-    "@storybook/react-dom-shim": 7.6.12
-    "@storybook/types": 7.6.12
+    "@storybook/preview-api": 8.0.8
+    "@storybook/react-dom-shim": 8.0.8
+    "@storybook/types": 8.0.8
     "@types/escodegen": ^0.0.6
     "@types/estree": ^0.0.51
     "@types/node": ^18.0.0
@@ -9783,71 +9634,76 @@ __metadata:
     lodash: ^4.17.21
     prop-types: ^15.7.2
     react-element-to-jsx-string: ^15.0.0
+    semver: ^7.3.7
     ts-dedent: ^2.0.0
     type-fest: ~2.19
     util-deprecate: ^1.0.2
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    typescript: "*"
+    typescript: ">= 4.2.x"
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 0ce429949fa9f713d801d33c3d0011f8a2dbd73b60d19131bc05a6af6514ce0a404fcdda78c1ad97702006c72d50f31ebe3a787e90338f1df027b57ceb65ce30
+  checksum: c751a2b53aa5710bfdd80f0ab85202bf8b302dab5319cc27c76f3d22f86c2e4236c4ff22c6826244a4ef59094ed6182679f7ffa21b4375478bb713217584a9df
   languageName: node
   linkType: hard
 
-"@storybook/router@npm:7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/router@npm:7.6.12"
+"@storybook/router@npm:8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/router@npm:8.0.8"
   dependencies:
-    "@storybook/client-logger": 7.6.12
+    "@storybook/client-logger": 8.0.8
     memoizerific: ^1.11.3
     qs: ^6.10.0
-  checksum: 9effbf80b2871a80debe300c5ef087da2ae875ec11cb0d13becdd534848fa698ae5f6cbc59c70d2253c5550d4eb6be2d0ec4d217519dafac325366bedd0de1d6
+  checksum: f3530f267d0c6b755c7603bd9799f1190a24b83f8fc8262d9c85dedeee80b2ad1919befceeebda89bda56c35097e075170db3f00f0caad29c0d9df36cdb369b1
   languageName: node
   linkType: hard
 
-"@storybook/telemetry@npm:7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/telemetry@npm:7.6.12"
+"@storybook/telemetry@npm:8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/telemetry@npm:8.0.8"
   dependencies:
-    "@storybook/client-logger": 7.6.12
-    "@storybook/core-common": 7.6.12
-    "@storybook/csf-tools": 7.6.12
+    "@storybook/client-logger": 8.0.8
+    "@storybook/core-common": 8.0.8
+    "@storybook/csf-tools": 8.0.8
     chalk: ^4.1.0
     detect-package-manager: ^2.0.1
     fetch-retry: ^5.0.2
     fs-extra: ^11.1.0
     read-pkg-up: ^7.0.1
-  checksum: 1aea8af10d851d44d784bdd7a35f4223e3198efafbed494f2f7faeb17e747f3915fe99574830be1919ae50766cd0fd73cb92a4d6535a88a0c434bfa64079ba3d
+  checksum: c8021e61cb7d8e1f7d1024e3bd01f3b3f24f3203fa37ec1dc941c5ec3264b57832b4a217614bbd8a9dce49b1d4e2b75bf7b10963cea2114587a64dc3c1665938
   languageName: node
   linkType: hard
 
-"@storybook/theming@npm:7.6.12, @storybook/theming@npm:^7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/theming@npm:7.6.12"
+"@storybook/theming@npm:8.0.8, @storybook/theming@npm:^8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/theming@npm:8.0.8"
   dependencies:
-    "@emotion/use-insertion-effect-with-fallbacks": ^1.0.0
-    "@storybook/client-logger": 7.6.12
+    "@emotion/use-insertion-effect-with-fallbacks": ^1.0.1
+    "@storybook/client-logger": 8.0.8
     "@storybook/global": ^5.0.0
     memoizerific: ^1.11.3
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: e72a7ef3fa4ec3987b69fb4ffbfaa08e9f475877969b02c0279dbae0c69fff193570f04df8d803915c8ee958f48d3c4c083bd6e368de6a47e25debe49eae80d4
+  peerDependenciesMeta:
+    react:
+      optional: true
+    react-dom:
+      optional: true
+  checksum: 48a5015b37a423f061ca9baf0348607159b5e875fa65c8c20c3ccf64f5e79c42139462d0d29c9c7e45bc2c44c006ab6ea4a03a218c87ac482054650efc41ea98
   languageName: node
   linkType: hard
 
-"@storybook/types@npm:7.6.12":
-  version: 7.6.12
-  resolution: "@storybook/types@npm:7.6.12"
+"@storybook/types@npm:8.0.8":
+  version: 8.0.8
+  resolution: "@storybook/types@npm:8.0.8"
   dependencies:
-    "@storybook/channels": 7.6.12
-    "@types/babel__core": ^7.0.0
+    "@storybook/channels": 8.0.8
     "@types/express": ^4.7.0
     file-system-cache: 2.3.0
-  checksum: d5d124063939008a67226d928ff662924c3eb76c372aec1403f7bb18fe60f51e93d6d7f83e44bc19e0492f8bc674b590b34be91231015525be160752bb72d698
+  checksum: bdffe967f692feda4dfed0d682059b8bb7c9276d3627366b26a1c07fafe41f171ff3317c40c2fde655170f99a6a26983a5b49f8c31cdd3791d699301e2cd2db0
   languageName: node
   linkType: hard
 
@@ -9863,6 +9719,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@svgr/babel-plugin-add-jsx-attribute@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-add-jsx-attribute@npm:8.0.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 3fc8e35d16f5abe0af5efe5851f27581225ac405d6a1ca44cda0df064cddfcc29a428c48c2e4bef6cebf627c9ac2f652a096030edb02cf5a120ce28d3c234710
+  languageName: node
+  linkType: hard
+
 "@svgr/babel-plugin-add-jsx-attribute@npm:^5.4.0":
   version: 5.4.0
   resolution: "@svgr/babel-plugin-add-jsx-attribute@npm:5.4.0"
@@ -9879,21 +9744,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@svgr/babel-plugin-add-jsx-attribute@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "@svgr/babel-plugin-add-jsx-attribute@npm:7.0.0"
+"@svgr/babel-plugin-remove-jsx-attribute@npm:*, @svgr/babel-plugin-remove-jsx-attribute@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-remove-jsx-attribute@npm:8.0.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: ecdf432de38a6789e419758425e766651c14c78e6c537158796dfdbbb930f69fb36f11b5ad046c6fbb70d4c6ad567d6ffc45e3afa3fc5f3330234c34299e96a7
-  languageName: node
-  linkType: hard
-
-"@svgr/babel-plugin-remove-jsx-attribute@npm:*, @svgr/babel-plugin-remove-jsx-attribute@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "@svgr/babel-plugin-remove-jsx-attribute@npm:7.0.0"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 808ba216eea6904b2c0b664957b1ad4d3e0d9e36635ad2fca7fb2667031730cbbe067421ac0d50209f7c83dc3b6c2eff8f377780268cd1606c85603bc47b18d7
+  checksum: ff992893c6c4ac802713ba3a97c13be34e62e6d981c813af40daabcd676df68a72a61bd1e692bb1eda3587f1b1d700ea462222ae2153bb0f46886632d4f88d08
   languageName: node
   linkType: hard
 
@@ -9904,12 +9760,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@svgr/babel-plugin-remove-jsx-empty-expression@npm:*, @svgr/babel-plugin-remove-jsx-empty-expression@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "@svgr/babel-plugin-remove-jsx-empty-expression@npm:7.0.0"
+"@svgr/babel-plugin-remove-jsx-empty-expression@npm:*, @svgr/babel-plugin-remove-jsx-empty-expression@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-remove-jsx-empty-expression@npm:8.0.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: da0cae989cc99b5437c877412da6251eef57edfff8514b879c1245b6519edfda101ebc4ba2be3cce3aa9a6014050ea4413e004084d839afd8ac8ffc587a921bf
+  checksum: 0fb691b63a21bac00da3aa2dccec50d0d5a5b347ff408d60803b84410d8af168f2656e4ba1ee1f24dab0ae4e4af77901f2928752bb0434c1f6788133ec599ec8
   languageName: node
   linkType: hard
 
@@ -9920,6 +9776,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@svgr/babel-plugin-replace-jsx-attribute-value@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-replace-jsx-attribute-value@npm:8.0.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 1edda65ef4f4dd8f021143c8ec276a08f6baa6f733b8e8ee2e7775597bf6b97afb47fdeefd579d6ae6c959fe2e634f55cd61d99377631212228c8cfb351b8921
+  languageName: node
+  linkType: hard
+
 "@svgr/babel-plugin-replace-jsx-attribute-value@npm:^5.0.1":
   version: 5.0.1
   resolution: "@svgr/babel-plugin-replace-jsx-attribute-value@npm:5.0.1"
@@ -9936,12 +9801,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@svgr/babel-plugin-replace-jsx-attribute-value@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "@svgr/babel-plugin-replace-jsx-attribute-value@npm:7.0.0"
+"@svgr/babel-plugin-svg-dynamic-title@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-svg-dynamic-title@npm:8.0.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: e624918b545e414a1d0fbace6fc6f8c1c27dac4bf6e5fd4cbc9d8fbc9353fdf4bf6c4fe8b84fb938dfb5c0076cd2ed90b91ac60c0a7011f6e8b0cb71eabe60b3
+  checksum: 876cec891488992e6a9aebb8155e2bea4ec461b4718c51de36e988e00e271c6d9d01ef6be17b9effd44b2b3d7db0b41c161a5904a46ae6f38b26b387ad7f3709
   languageName: node
   linkType: hard
 
@@ -9961,12 +9826,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@svgr/babel-plugin-svg-dynamic-title@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "@svgr/babel-plugin-svg-dynamic-title@npm:7.0.0"
+"@svgr/babel-plugin-svg-em-dimensions@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-svg-em-dimensions@npm:8.0.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3ffc97cc61573ae4fb2e013ec0572b2273f55e8e125bb6c7fc69ae9fb433a675dc879f85166979cf21e1d0f1a5e168dabf116dcc468f132e83928b66cd791e1a
+  checksum: be0e2d391164428327d9ec469a52cea7d93189c6b0e2c290999e048f597d777852f701c64dca44cd45b31ed14a7f859520326e2e4ad7c3a4545d0aa235bc7e9a
   languageName: node
   linkType: hard
 
@@ -9986,12 +9851,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@svgr/babel-plugin-svg-em-dimensions@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "@svgr/babel-plugin-svg-em-dimensions@npm:7.0.0"
+"@svgr/babel-plugin-transform-react-native-svg@npm:8.1.0":
+  version: 8.1.0
+  resolution: "@svgr/babel-plugin-transform-react-native-svg@npm:8.1.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 0f98ee5269983038ec8098fd1906f600199a9c7a48caca9ced1644f988cdb06acc434ec239554d8987bc2098a772c5b472f1cbb6a46dc8f39aa353aea818c963
+  checksum: 85b434a57572f53bd2b9f0606f253e1fcf57b4a8c554ec3f2d43ed17f50d8cae200cb3aaf1ec9d626e1456e8b135dce530ae047eb0bed6d4bf98a752d6640459
   languageName: node
   linkType: hard
 
@@ -10011,12 +9876,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@svgr/babel-plugin-transform-react-native-svg@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "@svgr/babel-plugin-transform-react-native-svg@npm:7.0.0"
+"@svgr/babel-plugin-transform-svg-component@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@svgr/babel-plugin-transform-svg-component@npm:8.0.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 20067965349a9ed5ec339d63a2983a613135ae4dac416bd754683e41fdc91671f62d1950955f4ae57ec03525d13d7b0db467d4c2eb31ec22eafbe240fc840836
+  checksum: 04e2023d75693eeb0890341c40e449881184663056c249be7e5c80168e4aabb0fadd255e8d5d2dbf54b8c2a6e700efba994377135bfa4060dc4a2e860116ef8c
   languageName: node
   linkType: hard
 
@@ -10036,12 +9901,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@svgr/babel-plugin-transform-svg-component@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "@svgr/babel-plugin-transform-svg-component@npm:7.0.0"
+"@svgr/babel-preset@npm:8.1.0":
+  version: 8.1.0
+  resolution: "@svgr/babel-preset@npm:8.1.0"
+  dependencies:
+    "@svgr/babel-plugin-add-jsx-attribute": 8.0.0
+    "@svgr/babel-plugin-remove-jsx-attribute": 8.0.0
+    "@svgr/babel-plugin-remove-jsx-empty-expression": 8.0.0
+    "@svgr/babel-plugin-replace-jsx-attribute-value": 8.0.0
+    "@svgr/babel-plugin-svg-dynamic-title": 8.0.0
+    "@svgr/babel-plugin-svg-em-dimensions": 8.0.0
+    "@svgr/babel-plugin-transform-react-native-svg": 8.1.0
+    "@svgr/babel-plugin-transform-svg-component": 8.0.0
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: cf5be9c6b24a4a9c0afefe67214370af1cd562d9a06082a89486ec25298a223766cdf57591c92750764068a0d27377c3ce3a9609d18eaae59f64c94e60f2b25c
+  checksum: 3a67930f080b8891e1e8e2595716b879c944d253112bae763dce59807ba23454d162216c8d66a0a0e3d4f38a649ecd6c387e545d1e1261dd69a68e9a3392ee08
   languageName: node
   linkType: hard
 
@@ -10079,24 +9953,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@svgr/babel-preset@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "@svgr/babel-preset@npm:7.0.0"
-  dependencies:
-    "@svgr/babel-plugin-add-jsx-attribute": ^7.0.0
-    "@svgr/babel-plugin-remove-jsx-attribute": ^7.0.0
-    "@svgr/babel-plugin-remove-jsx-empty-expression": ^7.0.0
-    "@svgr/babel-plugin-replace-jsx-attribute-value": ^7.0.0
-    "@svgr/babel-plugin-svg-dynamic-title": ^7.0.0
-    "@svgr/babel-plugin-svg-em-dimensions": ^7.0.0
-    "@svgr/babel-plugin-transform-react-native-svg": ^7.0.0
-    "@svgr/babel-plugin-transform-svg-component": ^7.0.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 8c3ff1df1627b2db03e4755281b02e7f440323c9c9f71e3c8ebdab0e1966e24ca16686224da72a92e34b722e693bfa408aca5c62d42b02382e0c528bd3860be6
-  languageName: node
-  linkType: hard
-
 "@svgr/core@npm:^5.5.0":
   version: 5.5.0
   resolution: "@svgr/core@npm:5.5.0"
@@ -10121,15 +9977,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@svgr/core@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "@svgr/core@npm:7.0.0"
+"@svgr/core@npm:^8.1.0":
+  version: 8.1.0
+  resolution: "@svgr/core@npm:8.1.0"
   dependencies:
     "@babel/core": ^7.21.3
-    "@svgr/babel-preset": ^7.0.0
+    "@svgr/babel-preset": 8.1.0
     camelcase: ^6.2.0
     cosmiconfig: ^8.1.3
-  checksum: 34fa14557baf560c78a6d7ac79401d35feb081d54ab55ee1b43d1649a89b322b4ecc7dba3daca0063af1f639c499cea1c46e34e5b066655ae7dc3553c1a64672
+    snake-case: ^3.0.4
+  checksum: da4a12865c7dc59829d58df8bd232d6c85b7115fda40da0d2f844a1a51886e2e945560596ecfc0345d37837ac457de86a931e8b8d8550e729e0c688c02250d8a
+  languageName: node
+  linkType: hard
+
+"@svgr/hast-util-to-babel-ast@npm:8.0.0":
+  version: 8.0.0
+  resolution: "@svgr/hast-util-to-babel-ast@npm:8.0.0"
+  dependencies:
+    "@babel/types": ^7.21.3
+    entities: ^4.4.0
+  checksum: 88401281a38bbc7527e65ff5437970414391a86158ef4b4046c89764c156d2d39ecd7cce77be8a51994c9fb3249170cb1eb8b9128b62faaa81743ef6ed3534ab
   languageName: node
   linkType: hard
 
@@ -10152,16 +10019,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@svgr/hast-util-to-babel-ast@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "@svgr/hast-util-to-babel-ast@npm:7.0.0"
-  dependencies:
-    "@babel/types": ^7.21.3
-    entities: ^4.4.0
-  checksum: c2168c36c8d25e876da879815728310cf204579c97a73908ce33b063cccfb9a18b6e53f53c6daf81506a96761d84b6261bf64faf26f16453f27e73cb322a9256
-  languageName: node
-  linkType: hard
-
 "@svgr/plugin-jsx@npm:^5.5.0":
   version: 5.5.0
   resolution: "@svgr/plugin-jsx@npm:5.5.0"
@@ -10188,15 +10045,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@svgr/plugin-jsx@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "@svgr/plugin-jsx@npm:7.0.0"
+"@svgr/plugin-jsx@npm:^8.1.0":
+  version: 8.1.0
+  resolution: "@svgr/plugin-jsx@npm:8.1.0"
   dependencies:
     "@babel/core": ^7.21.3
-    "@svgr/babel-preset": ^7.0.0
-    "@svgr/hast-util-to-babel-ast": ^7.0.0
+    "@svgr/babel-preset": 8.1.0
+    "@svgr/hast-util-to-babel-ast": 8.0.0
     svg-parser: ^2.0.4
-  checksum: 009421b8e3f32bf13ebec4d47c7997106cd806c6922349871f2d9a77cd3304f55d30630dd8948ff77a9ead2ee1869ac39ad65cf95ab95b2192ef21d5704bd367
+  peerDependencies:
+    "@svgr/core": "*"
+  checksum: 0418a9780753d3544912ee2dad5d2cf8d12e1ba74df8053651b3886aeda54d5f0f7d2dece0af5e0d838332c4f139a57f0dabaa3ca1afa4d1a765efce6a7656f2
   languageName: node
   linkType: hard
 
@@ -10458,7 +10317,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.1.0, @types/babel__core@npm:^7.1.14, @types/babel__core@npm:^7.1.7, @types/babel__core@npm:^7.18.0":
+"@types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.1.0, @types/babel__core@npm:^7.1.14, @types/babel__core@npm:^7.18.0, @types/babel__core@npm:^7.20.5":
   version: 7.20.5
   resolution: "@types/babel__core@npm:7.20.5"
   dependencies:
@@ -10724,10 +10583,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/estree@npm:*, @types/estree@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "@types/estree@npm:1.0.1"
-  checksum: e9aa175eacb797216fafce4d41e8202c7a75555bc55232dee0f9903d7171f8f19f0ae7d5191bb1a88cb90e65468be508c0df850a9fb81b4433b293a5a749899d
+"@types/estree@npm:*, @types/estree@npm:1.0.5, @types/estree@npm:^1.0.0":
+  version: 1.0.5
+  resolution: "@types/estree@npm:1.0.5"
+  checksum: dd8b5bed28e6213b7acd0fb665a84e693554d850b0df423ac8076cc3ad5823a6bc26b0251d080bdc545af83179ede51dd3f6fa78cad2c46ed1f29624ddf3e41a
   languageName: node
   linkType: hard
 
@@ -10834,6 +10693,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/hast@npm:^3.0.0":
+  version: 3.0.4
+  resolution: "@types/hast@npm:3.0.4"
+  dependencies:
+    "@types/unist": "*"
+  checksum: 7a973e8d16fcdf3936090fa2280f408fb2b6a4f13b42edeb5fbd614efe042b82eac68e298e556d50f6b4ad585a3a93c353e9c826feccdc77af59de8dd400d044
+  languageName: node
+  linkType: hard
+
 "@types/history@npm:*":
   version: 4.7.8
   resolution: "@types/history@npm:4.7.8"
@@ -11049,13 +10917,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/mime-types@npm:^2.1.0":
-  version: 2.1.1
-  resolution: "@types/mime-types@npm:2.1.1"
-  checksum: 106b5d556add46446a579ad25ff15d6b421851790d887edcad558c90c1e64b1defc72bfbaf4b08f208916e21d9cc45cdb951d77be51268b18221544cfe054a3c
-  languageName: node
-  linkType: hard
-
 "@types/mime@npm:*":
   version: 3.0.0
   resolution: "@types/mime@npm:3.0.0"
@@ -11088,16 +10949,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node-fetch@npm:^2.6.4":
-  version: 2.6.4
-  resolution: "@types/node-fetch@npm:2.6.4"
-  dependencies:
-    "@types/node": "*"
-    form-data: ^3.0.0
-  checksum: f3e1d881bb42269e676ecaf49f0e096ab345e22823a2b2d071d60619414817fe02df48a31a8d05adb23054028a2a65521bdb3906ceb763ab6d3339c8d8775058
-  languageName: node
-  linkType: hard
-
 "@types/node-forge@npm:^0.10.0":
   version: 0.10.0
   resolution: "@types/node-forge@npm:0.10.0"
@@ -11506,10 +11357,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@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
+"@types/semver@npm:^7.3.12, @types/semver@npm:^7.3.4, @types/semver@npm:^7.5.0, @types/semver@npm:^7.5.6":
+  version: 7.5.8
+  resolution: "@types/semver@npm:7.5.8"
+  checksum: ea6f5276f5b84c55921785a3a27a3cd37afee0111dfe2bcb3e03c31819c197c782598f17f0b150a69d453c9584cd14c4c4d7b9a55d2c5e6cacd4d66fdb3b3663
   languageName: node
   linkType: hard
 
@@ -11669,10 +11520,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/unist@npm:*, @types/unist@npm:^2.0.0":
-  version: 2.0.6
-  resolution: "@types/unist@npm:2.0.6"
-  checksum: 25cb860ff10dde48b54622d58b23e66214211a61c84c0f15f88d38b61aa1b53d4d46e42b557924a93178c501c166aa37e28d7f6d994aba13d24685326272d5db
+"@types/unist@npm:*, @types/unist@npm:^3.0.0":
+  version: 3.0.2
+  resolution: "@types/unist@npm:3.0.2"
+  checksum: 3d04d0be69316e5f14599a0d993a208606c12818cf631fd399243d1dc7a9bd8a3917d6066baa6abc290814afbd744621484756803c80cba892c39cd4b4a85616
   languageName: node
   linkType: hard
 
@@ -12125,6 +11976,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ungap/structured-clone@npm:^1.0.0":
+  version: 1.2.0
+  resolution: "@ungap/structured-clone@npm:1.2.0"
+  checksum: 4f656b7b4672f2ce6e272f2427d8b0824ed11546a601d8d5412b9d7704e83db38a8d9f402ecdf2b9063fc164af842ad0ec4a55819f621ed7e7ea4d1efcc74524
+  languageName: node
+  linkType: hard
+
 "@uppy/companion-client@npm:^1.8.1":
   version: 1.8.1
   resolution: "@uppy/companion-client@npm:1.8.1"
@@ -12365,18 +12223,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vitejs/plugin-react@npm:^3.0.1":
-  version: 3.1.0
-  resolution: "@vitejs/plugin-react@npm:3.1.0"
+"@vitejs/plugin-react@npm:^4.2.1":
+  version: 4.2.1
+  resolution: "@vitejs/plugin-react@npm:4.2.1"
   dependencies:
-    "@babel/core": ^7.20.12
-    "@babel/plugin-transform-react-jsx-self": ^7.18.6
-    "@babel/plugin-transform-react-jsx-source": ^7.19.6
-    magic-string: ^0.27.0
+    "@babel/core": ^7.23.5
+    "@babel/plugin-transform-react-jsx-self": ^7.23.3
+    "@babel/plugin-transform-react-jsx-source": ^7.23.3
+    "@types/babel__core": ^7.20.5
     react-refresh: ^0.14.0
   peerDependencies:
-    vite: ^4.1.0-beta.0
-  checksum: 450fac79e67cba9e1581c860f78e687b44108ab4117663ef20db279316e03cd8e87f94fef376e27cc5e200bd52813dcc09b70ea570c7c7cc291fcd47eb260fbc
+    vite: ^4.2.0 || ^5.0.0
+  checksum: 08d227d27ff2304e395e746bd2d4b5fee40587f69d7e2fcd6beb7d91163c1f1dc26d843bc48e2ffb8f38c6b8a1b9445fb07840e3dcc841f97b56bbb8205346aa
   languageName: node
   linkType: hard
 
@@ -12801,13 +12659,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"agent-base@npm:5":
-  version: 5.1.1
-  resolution: "agent-base@npm:5.1.1"
-  checksum: 61ae789f3019f1dc10e8cba6d3ae9826949299a4e54aaa1cfa2fa37c95a108e70e95423b963bb987d7891a703fd9a5c383a506f4901819f3ee56f3147c0aa8ab
-  languageName: node
-  linkType: hard
-
 "agent-base@npm:6, agent-base@npm:^6.0.2":
   version: 6.0.2
   resolution: "agent-base@npm:6.0.2"
@@ -13257,7 +13108,7 @@ __metadata:
     d3-geo: ^3.1.0
     dayjs: ^1.10.6
     deep-diff: ^1.0.2
-    design-system: "npm:@appsmithorg/design-system@2.1.37"
+    design-system: "npm:@appsmithorg/design-system@2.1.38"
     design-system-old: "npm:@appsmithorg/design-system-old@1.1.16"
     diff: ^5.0.0
     dotenv: ^8.1.0
@@ -13730,7 +13581,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"assert@npm:^2.0.0, assert@npm:^2.1.0":
+"assert@npm:^2.1.0":
   version: 2.1.0
   resolution: "assert@npm:2.1.0"
   dependencies:
@@ -15245,14 +15096,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chromatic@npm:^6.20.0":
-  version: 6.20.0
-  resolution: "chromatic@npm:6.20.0"
+"chromatic@npm:^11.3.0":
+  version: 11.3.0
+  resolution: "chromatic@npm:11.3.0"
+  peerDependencies:
+    "@chromatic-com/cypress": ^0.*.* || ^1.0.0
+    "@chromatic-com/playwright": ^0.*.* || ^1.0.0
+  peerDependenciesMeta:
+    "@chromatic-com/cypress":
+      optional: true
+    "@chromatic-com/playwright":
+      optional: true
   bin:
     chroma: dist/bin.js
     chromatic: dist/bin.js
     chromatic-cli: dist/bin.js
-  checksum: 90d413144ea9502cb96fd0065a0cf2ece63d832da2d7fd93f9577fd09080cbeb829ce9ca1d2384d4f7739cc249aa09033ca61820ac3c1656ff92d6a4ba2fbd67
+  checksum: 267bf4f4b5b548e065f770e6909229e67089f560233f04f8be3dc176583bd640a4637ad8f6f7e796b86b37af2a512b14b5e16ec7c0f6d07abf529ece740c62db
   languageName: node
   linkType: hard
 
@@ -15803,7 +15662,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"concat-stream@npm:^1.6.0, concat-stream@npm:^1.6.1, concat-stream@npm:^1.6.2, concat-stream@npm:~1.6.0":
+"concat-stream@npm:^1.6.0, concat-stream@npm:^1.6.1, concat-stream@npm:~1.6.0":
   version: 1.6.2
   resolution: "concat-stream@npm:1.6.2"
   dependencies:
@@ -16094,7 +15953,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cosmiconfig@npm:^8.1.3, cosmiconfig@npm:^8.2.0":
+"cosmiconfig@npm:^8.1.3":
   version: 8.2.0
   resolution: "cosmiconfig@npm:8.2.0"
   dependencies:
@@ -16949,7 +16808,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:2.6.9, debug@npm:^2.6.0, debug@npm:^2.6.9":
+"debug@npm:2.6.9, debug@npm:^2.6.0":
   version: 2.6.9
   resolution: "debug@npm:2.6.9"
   dependencies:
@@ -17289,9 +17148,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"design-system@npm:@appsmithorg/design-system@2.1.37":
-  version: 2.1.37
-  resolution: "@appsmithorg/design-system@npm:2.1.37"
+"design-system@npm:@appsmithorg/design-system@2.1.38":
+  version: 2.1.38
+  resolution: "@appsmithorg/design-system@npm:2.1.38"
   dependencies:
     "@radix-ui/react-dialog": ^1.0.2
     "@radix-ui/react-dropdown-menu": ^2.0.4
@@ -17321,7 +17180,7 @@ __metadata:
     react-dom: ^17.0.2
     react-router-dom: ^5.0.0
     styled-components: ^5.3.6
-  checksum: 012936cc603bf5c21bcd6486c35935bc22171f2243dd988cb93f92ed559fcd3245561ceda2f791845dce559de942c2acce8cde1fc8c3d30d45c24d4768aedf72
+  checksum: 382f7f2c05ab4daf7f200dabfa3da8e06a9e551b87f24bc43c50e84824fde99b25ed505632ad82650246ebaafd53d51cd50082769a9112282938355ceaa2f667
   languageName: node
   linkType: hard
 
@@ -18001,17 +17860,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"endent@npm:^2.0.1":
-  version: 2.1.0
-  resolution: "endent@npm:2.1.0"
-  dependencies:
-    dedent: ^0.7.0
-    fast-json-parse: ^1.0.3
-    objectorarray: ^1.0.5
-  checksum: c352831088fce745a39ddbd5f87a17e073ea6556e7e96e9010d945a3f3020f836b9a84657123fa01e897db9216f4b080d950b5ded9bf3a8227f14a34efaaaf7c
-  languageName: node
-  linkType: hard
-
 "engine.io-client@npm:~6.2.3":
   version: 6.2.3
   resolution: "engine.io-client@npm:6.2.3"
@@ -18310,33 +18158,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild@npm:^0.18.0, esbuild@npm:^0.18.10":
-  version: 0.18.20
-  resolution: "esbuild@npm:0.18.20"
+"esbuild@npm:^0.18.0 || ^0.19.0 || ^0.20.0, esbuild@npm:^0.20.1":
+  version: 0.20.2
+  resolution: "esbuild@npm:0.20.2"
   dependencies:
-    "@esbuild/android-arm": 0.18.20
-    "@esbuild/android-arm64": 0.18.20
-    "@esbuild/android-x64": 0.18.20
-    "@esbuild/darwin-arm64": 0.18.20
-    "@esbuild/darwin-x64": 0.18.20
-    "@esbuild/freebsd-arm64": 0.18.20
-    "@esbuild/freebsd-x64": 0.18.20
-    "@esbuild/linux-arm": 0.18.20
-    "@esbuild/linux-arm64": 0.18.20
-    "@esbuild/linux-ia32": 0.18.20
-    "@esbuild/linux-loong64": 0.18.20
-    "@esbuild/linux-mips64el": 0.18.20
-    "@esbuild/linux-ppc64": 0.18.20
-    "@esbuild/linux-riscv64": 0.18.20
-    "@esbuild/linux-s390x": 0.18.20
-    "@esbuild/linux-x64": 0.18.20
-    "@esbuild/netbsd-x64": 0.18.20
-    "@esbuild/openbsd-x64": 0.18.20
-    "@esbuild/sunos-x64": 0.18.20
-    "@esbuild/win32-arm64": 0.18.20
-    "@esbuild/win32-ia32": 0.18.20
-    "@esbuild/win32-x64": 0.18.20
+    "@esbuild/aix-ppc64": 0.20.2
+    "@esbuild/android-arm": 0.20.2
+    "@esbuild/android-arm64": 0.20.2
+    "@esbuild/android-x64": 0.20.2
+    "@esbuild/darwin-arm64": 0.20.2
+    "@esbuild/darwin-x64": 0.20.2
+    "@esbuild/freebsd-arm64": 0.20.2
+    "@esbuild/freebsd-x64": 0.20.2
+    "@esbuild/linux-arm": 0.20.2
+    "@esbuild/linux-arm64": 0.20.2
+    "@esbuild/linux-ia32": 0.20.2
+    "@esbuild/linux-loong64": 0.20.2
+    "@esbuild/linux-mips64el": 0.20.2
+    "@esbuild/linux-ppc64": 0.20.2
+    "@esbuild/linux-riscv64": 0.20.2
+    "@esbuild/linux-s390x": 0.20.2
+    "@esbuild/linux-x64": 0.20.2
+    "@esbuild/netbsd-x64": 0.20.2
+    "@esbuild/openbsd-x64": 0.20.2
+    "@esbuild/sunos-x64": 0.20.2
+    "@esbuild/win32-arm64": 0.20.2
+    "@esbuild/win32-ia32": 0.20.2
+    "@esbuild/win32-x64": 0.20.2
   dependenciesMeta:
+    "@esbuild/aix-ppc64":
+      optional: true
     "@esbuild/android-arm":
       optional: true
     "@esbuild/android-arm64":
@@ -18383,7 +18234,7 @@ __metadata:
       optional: true
   bin:
     esbuild: bin/esbuild
-  checksum: 5d253614e50cdb6ec22095afd0c414f15688e7278a7eb4f3720a6dd1306b0909cf431e7b9437a90d065a31b1c57be60130f63fe3e8d0083b588571f31ee6ec7b
+  checksum: bc88050fc1ca5c1bd03648f9979e514bdefb956a63aa3974373bb7b9cbac0b3aac9b9da1b5bdca0b3490e39d6b451c72815dbd6b7d7f978c91fbe9c9e9aa4e4c
   languageName: node
   linkType: hard
 
@@ -19240,7 +19091,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"extend@npm:^3.0.0, extend@npm:^3.0.2, extend@npm:~3.0.2":
+"extend@npm:^3.0.2, extend@npm:~3.0.2":
   version: 3.0.2
   resolution: "extend@npm:3.0.2"
   checksum: a50a8309ca65ea5d426382ff09f33586527882cf532931cb08ca786ea3146c0553310bda688710ff61d7668eba9f96b923fe1420cdf56a2c3eaf30fcab87b515
@@ -19275,20 +19126,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"extract-zip@npm:^1.6.6":
-  version: 1.7.0
-  resolution: "extract-zip@npm:1.7.0"
-  dependencies:
-    concat-stream: ^1.6.2
-    debug: ^2.6.9
-    mkdirp: ^0.5.4
-    yauzl: ^2.10.0
-  bin:
-    extract-zip: cli.js
-  checksum: 011bab660d738614555773d381a6ba4815d98c1cfcdcdf027e154ebcc9fc8c9ef637b3ea5c9b2144013100071ee41722ed041fc9aacc60f6198ef747cac0c073
-  languageName: node
-  linkType: hard
-
 "extsprintf@npm:1.3.0":
   version: 1.3.0
   resolution: "extsprintf@npm:1.3.0"
@@ -19340,13 +19177,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-json-parse@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "fast-json-parse@npm:1.0.3"
-  checksum: c19117c56ec18a9aa133c8ebf450c99d1037117e47a3cb9aff91b60580ba48d0fd8484b696c26749a1b9cb4914084177b3fa9ebef72063a74dee7d9ead987603
-  languageName: node
-  linkType: hard
-
 "fast-json-stable-stringify@npm:2.x, fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0":
   version: 2.1.0
   resolution: "fast-json-stable-stringify@npm:2.1.0"
@@ -19548,6 +19378,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"filesize@npm:^10.0.12":
+  version: 10.1.1
+  resolution: "filesize@npm:10.1.1"
+  checksum: 8a3b5773c507bd566b9c0872a55a7564c68df3f74b6a3af1ada9dcc51128a03754ba19a75c36a292ab38f2c5fcb4293b5a1b2fe09b17d460696f175fc6dbccfd
+  languageName: node
+  linkType: hard
+
 "filesize@npm:^3.6.1":
   version: 3.6.1
   resolution: "filesize@npm:3.6.1"
@@ -20037,19 +19874,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fsevents@npm:^2.3.2, fsevents@npm:~2.3.2":
-  version: 2.3.2
-  resolution: "fsevents@npm:2.3.2"
+"fsevents@npm:^2.3.2, fsevents@npm:~2.3.2, fsevents@npm:~2.3.3":
+  version: 2.3.3
+  resolution: "fsevents@npm:2.3.3"
   dependencies:
     node-gyp: latest
-  checksum: 97ade64e75091afee5265e6956cb72ba34db7819b4c3e94c431d4be2b19b8bb7a2d4116da417950c3425f17c8fe693d25e20212cac583ac1521ad066b77ae31f
+  checksum: 11e6ea6fea15e42461fc55b4b0e4a0a3c654faa567f1877dbd353f39156f69def97a69936d1746619d656c4b93de2238bf731f6085a03a50cabf287c9d024317
   conditions: os=darwin
   languageName: node
   linkType: hard
 
-"fsevents@patch:fsevents@^2.3.2#~builtin<compat/fsevents>, fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>":
-  version: 2.3.2
-  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=df0bf1"
+"fsevents@patch:fsevents@^2.3.2#~builtin<compat/fsevents>, fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>, fsevents@patch:fsevents@~2.3.3#~builtin<compat/fsevents>":
+  version: 2.3.3
+  resolution: "fsevents@patch:fsevents@npm%3A2.3.3#~builtin<compat/fsevents>::version=2.3.3&hash=df0bf1"
   dependencies:
     node-gyp: latest
   conditions: os=darwin
@@ -20218,13 +20055,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-port@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "get-port@npm:5.1.1"
-  checksum: 0162663ffe5c09e748cd79d97b74cd70e5a5c84b760a475ce5767b357fb2a57cb821cee412d646aa8a156ed39b78aab88974eddaa9e5ee926173c036c0713787
-  languageName: node
-  linkType: hard
-
 "get-stdin@npm:^5.0.1":
   version: 5.0.1
   resolution: "get-stdin@npm:5.0.1"
@@ -20302,10 +20132,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"github-slugger@npm:^1.0.0":
-  version: 1.5.0
-  resolution: "github-slugger@npm:1.5.0"
-  checksum: c70988224578b3bdaa25df65973ffc8c24594a77a28550c3636e495e49d17aef5cdb04c04fa3f1744babef98c61eecc6a43299a13ea7f3cc33d680bf9053ffbe
+"github-slugger@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "github-slugger@npm:2.0.0"
+  checksum: 250375cde2058f21454872c2c79f72c4637340c30c51ff158ca4ec71cbc478f33d54477d787a662f9207aeb095a2060f155bc01f15329ba8a5fb6698e0fc81f8
   languageName: node
   linkType: hard
 
@@ -20761,6 +20591,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"hast-util-heading-rank@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "hast-util-heading-rank@npm:3.0.0"
+  dependencies:
+    "@types/hast": ^3.0.0
+  checksum: e5ce4ec9e8017b24ab72702fa0dd401ec6eaf32574120d71c2aa4e8e0f43829dba2e291f49d305a47e8d65b82a9c5adad7985385dc5bc8370f8cec7c8f9313d3
+  languageName: node
+  linkType: hard
+
+"hast-util-is-element@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "hast-util-is-element@npm:3.0.0"
+  dependencies:
+    "@types/hast": ^3.0.0
+  checksum: 82569a420eda5877c52fdbbdbe26675f012c02d70813dfd19acffdee328e42e4bd0b7ae34454cfcbcb932b2bedbd7ddc119f943a0cfb234120f9456d6c0c4331
+  languageName: node
+  linkType: hard
+
 "hast-util-parse-selector@npm:^2.0.0":
   version: 2.2.5
   resolution: "hast-util-parse-selector@npm:2.2.5"
@@ -20768,6 +20616,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"hast-util-to-string@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "hast-util-to-string@npm:3.0.0"
+  dependencies:
+    "@types/hast": ^3.0.0
+  checksum: 64f7f4f2b7a69b2ebddd1c87a29eae5f718d593d2154a46de2fa21f6ca8bfbda50ad71a5794f5952ae450f4da23a8bc811db348098b09916b9553cd933aefe9a
+  languageName: node
+  linkType: hard
+
 "hastscript@npm:^6.0.0":
   version: 6.0.0
   resolution: "hastscript@npm:6.0.0"
@@ -21135,16 +20992,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"https-proxy-agent@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "https-proxy-agent@npm:4.0.0"
-  dependencies:
-    agent-base: 5
-    debug: 4
-  checksum: 19471d5aae3e747b1c98b17556647e2a1362e68220c6b19585a8527498f32e62e03c41d2872d059d8720d56846bd7460a80ac06f876bccfa786468ff40dd5eef
-  languageName: node
-  linkType: hard
-
 "https-proxy-agent@npm:^5.0.0, https-proxy-agent@npm:^5.0.1":
   version: 5.0.1
   resolution: "https-proxy-agent@npm:5.0.1"
@@ -21533,7 +21380,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ip@npm:^2.0.0":
+"ip@npm:^2.0.0, ip@npm:^2.0.1":
   version: 2.0.1
   resolution: "ip@npm:2.0.1"
   checksum: d765c9fd212b8a99023a4cde6a558a054c298d640fec1020567494d257afd78ca77e37126b1a3ef0e053646ced79a816bf50621d38d5e768cdde0431fa3b0d35
@@ -21554,10 +21401,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-absolute-url@npm:^3.0.0":
-  version: 3.0.3
-  resolution: "is-absolute-url@npm:3.0.3"
-  checksum: 5159b51d065d9ad29e16a2f78d6c0e41c43227caf90a45e659c54ea6fd50ef0595b1871ce392e84b1df7cfdcad9a8e66eec0813a029112188435abf115accb16
+"is-absolute-url@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "is-absolute-url@npm:4.0.1"
+  checksum: de172a718439982a54477fdae55f21be69ec0e6a4b205db5484975d2f4ee749851fd46c28f3790dfc51a274c2ed1d0f8457b6d1fff02ab829069fd9cc761e48c
   languageName: node
   linkType: hard
 
@@ -23699,7 +23546,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsonfile@npm:^6.0.1":
+"jsonfile@npm:^6.0.1, jsonfile@npm:^6.1.0":
   version: 6.1.0
   resolution: "jsonfile@npm:6.1.0"
   dependencies:
@@ -24551,12 +24398,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"markdown-to-jsx@npm:^7.1.8":
-  version: 7.2.1
-  resolution: "markdown-to-jsx@npm:7.2.1"
+"markdown-to-jsx@npm:7.3.2":
+  version: 7.3.2
+  resolution: "markdown-to-jsx@npm:7.3.2"
   peerDependencies:
     react: ">= 0.14.0"
-  checksum: 0c8c715229044401ea48c2fc26c2554464100074959dafacdd9e4a0e849f0a190b02f39edb373bbdd95e38b8f910074b83b63d08752b8ae6be6ddcfb40ea50a0
+  checksum: 8885c6343b71570b0a7ec16cd85a49b853a830234790ee7430e2517ea5d8d361ff138bd52147f650790f3e7b3a28a15c755fc16f8856dd01ddf09a6161782e06
   languageName: node
   linkType: hard
 
@@ -24596,22 +24443,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mdast-util-definitions@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "mdast-util-definitions@npm:4.0.0"
-  dependencies:
-    unist-util-visit: ^2.0.0
-  checksum: 2325f20b82b3fb8cb5fda77038ee0bbdd44f82cfca7c48a854724b58bc1fe5919630a3ce7c45e210726df59d46c881d020b2da7a493bfd1ee36eb2bbfef5d78e
-  languageName: node
-  linkType: hard
-
-"mdast-util-to-string@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "mdast-util-to-string@npm:1.1.0"
-  checksum: eec1eb283f3341376c8398b67ce512a11ab3e3191e3dbd5644d32a26784eac8d5f6d0b0fb81193af00d75a2c545cde765c8b03e966bd890076efb5d357fb4fe2
-  languageName: node
-  linkType: hard
-
 "mdn-data@npm:2.0.14":
   version: 2.0.14
   resolution: "mdn-data@npm:2.0.14"
@@ -24776,7 +24607,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mime-types@npm:^2.1.12, mime-types@npm:^2.1.25, mime-types@npm:^2.1.27, mime-types@npm:^2.1.31, mime-types@npm:~2.1.17, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34":
+"mime-types@npm:^2.1.12, mime-types@npm:^2.1.27, mime-types@npm:^2.1.31, mime-types@npm:~2.1.17, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34":
   version: 2.1.35
   resolution: "mime-types@npm:2.1.35"
   dependencies:
@@ -24794,7 +24625,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mime@npm:2.6.0, mime@npm:^2.0.3, mime@npm:^2.4.4":
+"mime@npm:2.6.0, mime@npm:^2.4.4":
   version: 2.6.0
   resolution: "mime@npm:2.6.0"
   bin:
@@ -25008,7 +24839,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.4, mkdirp@npm:^0.5.5, mkdirp@npm:~0.5.1":
+"mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.5, mkdirp@npm:~0.5.1":
   version: 0.5.6
   resolution: "mkdirp@npm:0.5.6"
   dependencies:
@@ -25727,13 +25558,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"objectorarray@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "objectorarray@npm:1.0.5"
-  checksum: 8fd776aa495d113e217837f4adc1d53e63f656498237094d25f84c3e2c038b34b71d6fd85c4b60c7ae5f558790e5042426a400fae3eac35f297e11be12643a78
-  languageName: node
-  linkType: hard
-
 "obuf@npm:^1.0.0, obuf@npm:^1.1.2, obuf@npm:~1.1.2":
   version: 1.1.2
   resolution: "obuf@npm:1.1.2"
@@ -26624,7 +26448,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-at-rules-variables@npm:*, postcss-at-rules-variables@npm:^0.3.0":
+"postcss-at-rules-variables@npm:^0.3.0":
   version: 0.3.0
   resolution: "postcss-at-rules-variables@npm:0.3.0"
   peerDependencies:
@@ -26900,7 +26724,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-each@npm:*, postcss-each@npm:^1.1.0":
+"postcss-each@npm:^1.1.0":
   version: 1.1.0
   resolution: "postcss-each@npm:1.1.0"
   dependencies:
@@ -26982,19 +26806,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-import@npm:*, postcss-import@npm:^15.1.0":
-  version: 15.1.0
-  resolution: "postcss-import@npm:15.1.0"
-  dependencies:
-    postcss-value-parser: ^4.0.0
-    read-cache: ^1.0.0
-    resolve: ^1.1.7
-  peerDependencies:
-    postcss: ^8.0.0
-  checksum: 7bd04bd8f0235429009d0022cbf00faebc885de1d017f6d12ccb1b021265882efc9302006ba700af6cab24c46bfa2f3bc590be3f9aee89d064944f171b04e2a3
-  languageName: node
-  linkType: hard
-
 "postcss-import@npm:^14.1.0":
   version: 14.1.0
   resolution: "postcss-import@npm:14.1.0"
@@ -27008,6 +26819,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postcss-import@npm:^15.1.0":
+  version: 15.1.0
+  resolution: "postcss-import@npm:15.1.0"
+  dependencies:
+    postcss-value-parser: ^4.0.0
+    read-cache: ^1.0.0
+    resolve: ^1.1.7
+  peerDependencies:
+    postcss: ^8.0.0
+  checksum: 7bd04bd8f0235429009d0022cbf00faebc885de1d017f6d12ccb1b021265882efc9302006ba700af6cab24c46bfa2f3bc590be3f9aee89d064944f171b04e2a3
+  languageName: node
+  linkType: hard
+
 "postcss-initial@npm:^4.0.1":
   version: 4.0.1
   resolution: "postcss-initial@npm:4.0.1"
@@ -27058,20 +26882,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-loader@npm:*":
-  version: 7.3.3
-  resolution: "postcss-loader@npm:7.3.3"
-  dependencies:
-    cosmiconfig: ^8.2.0
-    jiti: ^1.18.2
-    semver: ^7.3.8
-  peerDependencies:
-    postcss: ^7.0.0 || ^8.0.1
-    webpack: ^5.0.0
-  checksum: c724044d6ae56334535c26bb4efc9c151431d44d60bc8300157c760747281a242757d8dab32db72738434531175b38a408cb0b270bb96207c07584dcfcd899ff
-  languageName: node
-  linkType: hard
-
 "postcss-loader@npm:^6.2.1":
   version: 6.2.1
   resolution: "postcss-loader@npm:6.2.1"
@@ -27285,7 +27095,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-modules-values@npm:*, postcss-modules-values@npm:^4.0.0":
+"postcss-modules-values@npm:^4.0.0":
   version: 4.0.0
   resolution: "postcss-modules-values@npm:4.0.0"
   dependencies:
@@ -27936,7 +27746,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:^2.6.2, prettier@npm:^2.8.0":
+"prettier@npm:^2.6.2":
   version: 2.8.8
   resolution: "prettier@npm:2.8.8"
   bin:
@@ -27945,12 +27755,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "prettier@npm:3.0.3"
+"prettier@npm:^3.0.3, prettier@npm:^3.1.1":
+  version: 3.2.5
+  resolution: "prettier@npm:3.2.5"
   bin:
     prettier: bin/prettier.cjs
-  checksum: e10b9af02b281f6c617362ebd2571b1d7fc9fb8a3bd17e371754428cda992e5e8d8b7a046e8f7d3e2da1dcd21aa001e2e3c797402ebb6111b5cd19609dd228e0
+  checksum: 2ee4e1417572372afb7a13bb446b34f20f1bf1747db77cf6ccaf57a9be005f2f15c40f903d41a6b79eec3f57fff14d32a20fb6dee1f126da48908926fe43c311
   languageName: node
   linkType: hard
 
@@ -28045,7 +27855,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"progress@npm:^2.0.1, progress@npm:^2.0.3":
+"progress@npm:^2.0.3":
   version: 2.0.3
   resolution: "progress@npm:2.0.3"
   checksum: f67403fe7b34912148d9252cb7481266a354bd99ce82c835f79070643bb3c6583d10dbcfda4d41e04bbc1d8437e9af0fb1e1f2135727878f5308682a579429b7
@@ -28175,7 +27985,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"proxy-from-env@npm:^1.0.0, proxy-from-env@npm:^1.1.0":
+"proxy-from-env@npm:^1.1.0":
   version: 1.1.0
   resolution: "proxy-from-env@npm:1.1.0"
   checksum: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4
@@ -28280,24 +28090,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"puppeteer-core@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "puppeteer-core@npm:2.1.1"
-  dependencies:
-    "@types/mime-types": ^2.1.0
-    debug: ^4.1.0
-    extract-zip: ^1.6.6
-    https-proxy-agent: ^4.0.0
-    mime: ^2.0.3
-    mime-types: ^2.1.25
-    progress: ^2.0.1
-    proxy-from-env: ^1.0.0
-    rimraf: ^2.6.1
-    ws: ^6.1.0
-  checksum: 2ddb597ef1b2d162b4aa49833b977734129edf7c8fa558fc38c59d273e79aa1bd079481c642de87f7163665f7f37aa52683da2716bafb7d3cab68c262c36ec28
-  languageName: node
-  linkType: hard
-
 "pure-color@npm:^1.2.0":
   version: 1.3.0
   resolution: "pure-color@npm:1.3.0"
@@ -28891,6 +28683,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-confetti@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "react-confetti@npm:6.1.0"
+  dependencies:
+    tween-functions: ^1.2.0
+  peerDependencies:
+    react: ^16.3.0 || ^17.0.1 || ^18.0.0
+  checksum: 24b6975df144d2bf09d8e1c95ddc49e547775f911efaa8d96b49e522659d931539e9d9e48cc0db3a01f3a671be7e3824e6e728db85096f5527db5d1c69ebb153
+  languageName: node
+  linkType: hard
+
 "react-custom-scrollbars@npm:^4.2.1":
   version: 4.2.1
   resolution: "react-custom-scrollbars@npm:4.2.1"
@@ -29050,6 +28853,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-dom@npm:^16.8.0 || ^17.0.0 || ^18.0.0":
+  version: 18.2.0
+  resolution: "react-dom@npm:18.2.0"
+  dependencies:
+    loose-envify: ^1.1.0
+    scheduler: ^0.23.0
+  peerDependencies:
+    react: ^18.2.0
+  checksum: 7d323310bea3a91be2965f9468d552f201b1c27891e45ddc2d6b8f717680c95a75ae0bc1e3f5cf41472446a2589a75aed4483aee8169287909fcd59ad149e8cc
+  languageName: node
+  linkType: hard
+
 "react-dom@npm:^17.0.2":
   version: 17.0.2
   resolution: "react-dom@npm:17.0.2"
@@ -29891,6 +29706,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react@npm:^16.8.0 || ^17.0.0 || ^18.0.0":
+  version: 18.2.0
+  resolution: "react@npm:18.2.0"
+  dependencies:
+    loose-envify: ^1.1.0
+  checksum: 88e38092da8839b830cda6feef2e8505dec8ace60579e46aa5490fc3dc9bba0bd50336507dc166f43e3afc1c42939c09fe33b25fae889d6f402721dcd78fca1b
+  languageName: node
+  linkType: hard
+
 "react@npm:^17.0.2":
   version: 17.0.2
   resolution: "react@npm:17.0.2"
@@ -29989,16 +29813,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"recast@npm:^0.23.1, recast@npm:^0.23.3":
-  version: 0.23.4
-  resolution: "recast@npm:0.23.4"
+"recast@npm:^0.23.3, recast@npm:^0.23.5":
+  version: 0.23.6
+  resolution: "recast@npm:0.23.6"
   dependencies:
-    assert: ^2.0.0
     ast-types: ^0.16.1
     esprima: ~4.0.0
     source-map: ~0.6.1
+    tiny-invariant: ^1.3.3
     tslib: ^2.0.1
-  checksum: edb63bbe0457e68c0f4892f55413000e92aa7c5c53f9e109ab975d1c801cd299a62511ea72734435791f4aea6f0edf560f6a275761f66b2b6069ff6d72686029
+  checksum: c15e2f66e94c7171e6c3ce446b08dc72c8a2431423812c4ff0b476de70b11cb97aecdd20055005859e496b7e1bb48fb4c076b3d324ae68513d3dc56960ad1a00
   languageName: node
   linkType: hard
 
@@ -30260,6 +30084,33 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rehype-external-links@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "rehype-external-links@npm:3.0.0"
+  dependencies:
+    "@types/hast": ^3.0.0
+    "@ungap/structured-clone": ^1.0.0
+    hast-util-is-element: ^3.0.0
+    is-absolute-url: ^4.0.0
+    space-separated-tokens: ^2.0.0
+    unist-util-visit: ^5.0.0
+  checksum: f776f306a2698a67b03665280fcc00448a5bf59b997d83fbb70fc3d71acff2c3025c70ee1840f48ca7dff209217ebe9adad085dc7caf9e5907badf8b104898b6
+  languageName: node
+  linkType: hard
+
+"rehype-slug@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "rehype-slug@npm:6.0.0"
+  dependencies:
+    "@types/hast": ^3.0.0
+    github-slugger: ^2.0.0
+    hast-util-heading-rank: ^3.0.0
+    hast-util-to-string: ^3.0.0
+    unist-util-visit: ^5.0.0
+  checksum: 0e13ec558eb142d14a6daeab21bbef7c9230bfabec45987e15a24283650226eae3898ad162b8cb29ee39a8bce536bcc013eeab7dc6faa0295b0e91612a8c9f6e
+  languageName: node
+  linkType: hard
+
 "relateurl@npm:^0.2.7":
   version: 0.2.7
   resolution: "relateurl@npm:0.2.7"
@@ -30267,30 +30118,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"remark-external-links@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "remark-external-links@npm:8.0.0"
-  dependencies:
-    extend: ^3.0.0
-    is-absolute-url: ^3.0.0
-    mdast-util-definitions: ^4.0.0
-    space-separated-tokens: ^1.0.0
-    unist-util-visit: ^2.0.0
-  checksum: 48c4a41fe38916f79febb390b0c4deefe82b554dd36dc534262d851860d17fb6d15d78d515f29194e5fa48db5f01f4405a6f6dd077aaf32812a2efffb01700d7
-  languageName: node
-  linkType: hard
-
-"remark-slug@npm:^6.0.0":
-  version: 6.1.0
-  resolution: "remark-slug@npm:6.1.0"
-  dependencies:
-    github-slugger: ^1.0.0
-    mdast-util-to-string: ^1.0.0
-    unist-util-visit: ^2.0.0
-  checksum: 81fff0dcfaf6d6117ef1293bb1d26c3e25483d99c65c22434298eed93583a89ea5d7b94063d9a7f47c0647a708ce84f00ff62d274503f248feec03c344cabb20
-  languageName: node
-  linkType: hard
-
 "remixicon-react@npm:^1.0.0":
   version: 1.0.0
   resolution: "remixicon-react@npm:1.0.0"
@@ -30478,7 +30305,7 @@ __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.1, resolve@npm:^1.22.2, resolve@npm:^1.22.4, resolve@npm:^1.4.0":
+"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.1, resolve@npm:^1.22.2, resolve@npm:^1.22.4, resolve@npm:^1.22.8, resolve@npm:^1.4.0":
   version: 1.22.8
   resolution: "resolve@npm:1.22.8"
   dependencies:
@@ -30504,7 +30331,7 @@ __metadata:
   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.1#~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>":
+"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.1#~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.22.8#~builtin<compat/resolve>, resolve@patch:resolve@^1.4.0#~builtin<compat/resolve>":
   version: 1.22.8
   resolution: "resolve@patch:resolve@npm%3A1.22.8#~builtin<compat/resolve>::version=1.22.8&hash=c3c19d"
   dependencies:
@@ -30594,7 +30421,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rimraf@npm:^2.6.1, rimraf@npm:^2.6.2":
+"rimraf@npm:^2.6.2":
   version: 2.7.1
   resolution: "rimraf@npm:2.7.1"
   dependencies:
@@ -30688,20 +30515,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollup@npm:^2.25.0 || ^3.3.0, rollup@npm:^3.27.1":
-  version: 3.28.0
-  resolution: "rollup@npm:3.28.0"
-  dependencies:
-    fsevents: ~2.3.2
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  bin:
-    rollup: dist/bin/rollup
-  checksum: 6ded4a0d3ca531d68e82897d5eebaa9d085014a062620bc328f2859ccf78d6a148a51ed53f1275a5f89b55cc6d7b1440b7cee44e5a9e3a51442f809b4b26f727
-  languageName: node
-  linkType: hard
-
 "rollup@npm:^2.43.1, rollup@npm:^2.77.0":
   version: 2.79.1
   resolution: "rollup@npm:2.79.1"
@@ -30716,6 +30529,69 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rollup@npm:^4.13.0":
+  version: 4.14.3
+  resolution: "rollup@npm:4.14.3"
+  dependencies:
+    "@rollup/rollup-android-arm-eabi": 4.14.3
+    "@rollup/rollup-android-arm64": 4.14.3
+    "@rollup/rollup-darwin-arm64": 4.14.3
+    "@rollup/rollup-darwin-x64": 4.14.3
+    "@rollup/rollup-linux-arm-gnueabihf": 4.14.3
+    "@rollup/rollup-linux-arm-musleabihf": 4.14.3
+    "@rollup/rollup-linux-arm64-gnu": 4.14.3
+    "@rollup/rollup-linux-arm64-musl": 4.14.3
+    "@rollup/rollup-linux-powerpc64le-gnu": 4.14.3
+    "@rollup/rollup-linux-riscv64-gnu": 4.14.3
+    "@rollup/rollup-linux-s390x-gnu": 4.14.3
+    "@rollup/rollup-linux-x64-gnu": 4.14.3
+    "@rollup/rollup-linux-x64-musl": 4.14.3
+    "@rollup/rollup-win32-arm64-msvc": 4.14.3
+    "@rollup/rollup-win32-ia32-msvc": 4.14.3
+    "@rollup/rollup-win32-x64-msvc": 4.14.3
+    "@types/estree": 1.0.5
+    fsevents: ~2.3.2
+  dependenciesMeta:
+    "@rollup/rollup-android-arm-eabi":
+      optional: true
+    "@rollup/rollup-android-arm64":
+      optional: true
+    "@rollup/rollup-darwin-arm64":
+      optional: true
+    "@rollup/rollup-darwin-x64":
+      optional: true
+    "@rollup/rollup-linux-arm-gnueabihf":
+      optional: true
+    "@rollup/rollup-linux-arm-musleabihf":
+      optional: true
+    "@rollup/rollup-linux-arm64-gnu":
+      optional: true
+    "@rollup/rollup-linux-arm64-musl":
+      optional: true
+    "@rollup/rollup-linux-powerpc64le-gnu":
+      optional: true
+    "@rollup/rollup-linux-riscv64-gnu":
+      optional: true
+    "@rollup/rollup-linux-s390x-gnu":
+      optional: true
+    "@rollup/rollup-linux-x64-gnu":
+      optional: true
+    "@rollup/rollup-linux-x64-musl":
+      optional: true
+    "@rollup/rollup-win32-arm64-msvc":
+      optional: true
+    "@rollup/rollup-win32-ia32-msvc":
+      optional: true
+    "@rollup/rollup-win32-x64-msvc":
+      optional: true
+    fsevents:
+      optional: true
+  bin:
+    rollup: dist/bin/rollup
+  checksum: f5077037e8514e330db1451a92bf6d9d15b8634698b2e60f56d8d7f30df11cdacfcd1b350a1598ed6516383b5ed2bf3e5a0685e72f81bb2fdb4e630491d09b67
+  languageName: node
+  linkType: hard
+
 "rrdom@npm:^2.0.0-alpha.11":
   version: 2.0.0-alpha.12
   resolution: "rrdom@npm:2.0.0-alpha.12"
@@ -30923,6 +30799,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"scheduler@npm:^0.23.0":
+  version: 0.23.0
+  resolution: "scheduler@npm:0.23.0"
+  dependencies:
+    loose-envify: ^1.1.0
+  checksum: d79192eeaa12abef860c195ea45d37cbf2bbf5f66e3c4dcd16f54a7da53b17788a70d109ee3d3dde1a0fd50e6a8fc171f4300356c5aee4fc0171de526bf35f8a
+  languageName: node
+  linkType: hard
+
 "schema-utils@npm:2.7.0":
   version: 2.7.0
   resolution: "schema-utils@npm:2.7.0"
@@ -31613,6 +31498,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"space-separated-tokens@npm:^2.0.0":
+  version: 2.0.2
+  resolution: "space-separated-tokens@npm:2.0.2"
+  checksum: 202e97d7ca1ba0758a0aa4fe226ff98142073bcceeff2da3aad037968878552c3bbce3b3231970025375bbba5aee00c5b8206eda408da837ab2dc9c0f26be990
+  languageName: node
+  linkType: hard
+
 "spawn-command@npm:^0.0.2-1":
   version: 0.0.2
   resolution: "spawn-command@npm:0.0.2"
@@ -31797,15 +31689,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"storybook@npm:^7.6.12":
-  version: 7.6.12
-  resolution: "storybook@npm:7.6.12"
+"storybook@npm:^8.0.8":
+  version: 8.0.8
+  resolution: "storybook@npm:8.0.8"
   dependencies:
-    "@storybook/cli": 7.6.12
+    "@storybook/cli": 8.0.8
   bin:
     sb: ./index.js
     storybook: ./index.js
-  checksum: e497c5074476cdec8da771b94721c683a777622fcae941a4e4ea19091ea40258d22cb92e3a8b9a17c93c9c27f19a71b133300d3bac43e840f41f9119829a42de
+  checksum: f9a3bb1eccd68c1de15d9ca0da05133466e1bb3f44e2b9730d6f03b1907f4390027c139d895dd89f8d1e3c5ec7814f65878a4079c8734664da1075e27095ea38
   languageName: node
   linkType: hard
 
@@ -32096,12 +31988,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strip-ansi@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "strip-ansi@npm:7.0.1"
+"strip-ansi@npm:^7.0.1, strip-ansi@npm:^7.1.0":
+  version: 7.1.0
+  resolution: "strip-ansi@npm:7.1.0"
   dependencies:
     ansi-regex: ^6.0.1
-  checksum: 257f78fa433520e7f9897722731d78599cb3fce29ff26a20a5e12ba4957463b50a01136f37c43707f4951817a75e90820174853d6ccc240997adc5df8f966039
+  checksum: 859c73fcf27869c22a4e4d8c6acfe690064659e84bef9458aa6d13719d09ca88dcfd40cbf31fd0be63518ea1a643fe070b4827d353e09533a5b0b9fd4553d64d
   languageName: node
   linkType: hard
 
@@ -32449,13 +32341,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"synchronous-promise@npm:^2.0.15":
-  version: 2.0.17
-  resolution: "synchronous-promise@npm:2.0.17"
-  checksum: 7b1342c93741f3f92ebde1edf5d6ce8dde2278de948d84e9bd85e232c16c0d77c90c4940f9975be3effcb20f047cfb0f16fa311c3b4e092c22f3bf2889fb0fb4
-  languageName: node
-  linkType: hard
-
 "synckit@npm:^0.8.5":
   version: 0.8.5
   resolution: "synckit@npm:0.8.5"
@@ -32804,10 +32689,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tiny-invariant@npm:^1.0.2, tiny-invariant@npm:^1.0.6, tiny-invariant@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "tiny-invariant@npm:1.3.1"
-  checksum: 872dbd1ff20a21303a2fd20ce3a15602cfa7fcf9b228bd694a52e2938224313b5385a1078cb667ed7375d1612194feaca81c4ecbe93121ca1baebe344de4f84c
+"tiny-invariant@npm:^1.0.2, tiny-invariant@npm:^1.0.6, tiny-invariant@npm:^1.3.1, tiny-invariant@npm:^1.3.3":
+  version: 1.3.3
+  resolution: "tiny-invariant@npm:1.3.3"
+  checksum: 5e185c8cc2266967984ce3b352a4e57cb89dad5a8abb0dea21468a6ecaa67cd5bb47a3b7a85d08041008644af4f667fb8b6575ba38ba5fb00b3b5068306e59fe
   languageName: node
   linkType: hard
 
@@ -33246,6 +33131,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tsconfig-paths@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "tsconfig-paths@npm:4.2.0"
+  dependencies:
+    json5: ^2.2.2
+    minimist: ^1.2.6
+    strip-bom: ^3.0.0
+  checksum: 28c5f7bbbcabc9dabd4117e8fdc61483f6872a1c6b02a4b1c4d68c5b79d06896c3cc9547610c4c3ba64658531caa2de13ead1ea1bf321c7b53e969c4752b98c7
+  languageName: node
+  linkType: hard
+
 "tslib@npm:2.3.0":
   version: 2.3.0
   resolution: "tslib@npm:2.3.0"
@@ -33308,6 +33204,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tween-functions@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "tween-functions@npm:1.2.0"
+  checksum: 880708d680eff5c347ddcb9f922ad121703a91c78ce308ed309073e73a794b633eb0b80589a839365803f150515ad34c9646809ae8a0e90f09e62686eefb1ab6
+  languageName: node
+  linkType: hard
+
 "tweetnacl@npm:^0.14.3, tweetnacl@npm:~0.14.0":
   version: 0.14.5
   resolution: "tweetnacl@npm:0.14.5"
@@ -33679,31 +33582,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unist-util-is@npm:^4.0.0":
-  version: 4.1.0
-  resolution: "unist-util-is@npm:4.1.0"
-  checksum: 726484cd2adc9be75a939aeedd48720f88294899c2e4a3143da413ae593f2b28037570730d5cf5fd910ff41f3bc1501e3d636b6814c478d71126581ef695f7ea
+"unist-util-is@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "unist-util-is@npm:6.0.0"
+  dependencies:
+    "@types/unist": ^3.0.0
+  checksum: f630a925126594af9993b091cf807b86811371e465b5049a6283e08537d3e6ba0f7e248e1e7dab52cfe33f9002606acef093441137181b327f6fe504884b20e2
   languageName: node
   linkType: hard
 
-"unist-util-visit-parents@npm:^3.0.0":
-  version: 3.1.1
-  resolution: "unist-util-visit-parents@npm:3.1.1"
+"unist-util-visit-parents@npm:^6.0.0":
+  version: 6.0.1
+  resolution: "unist-util-visit-parents@npm:6.0.1"
   dependencies:
-    "@types/unist": ^2.0.0
-    unist-util-is: ^4.0.0
-  checksum: 1170e397dff88fab01e76d5154981666eb0291019d2462cff7a2961a3e76d3533b42eaa16b5b7e2d41ad42a5ea7d112301458283d255993e660511387bf67bc3
+    "@types/unist": ^3.0.0
+    unist-util-is: ^6.0.0
+  checksum: 08927647c579f63b91aafcbec9966dc4a7d0af1e5e26fc69f4e3e6a01215084835a2321b06f3cbe7bf7914a852830fc1439f0fc3d7153d8804ac3ef851ddfa20
   languageName: node
   linkType: hard
 
-"unist-util-visit@npm:^2.0.0":
-  version: 2.0.3
-  resolution: "unist-util-visit@npm:2.0.3"
+"unist-util-visit@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "unist-util-visit@npm:5.0.0"
   dependencies:
-    "@types/unist": ^2.0.0
-    unist-util-is: ^4.0.0
-    unist-util-visit-parents: ^3.0.0
-  checksum: 1fe19d500e212128f96d8c3cfa3312846e586b797748a1fd195fe6479f06bc90a6f6904deb08eefc00dd58e83a1c8a32fb8677252d2273ad7a5e624525b69b8f
+    "@types/unist": ^3.0.0
+    unist-util-is: ^6.0.0
+    unist-util-visit-parents: ^6.0.0
+  checksum: 9ec42e618e7e5d0202f3c191cd30791b51641285732767ee2e6bcd035931032e3c1b29093f4d7fd0c79175bbc1f26f24f26ee49770d32be76f8730a652a857e6
   languageName: node
   linkType: hard
 
@@ -33910,18 +33815,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"use-resize-observer@npm:^9.1.0":
-  version: 9.1.0
-  resolution: "use-resize-observer@npm:9.1.0"
-  dependencies:
-    "@juggle/resize-observer": ^3.3.1
-  peerDependencies:
-    react: 16.8.0 - 18
-    react-dom: 16.8.0 - 18
-  checksum: 92be0ac34a3b3cf884cd55847c90792b5b44833dc258e96d650152815ad246afe45825aa223332203004d836535a927ab74f18dc0313229e2c7c69510eddf382
-  languageName: node
-  linkType: hard
-
 "use-sidecar@npm:^1.1.2":
   version: 1.1.2
   resolution: "use-sidecar@npm:1.1.2"
@@ -34114,29 +34007,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite-plugin-svgr@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "vite-plugin-svgr@npm:3.2.0"
+"vite-plugin-svgr@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "vite-plugin-svgr@npm:4.2.0"
   dependencies:
-    "@rollup/pluginutils": ^5.0.2
-    "@svgr/core": ^7.0.0
-    "@svgr/plugin-jsx": ^7.0.0
+    "@rollup/pluginutils": ^5.0.5
+    "@svgr/core": ^8.1.0
+    "@svgr/plugin-jsx": ^8.1.0
   peerDependencies:
-    vite: ^2.6.0 || 3 || 4
-  checksum: 19887e1db910ecdd6c12645e430d9e1d9ad40fe6945d3f7de68fc235fba0277586deffa47db1a6be2fa511207b01893a3c5bad9d1bd558ca28971feca13ecd9a
+    vite: ^2.6.0 || 3 || 4 || 5
+  checksum: 8202c0b25c7aa547825c2a73c7ea3702bd13dadb12634a8c2ea4e4c701164d8718632a391deff5fdc53877a09ec3668843b521a3e7ca8083e040e5e4f7e53ecb
   languageName: node
   linkType: hard
 
-"vite@npm:^4.5.2":
-  version: 4.5.2
-  resolution: "vite@npm:4.5.2"
+"vite@npm:^5.2.9":
+  version: 5.2.9
+  resolution: "vite@npm:5.2.9"
   dependencies:
-    esbuild: ^0.18.10
-    fsevents: ~2.3.2
-    postcss: ^8.4.27
-    rollup: ^3.27.1
+    esbuild: ^0.20.1
+    fsevents: ~2.3.3
+    postcss: ^8.4.38
+    rollup: ^4.13.0
   peerDependencies:
-    "@types/node": ">= 14"
+    "@types/node": ^18.0.0 || >=20.0.0
     less: "*"
     lightningcss: ^1.21.0
     sass: "*"
@@ -34163,7 +34056,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 9d1f84f703c2660aced34deee7f309278ed368880f66e9570ac115c793d91f7fffb80ab19c602b3c8bc1341fe23437d86a3fcca2a9ef82f7ef0cdac5a40d0c86
+  checksum: 7a97f9547af8550c55bc2529cc6827c1ef0a043a09e9686cf20b615e8d59305cbe917954e806c5fdad6c33bfb883c1ce51325a9c474b5aa5bc13c377a74805fd
   languageName: node
   linkType: hard
 
diff --git a/app/server/appsmith-git/src/main/java/com/appsmith/git/service/ce/GitExecutorCEImpl.java b/app/server/appsmith-git/src/main/java/com/appsmith/git/service/ce/GitExecutorCEImpl.java
index ad0373928c..a7a22b4a0e 100644
--- a/app/server/appsmith-git/src/main/java/com/appsmith/git/service/ce/GitExecutorCEImpl.java
+++ b/app/server/appsmith-git/src/main/java/com/appsmith/git/service/ce/GitExecutorCEImpl.java
@@ -225,6 +225,7 @@ public class GitExecutorCEImpl implements GitExecutor {
 
                         StringBuilder result = new StringBuilder("Pushed successfully with status : ");
                         git.push()
+                                .setAtomic(true)
                                 .setTransportConfigCallback(transportConfigCallback)
                                 .setRemote(remoteUrl)
                                 .call()
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/constants/ce/GitSpanCE.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/constants/ce/GitSpanCE.java
index 3e1149929b..cb4393e177 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/constants/ce/GitSpanCE.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/constants/ce/GitSpanCE.java
@@ -31,6 +31,7 @@ public class GitSpanCE {
     public static final String OPS_FETCH_REMOTE = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "ops_fetch_remote";
     public static final String OPS_DETACH_REMOTE = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "ops_detach_remote";
     public static final String OPS_DISCARD_CHANGES = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "ops_discard_changes";
+    public static final String OPS_MERGE_BRANCH = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "ops_merge_branch";
     public static final String FILE_WRITE = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "file_write";
     public static final String FILE_READ = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "file_read";
 }
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/PEMCertificate.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/PEMCertificate.java
deleted file mode 100644
index 6c475002f7..0000000000
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/PEMCertificate.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.appsmith.external.models;
-
-import com.appsmith.external.annotations.encryption.Encrypted;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
-
-@Getter
-@Setter
-@ToString
-@EqualsAndHashCode
-@NoArgsConstructor
-@AllArgsConstructor
-public class PEMCertificate implements AppsmithDomain {
-
-    UploadedFile file;
-
-    @Encrypted @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
-    String password;
-}
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/SSLDetails.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/SSLDetails.java
index 517090df0b..8e767d3cee 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/SSLDetails.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/SSLDetails.java
@@ -6,7 +6,6 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
-import org.springframework.data.mongodb.core.mapping.Document;
 
 @Getter
 @Setter
@@ -14,7 +13,6 @@ import org.springframework.data.mongodb.core.mapping.Document;
 @EqualsAndHashCode
 @AllArgsConstructor
 @NoArgsConstructor
-@Document
 public class SSLDetails implements AppsmithDomain {
 
     public enum AuthType {
@@ -73,8 +71,4 @@ public class SSLDetails implements AppsmithDomain {
     UploadedFile clientKeyCertificateFile;
 
     UploadedFile serverCACertificateFile;
-
-    Boolean usePemCertificate;
-
-    PEMCertificate pemCertificate;
 }
diff --git a/app/server/appsmith-plugins/graphqlPlugin/src/test/java/com/external/plugins/GraphQLPluginTest.java b/app/server/appsmith-plugins/graphqlPlugin/src/test/java/com/external/plugins/GraphQLPluginTest.java
index bc9b14b506..534a15845a 100644
--- a/app/server/appsmith-plugins/graphqlPlugin/src/test/java/com/external/plugins/GraphQLPluginTest.java
+++ b/app/server/appsmith-plugins/graphqlPlugin/src/test/java/com/external/plugins/GraphQLPluginTest.java
@@ -103,7 +103,7 @@ public class GraphQLPluginTest {
     @Container
     public static GenericContainer graphqlContainer = new GenericContainer(
                     CompletableFuture.completedFuture("appsmith/test-event-driver"))
-            .withExposedPorts(5000)
+            .withExposedPorts(4200)
             .waitingFor(Wait.forHttp("/").forStatusCode(200));
 
     @BeforeEach
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCEImpl.java
index 5d88908715..566de8ec21 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCEImpl.java
@@ -27,7 +27,6 @@ import com.appsmith.server.solutions.ApplicationPermission;
 import jakarta.validation.Validator;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
-import org.bson.types.ObjectId;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.util.CollectionUtils;
@@ -46,6 +45,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 import static com.appsmith.external.helpers.AppsmithBeanUtils.copyNewFieldValuesIntoOldObject;
@@ -132,7 +132,7 @@ public class ActionCollectionServiceCEImpl extends BaseService<ActionCollectionR
 
     protected void setGitSyncIdInActionCollection(ActionCollection collection) {
         if (collection.getGitSyncId() == null) {
-            collection.setGitSyncId(collection.getApplicationId() + "_" + new ObjectId());
+            collection.setGitSyncId(collection.getApplicationId() + "_" + UUID.randomUUID());
         }
     }
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/clonepage/ActionCollectionClonePageServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/clonepage/ActionCollectionClonePageServiceCEImpl.java
index bf1ec312a2..b6e6b6d718 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/clonepage/ActionCollectionClonePageServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/clonepage/ActionCollectionClonePageServiceCEImpl.java
@@ -8,7 +8,6 @@ import com.appsmith.server.dtos.ActionCollectionDTO;
 import com.appsmith.server.dtos.ClonePageMetaDTO;
 import com.appsmith.server.newactions.base.NewActionService;
 import lombok.RequiredArgsConstructor;
-import org.bson.types.ObjectId;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 import reactor.core.publisher.Flux;
@@ -16,6 +15,7 @@ import reactor.core.publisher.Mono;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 
 import static com.appsmith.external.helpers.AppsmithBeanUtils.copyNestedNonNullProperties;
 
@@ -106,7 +106,7 @@ public class ActionCollectionClonePageServiceCEImpl implements ClonePageServiceC
                     toBeClonedActionCollection.getDefaultResources().setPageId(null);
                     // Assign new gitSyncId for cloned actionCollection
                     toBeClonedActionCollection.setGitSyncId(
-                            toBeClonedActionCollection.getApplicationId() + "_" + new ObjectId());
+                            toBeClonedActionCollection.getApplicationId() + "_" + UUID.randomUUID());
                     return actionCollectionService
                             .create(toBeClonedActionCollection)
                             .flatMap(clonedActionCollection -> {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/importable/applications/ActionCollectionApplicationImportableServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/importable/applications/ActionCollectionApplicationImportableServiceCEImpl.java
index 29fb6422ae..b82d86cdb3 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/importable/applications/ActionCollectionApplicationImportableServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/importable/applications/ActionCollectionApplicationImportableServiceCEImpl.java
@@ -19,7 +19,6 @@ import com.appsmith.server.imports.importable.artifactbased.ArtifactBasedImporta
 import com.appsmith.server.repositories.ActionCollectionRepository;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
-import org.bson.types.ObjectId;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 
@@ -27,6 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.UUID;
 
 @RequiredArgsConstructor
 @Service
@@ -147,7 +147,7 @@ public class ActionCollectionApplicationImportableServiceCEImpl
 
         // generate gitSyncId if it's not present
         if (actionCollection.getGitSyncId() == null) {
-            actionCollection.setGitSyncId(actionCollection.getApplicationId() + "_" + new ObjectId());
+            actionCollection.setGitSyncId(actionCollection.getApplicationId() + "_" + UUID.randomUUID());
         }
     }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtils.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtils.java
deleted file mode 100644
index 6c51ca040d..0000000000
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtils.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.appsmith.server.applications.git;
-
-import com.appsmith.external.models.ApplicationGitReference;
-import com.appsmith.server.actioncollections.base.ActionCollectionService;
-import com.appsmith.server.helpers.ArtifactGitFileUtils;
-import com.appsmith.server.newactions.base.NewActionService;
-import org.springframework.stereotype.Component;
-
-@Component
-public class ApplicationGitFileUtils extends ApplicationGitFileUtilsCE
-        implements ArtifactGitFileUtils<ApplicationGitReference> {
-
-    public ApplicationGitFileUtils(NewActionService newActionService, ActionCollectionService actionCollectionService) {
-        super(newActionService, actionCollectionService);
-    }
-}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtilsCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtilsCEImpl.java
similarity index 58%
rename from app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtilsCE.java
rename to app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtilsCEImpl.java
index 034ac9503b..22d4a795fb 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtilsCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtilsCEImpl.java
@@ -1,33 +1,56 @@
 package com.appsmith.server.applications.git;
 
+import com.appsmith.external.git.FileInterface;
+import com.appsmith.external.models.ActionDTO;
 import com.appsmith.external.models.ApplicationGitReference;
 import com.appsmith.external.models.ArtifactGitReference;
+import com.appsmith.external.models.DatasourceStorage;
 import com.appsmith.external.models.PluginType;
+import com.appsmith.git.files.FileUtilsImpl;
 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.domains.ApplicationPage;
+import com.appsmith.server.domains.CustomJSLib;
 import com.appsmith.server.domains.NewAction;
 import com.appsmith.server.domains.NewPage;
+import com.appsmith.server.domains.Theme;
+import com.appsmith.server.dtos.ActionCollectionDTO;
 import com.appsmith.server.dtos.ApplicationJson;
 import com.appsmith.server.dtos.ArtifactExchangeJson;
+import com.appsmith.server.dtos.PageDTO;
+import com.appsmith.server.exceptions.AppsmithError;
+import com.appsmith.server.exceptions.AppsmithException;
+import com.appsmith.server.helpers.CollectionUtils;
 import com.appsmith.server.helpers.ce.ArtifactGitFileUtilsCE;
 import com.appsmith.server.newactions.base.NewActionService;
 import com.google.gson.Gson;
 import lombok.RequiredArgsConstructor;
+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.collections.PredicateUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.context.annotation.Import;
 import org.springframework.stereotype.Component;
+import reactor.core.publisher.Mono;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static com.appsmith.external.git.constants.GitConstants.NAME_SEPARATOR;
+import static com.appsmith.external.helpers.AppsmithBeanUtils.copyNestedNonNullProperties;
 import static com.appsmith.external.helpers.AppsmithBeanUtils.copyProperties;
 import static com.appsmith.server.constants.ce.FieldNameCE.ACTION_COLLECTION_LIST;
 import static com.appsmith.server.constants.ce.FieldNameCE.ACTION_LIST;
@@ -39,11 +62,15 @@ import static com.appsmith.server.constants.ce.FieldNameCE.EXPORTED_APPLICATION;
 import static com.appsmith.server.constants.ce.FieldNameCE.PAGE_LIST;
 import static com.appsmith.server.helpers.ce.CommonGitFileUtilsCE.removeUnwantedFieldsFromBaseDomain;
 
+@Slf4j
 @Component
 @RequiredArgsConstructor
-public class ApplicationGitFileUtilsCE implements ArtifactGitFileUtilsCE<ApplicationGitReference> {
+@Import({FileUtilsImpl.class})
+public class ApplicationGitFileUtilsCEImpl implements ArtifactGitFileUtilsCE<ApplicationGitReference> {
 
+    private final Gson gson;
     private final NewActionService newActionService;
+    private final FileInterface fileUtils;
     private final ActionCollectionService actionCollectionService;
 
     // Only include the application helper fields in metadata object
@@ -79,6 +106,7 @@ public class ApplicationGitFileUtilsCE implements ArtifactGitFileUtilsCE<Applica
         ApplicationGitReference applicationReference = (ApplicationGitReference) artifactGitReference;
 
         setApplicationInApplicationReference(applicationJson, applicationReference);
+
         setThemesInApplicationReference(applicationJson, applicationReference);
 
         setApplicationMetadataInApplicationReference(applicationJson, applicationReference);
@@ -322,4 +350,202 @@ public class ApplicationGitFileUtilsCE implements ArtifactGitFileUtilsCE<Applica
         actionCollection.getUnpublishedCollection().sanitiseForExport();
         removeUnwantedFieldsFromBaseDomain(actionCollection);
     }
+
+    // reconstruct applicationJson
+
+    @Override
+    public Mono<ArtifactExchangeJson> reconstructArtifactExchangeJsonFromFilesInRepository(
+            String workspaceId, String defaultArtifactId, String repoName, String branchName) {
+        Mono<ApplicationGitReference> appReferenceMono = fileUtils.reconstructApplicationReferenceFromGitRepo(
+                workspaceId, defaultArtifactId, repoName, branchName);
+        return appReferenceMono.map(applicationReference -> {
+            // Extract application metadata from the json
+            ApplicationJson metadata =
+                    getApplicationResource(applicationReference.getMetadata(), ApplicationJson.class);
+            ApplicationJson applicationJson = getApplicationJsonFromGitReference(applicationReference);
+            copyNestedNonNullProperties(metadata, applicationJson);
+            return applicationJson;
+        });
+    }
+
+    public <T> T getApplicationResource(Object resource, Type type) {
+        if (resource == null) {
+            return null;
+        }
+        return gson.fromJson(gson.toJson(resource), type);
+    }
+
+    protected ApplicationJson getApplicationJsonFromGitReference(ApplicationGitReference applicationReference) {
+        ApplicationJson applicationJson = new ApplicationJson();
+
+        setApplicationInApplicationJson(applicationReference, applicationJson);
+
+        setThemesInApplicationJson(applicationReference, applicationJson);
+
+        setCustomJsLibsInApplicationJson(applicationReference, applicationJson);
+
+        setNewPagesInApplicationJson(applicationReference, applicationJson);
+
+        setNewActionsInApplicationJson(applicationReference, applicationJson);
+
+        setActionCollectionsInApplicationJson(applicationReference, applicationJson);
+
+        setDatasourcesInApplicationJson(applicationReference, applicationJson);
+
+        return applicationJson;
+    }
+
+    private void setApplicationInApplicationJson(
+            ApplicationGitReference applicationReference, ApplicationJson applicationJson) {
+        // Extract application data from the json
+        Application application = getApplicationResource(applicationReference.getApplication(), Application.class);
+        applicationJson.setExportedApplication(application);
+
+        if (application != null && !CollectionUtils.isNullOrEmpty(application.getPages())) {
+            // Remove null values
+            org.apache.commons.collections.CollectionUtils.filter(
+                    application.getPages(), PredicateUtils.notNullPredicate());
+            // Create a deep clone of application pages to update independently
+            application.setViewMode(false);
+            final List<ApplicationPage> applicationPages =
+                    new ArrayList<>(application.getPages().size());
+            application
+                    .getPages()
+                    .forEach(applicationPage ->
+                            applicationPages.add(gson.fromJson(gson.toJson(applicationPage), ApplicationPage.class)));
+            application.setPublishedPages(applicationPages);
+        }
+    }
+
+    private void setThemesInApplicationJson(
+            ApplicationGitReference applicationReference, ApplicationJson applicationJson) {
+        applicationJson.setEditModeTheme(getApplicationResource(applicationReference.getTheme(), Theme.class));
+        // Clone the edit mode theme to published theme as both should be same for git connected application because we
+        // do deploy and push as a single operation
+        applicationJson.setPublishedTheme(applicationJson.getEditModeTheme());
+    }
+
+    private void setDatasourcesInApplicationJson(
+            ApplicationGitReference applicationReference, ApplicationJson applicationJson) {
+        // Extract datasources
+        applicationJson.setDatasourceList(
+                getApplicationResource(applicationReference.getDatasources(), DatasourceStorage.class));
+    }
+
+    private void setActionCollectionsInApplicationJson(
+            ApplicationGitReference applicationReference, ApplicationJson applicationJson) {
+        // Extract actionCollection
+        if (CollectionUtils.isNullOrEmpty(applicationReference.getActionCollections())) {
+            applicationJson.setActionCollectionList(new ArrayList<>());
+        } else {
+            Map<String, String> actionCollectionBody = applicationReference.getActionCollectionBody();
+            List<ActionCollection> actionCollections =
+                    getApplicationResource(applicationReference.getActionCollections(), ActionCollection.class);
+            // Remove null values if present
+            org.apache.commons.collections.CollectionUtils.filter(actionCollections, PredicateUtils.notNullPredicate());
+            actionCollections.forEach(actionCollection -> {
+                // Set the js object body to the unpublished collection
+                // Since file version v3 we are splitting the js object code and metadata separately
+                String keyName = actionCollection.getUnpublishedCollection().getName()
+                        + actionCollection.getUnpublishedCollection().getPageId();
+                if (actionCollectionBody != null && actionCollectionBody.containsKey(keyName)) {
+                    actionCollection.getUnpublishedCollection().setBody(actionCollectionBody.get(keyName));
+                }
+                // As we are publishing the app and then committing to git we expect the published and unpublished
+                // actionCollectionDTO will be same, so we create a deep copy for the published version for
+                // actionCollection from unpublishedActionCollectionDTO
+                actionCollection.setPublishedCollection(gson.fromJson(
+                        gson.toJson(actionCollection.getUnpublishedCollection()), ActionCollectionDTO.class));
+            });
+            applicationJson.setActionCollectionList(actionCollections);
+        }
+    }
+
+    private void setNewActionsInApplicationJson(
+            ApplicationGitReference applicationReference, ApplicationJson applicationJson) {
+        // Extract actions
+        if (CollectionUtils.isNullOrEmpty(applicationReference.getActions())) {
+            applicationJson.setActionList(new ArrayList<>());
+        } else {
+            Map<String, String> actionBody = applicationReference.getActionBody();
+            List<NewAction> actions = getApplicationResource(applicationReference.getActions(), NewAction.class);
+            // Remove null values if present
+            org.apache.commons.collections.CollectionUtils.filter(actions, PredicateUtils.notNullPredicate());
+            actions.forEach(newAction -> {
+                // With the file version v4 we have split the actions and metadata separately into two files
+                // So we need to set the body to the unpublished action
+                String keyName = newAction.getUnpublishedAction().getName()
+                        + newAction.getUnpublishedAction().getPageId();
+                if (actionBody != null
+                        && (actionBody.containsKey(keyName))
+                        && !StringUtils.isEmpty(actionBody.get(keyName))) {
+                    // For REMOTE plugin like Twilio the user actions are stored in key value pairs and hence they need
+                    // to be
+                    // deserialized separately unlike the body which is stored as string in the db.
+                    if (newAction.getPluginType().toString().equals("REMOTE")) {
+                        Map<String, Object> formData = gson.fromJson(actionBody.get(keyName), Map.class);
+                        newAction
+                                .getUnpublishedAction()
+                                .getActionConfiguration()
+                                .setFormData(formData);
+                    } else {
+                        newAction
+                                .getUnpublishedAction()
+                                .getActionConfiguration()
+                                .setBody(actionBody.get(keyName));
+                    }
+                }
+                // As we are publishing the app and then committing to git we expect the published and unpublished
+                // actionDTO will be same, so we create a deep copy for the published version for action from
+                // unpublishedActionDTO
+                newAction.setPublishedAction(
+                        gson.fromJson(gson.toJson(newAction.getUnpublishedAction()), ActionDTO.class));
+            });
+            applicationJson.setActionList(actions);
+        }
+    }
+
+    private void setCustomJsLibsInApplicationJson(
+            ApplicationGitReference applicationReference, ApplicationJson applicationJson) {
+        List<CustomJSLib> customJSLibList =
+                getApplicationResource(applicationReference.getJsLibraries(), CustomJSLib.class);
+
+        // remove the duplicate js libraries if there is any
+        List<CustomJSLib> customJSLibListWithoutDuplicates = new ArrayList<>(new HashSet<>(customJSLibList));
+
+        applicationJson.setCustomJSLibList(customJSLibListWithoutDuplicates);
+    }
+
+    private void setNewPagesInApplicationJson(
+            ApplicationGitReference applicationReference, ApplicationJson applicationJson) {
+        // Extract pages
+        List<NewPage> pages = getApplicationResource(applicationReference.getPages(), NewPage.class);
+        // Remove null values
+        org.apache.commons.collections.CollectionUtils.filter(pages, PredicateUtils.notNullPredicate());
+        // Set the DSL to page object before saving
+        Map<String, String> pageDsl = applicationReference.getPageDsl();
+        pages.forEach(page -> {
+            JSONParser jsonParser = new JSONParser();
+            try {
+                if (pageDsl != null && pageDsl.get(page.getUnpublishedPage().getName()) != null) {
+                    page.getUnpublishedPage().getLayouts().get(0).setDsl((JSONObject) jsonParser.parse(
+                            pageDsl.get(page.getUnpublishedPage().getName())));
+                }
+            } catch (ParseException e) {
+                log.error(
+                        "Error parsing the page dsl for page: {}",
+                        page.getUnpublishedPage().getName(),
+                        e);
+                throw new AppsmithException(
+                        AppsmithError.JSON_PROCESSING_ERROR,
+                        page.getUnpublishedPage().getName());
+            }
+        });
+        pages.forEach(newPage -> {
+            // As we are publishing the app and then committing to git we expect the published and unpublished PageDTO
+            // will be same, so we create a deep copy for the published version for page from the unpublishedPageDTO
+            newPage.setPublishedPage(gson.fromJson(gson.toJson(newPage.getUnpublishedPage()), PageDTO.class));
+        });
+        applicationJson.setPageList(pages);
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtilsImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtilsImpl.java
new file mode 100644
index 0000000000..6f0ed1ed36
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtilsImpl.java
@@ -0,0 +1,22 @@
+package com.appsmith.server.applications.git;
+
+import com.appsmith.external.git.FileInterface;
+import com.appsmith.external.models.ApplicationGitReference;
+import com.appsmith.server.actioncollections.base.ActionCollectionService;
+import com.appsmith.server.helpers.ArtifactGitFileUtils;
+import com.appsmith.server.newactions.base.NewActionService;
+import com.google.gson.Gson;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ApplicationGitFileUtilsImpl extends ApplicationGitFileUtilsCEImpl
+        implements ArtifactGitFileUtils<ApplicationGitReference> {
+
+    public ApplicationGitFileUtilsImpl(
+            Gson gson,
+            NewActionService newActionService,
+            FileInterface fileUtils,
+            ActionCollectionService actionCollectionService) {
+        super(gson, newActionService, fileUtils, actionCollectionService);
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/GitApplicationHelperCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/GitApplicationHelperCEImpl.java
index 96437bdee2..c5fe579186 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/GitApplicationHelperCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/applications/git/GitApplicationHelperCEImpl.java
@@ -8,8 +8,10 @@ import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.domains.ActionCollection;
 import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.Artifact;
+import com.appsmith.server.domains.GitArtifactMetadata;
 import com.appsmith.server.domains.NewAction;
 import com.appsmith.server.domains.NewPage;
+import com.appsmith.server.dtos.GitAuthDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.CollectionUtils;
@@ -33,6 +35,7 @@ import reactor.core.publisher.Mono;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -55,6 +58,11 @@ public class GitApplicationHelperCEImpl implements GitArtifactHelperCE<Applicati
     private final NewActionService newActionService;
     private final ResponseUtils responseUtils;
 
+    @Override
+    public AclPermission getArtifactReadPermission() {
+        return applicationPermission.getReadPermission();
+    }
+
     @Override
     public AclPermission getArtifactEditPermission() {
         return applicationPermission.getEditPermission();
@@ -65,6 +73,21 @@ public class GitApplicationHelperCEImpl implements GitArtifactHelperCE<Applicati
         return applicationPermission.getGitConnectPermission();
     }
 
+    @Override
+    public AclPermission getArtifactAutoCommitPermission() {
+        return applicationPermission.getManageAutoCommitPermission();
+    }
+
+    @Override
+    public AclPermission getArtifactManageProtectedBranchPermission() {
+        return applicationPermission.getManageProtectedBranchPermission();
+    }
+
+    @Override
+    public AclPermission getArtifactManageDefaultBranchPermission() {
+        return applicationPermission.getManageDefaultBranchPermission();
+    }
+
     @Override
     public Mono<Application> getArtifactById(String applicationId, AclPermission aclPermission) {
         return applicationService
@@ -73,12 +96,42 @@ public class GitApplicationHelperCEImpl implements GitArtifactHelperCE<Applicati
                         AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.APPLICATION, applicationId)));
     }
 
+    @Override
+    public Flux<Application> getAllArtifactByDefaultId(String defaultArtifactId, AclPermission aclPermission) {
+        return applicationService.findAllApplicationsByDefaultApplicationId(defaultArtifactId, aclPermission);
+    }
+
     @Override
     public Mono<Application> getArtifactByDefaultIdAndBranchName(
             String defaultArtifactId, String branchName, AclPermission aclPermission) {
         return applicationService.findByBranchNameAndDefaultApplicationId(branchName, defaultArtifactId, aclPermission);
     }
 
+    @Override
+    public Mono<GitAuthDTO> getSshKeys(String defaultArtifactId) {
+        return applicationService.getSshKey(defaultArtifactId);
+    }
+
+    @Override
+    public Mono<Application> createNewArtifactForCheckout(Artifact sourceArtifact, String branchName) {
+        GitArtifactMetadata sourceBranchGitData = sourceArtifact.getGitArtifactMetadata();
+        sourceBranchGitData.setBranchName(branchName);
+        sourceBranchGitData.setIsRepoPrivate(null);
+        // Save new artifact in DB and update from the parent branch application
+        sourceBranchGitData.setGitAuth(null);
+        sourceBranchGitData.setLastCommittedAt(Instant.now());
+
+        Application sourceApplication = (Application) sourceArtifact;
+        sourceApplication.setId(null);
+        sourceApplication.setPages(null);
+        sourceApplication.setPublishedPages(null);
+        sourceApplication.setEditModeThemeId(null);
+        sourceApplication.setPublishedModeThemeId(null);
+        sourceApplication.setGitApplicationMetadata(sourceBranchGitData);
+
+        return applicationService.save(sourceApplication);
+    }
+
     @Override
     public Mono<Application> saveArtifact(Artifact artifact) {
         return applicationService.save((Application) artifact);
@@ -99,6 +152,11 @@ public class GitApplicationHelperCEImpl implements GitArtifactHelperCE<Applicati
         return applicationService.update(artifact.getId(), update);
     }
 
+    @Override
+    public Mono<Void> updateArtifactWithProtectedBranches(String defaultArtifactId, List<String> branchNames) {
+        return applicationService.updateProtectedBranches(defaultArtifactId, branchNames);
+    }
+
     @Override
     public Path getRepoSuffixPath(String workspaceId, String artifactId, String repoName, @NonNull String... args) {
         List<String> varargs = new ArrayList<>(List.of(artifactId, repoName));
@@ -166,6 +224,11 @@ public class GitApplicationHelperCEImpl implements GitArtifactHelperCE<Applicati
                 .flatMap(applicationPageService::deleteApplicationByResource);
     }
 
+    @Override
+    public Mono<Application> deleteArtifactByResource(Artifact artifact) {
+        return applicationPageService.deleteApplicationByResource((Application) artifact);
+    }
+
     /**
      *  Setting all the pages' default resources ids to itself in application object
      * @param defaultArtifact default version of Application which was tried to connect to git
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 e20dee1aae..d241581c35 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
@@ -6,7 +6,6 @@ import com.appsmith.server.applications.base.ApplicationService;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.constants.Url;
 import com.appsmith.server.domains.Application;
-import com.appsmith.server.domains.ApplicationSnapshot;
 import com.appsmith.server.domains.GitAuth;
 import com.appsmith.server.domains.Theme;
 import com.appsmith.server.dtos.ApplicationAccessDTO;
@@ -28,6 +27,7 @@ import com.appsmith.server.exports.internal.partial.PartialExportService;
 import com.appsmith.server.fork.internal.ApplicationForkingService;
 import com.appsmith.server.imports.internal.ImportService;
 import com.appsmith.server.imports.internal.partial.PartialImportService;
+import com.appsmith.server.projections.ApplicationSnapshotResponseDTO;
 import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.ApplicationSnapshotService;
 import com.appsmith.server.solutions.ApplicationFetcher;
@@ -232,7 +232,7 @@ public class ApplicationControllerCE {
 
     @JsonView(Views.Public.class)
     @GetMapping("/snapshot/{id}")
-    public Mono<ResponseDTO<ApplicationSnapshot>> getSnapshotWithoutApplicationJson(
+    public Mono<ResponseDTO<ApplicationSnapshotResponseDTO>> getSnapshotWithoutApplicationJson(
             @PathVariable String id, @RequestHeader(name = FieldName.BRANCH_NAME, required = false) String branchName) {
         log.debug("Going to get snapshot with application id: {}, branch: {}", id, branchName);
 
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 a16c31cb0b..a40f17d7b3 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
@@ -8,6 +8,7 @@ import com.appsmith.server.dtos.ApplicationPagesDTO;
 import com.appsmith.server.dtos.CRUDPageResourceDTO;
 import com.appsmith.server.dtos.CRUDPageResponseDTO;
 import com.appsmith.server.dtos.PageDTO;
+import com.appsmith.server.dtos.PageUpdateDTO;
 import com.appsmith.server.dtos.ResponseDTO;
 import com.appsmith.server.newpages.base.NewPageService;
 import com.appsmith.server.services.ApplicationPageService;
@@ -166,7 +167,7 @@ public class PageControllerCE {
     @PutMapping("/{defaultPageId}")
     public Mono<ResponseDTO<PageDTO>> updatePage(
             @PathVariable String defaultPageId,
-            @RequestBody PageDTO resource,
+            @RequestBody @Valid PageUpdateDTO resource,
             @RequestHeader(name = FieldName.BRANCH_NAME, required = false) String branchName) {
         log.debug("Going to update page with id: {}, branchName: {}", defaultPageId, branchName);
         return newPageService
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 1678b7aca3..91cc1e08a6 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
@@ -37,7 +37,6 @@ import com.appsmith.server.solutions.EnvironmentPermission;
 import com.appsmith.server.solutions.WorkspacePermission;
 import jakarta.validation.constraints.NotNull;
 import lombok.extern.slf4j.Slf4j;
-import org.bson.types.ObjectId;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.MultiValueMap;
@@ -58,6 +57,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.UUID;
 
 import static com.appsmith.external.helpers.AppsmithBeanUtils.copyNestedNonNullProperties;
 import static com.appsmith.server.helpers.CollectionUtils.isNullOrEmpty;
@@ -153,7 +153,7 @@ public class DatasourceServiceCEImpl implements DatasourceServiceCE {
             return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.PLUGIN_ID));
         }
         if (!hasText(datasource.getGitSyncId())) {
-            datasource.setGitSyncId(datasource.getWorkspaceId() + "_" + new ObjectId());
+            datasource.setGitSyncId(datasource.getWorkspaceId() + "_" + UUID.randomUUID());
         }
 
         if (isNullOrEmpty(datasource.getDatasourceStorages())) {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/GitDeployKeys.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/GitDeployKeys.java
index e3dad3c554..8ae37aaa99 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/GitDeployKeys.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/GitDeployKeys.java
@@ -3,9 +3,11 @@ package com.appsmith.server.domains;
 import com.appsmith.external.models.BaseDomain;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.data.mongodb.core.mapping.Document;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
+@Document
 public class GitDeployKeys extends BaseDomain {
     String email;
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/GitPullDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/GitPullDTO.java
index 834716dd1a..681f44013d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/GitPullDTO.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/GitPullDTO.java
@@ -1,7 +1,7 @@
 package com.appsmith.server.dtos;
 
 import com.appsmith.external.dtos.MergeStatusDTO;
-import com.appsmith.server.domains.Application;
+import com.appsmith.server.domains.Artifact;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -9,7 +9,7 @@ import lombok.Setter;
 @Setter
 public class GitPullDTO {
 
-    Application application;
+    Artifact artifact;
 
     MergeStatusDTO mergeStatus;
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/PageUpdateDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/PageUpdateDTO.java
new file mode 100644
index 0000000000..575ceecb74
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/PageUpdateDTO.java
@@ -0,0 +1,20 @@
+package com.appsmith.server.dtos;
+
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+
+public record PageUpdateDTO(
+        @Pattern(regexp = "[^/\\\\:]+", message = "/, \\, : not allowed in page names") @Size(max = 30) String name,
+        @Pattern(regexp = "[-a-z]+") @Size(max = 20) String icon,
+        @Pattern(regexp = "[-\\w]*") String customSlug,
+        Boolean isHidden) {
+
+    public PageDTO toPageDTO() {
+        final PageDTO page = new PageDTO();
+        page.setName(name);
+        page.setIcon(icon);
+        page.setCustomSlug(customSlug);
+        page.setIsHidden(isHidden);
+        return page;
+    }
+}
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 8fe59a846e..86698013b2 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
@@ -12,6 +12,14 @@ import java.text.MessageFormat;
 public enum AppsmithError {
     // Ref syntax for message templates:
     // https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/text/MessageFormat.html
+    HTTP_METHOD_NOT_ALLOWED(
+            405,
+            AppsmithErrorCode.HTTP_METHOD_NOT_ALLOWED.getCode(),
+            "HTTP Method not allowed.",
+            AppsmithErrorAction.DEFAULT,
+            "Invalid method",
+            ErrorType.BAD_REQUEST,
+            null),
     INVALID_PARAMETER(
             400,
             AppsmithErrorCode.INVALID_PARAMETER.getCode(),
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 b4e96785db..0ac4352e60 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
@@ -4,6 +4,7 @@ import lombok.Getter;
 
 @Getter
 public enum AppsmithErrorCode {
+    HTTP_METHOD_NOT_ALLOWED("AE-APP-4002", "HTTP method not allowed"),
     INVALID_ACTION_COLLECTION("AE-ACC-4038", "Invalid action collection"),
     UNAUTHORIZED_ACCESS("AE-ACL-4003", "Unauthorized access"),
     ACL_NO_RESOURCE_FOUND("AE-ACL-4004", "Acl no resource found"),
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/GlobalExceptionHandler.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/GlobalExceptionHandler.java
index 4c6d545431..d20892daba 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/GlobalExceptionHandler.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/GlobalExceptionHandler.java
@@ -17,6 +17,7 @@ import io.micrometer.core.instrument.util.StringUtils;
 import io.sentry.Sentry;
 import io.sentry.SentryLevel;
 import io.sentry.protocol.User;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.jgit.api.errors.JGitInternalException;
 import org.eclipse.jgit.errors.LockFailedException;
@@ -28,6 +29,7 @@ import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.support.WebExchangeBindException;
+import org.springframework.web.server.MethodNotAllowedException;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.ServerWebInputException;
 import reactor.core.publisher.Mono;
@@ -44,6 +46,7 @@ import java.util.Map;
  * sending it to the client.
  */
 @ControllerAdvice
+@RequiredArgsConstructor
 @Slf4j
 public class GlobalExceptionHandler {
 
@@ -55,17 +58,6 @@ public class GlobalExceptionHandler {
 
     private final SessionUserService sessionUserService;
 
-    public GlobalExceptionHandler(
-            RedisUtils redisUtils,
-            AnalyticsService analyticsService,
-            GitFileUtils fileUtils,
-            SessionUserService sessionUserService) {
-        this.redisUtils = redisUtils;
-        this.analyticsService = analyticsService;
-        this.fileUtils = fileUtils;
-        this.sessionUserService = sessionUserService;
-    }
-
     private void doLog(Throwable error) {
         if (error instanceof BaseException baseException && baseException.isHideStackTraceInLogs()) {
             log.error(baseException.getClass().getSimpleName() + ": " + baseException.getMessage());
@@ -284,6 +276,25 @@ public class GlobalExceptionHandler {
         return getResponseDTOMono(urlPath, response);
     }
 
+    @ExceptionHandler
+    @ResponseBody
+    public Mono<ResponseDTO<ErrorDTO>> catchMethodNotAllowed(MethodNotAllowedException e, ServerWebExchange exchange) {
+        AppsmithError appsmithError = AppsmithError.HTTP_METHOD_NOT_ALLOWED;
+
+        exchange.getResponse().setStatusCode(HttpStatus.resolve(appsmithError.getHttpErrorCode()));
+
+        String urlPath = exchange.getRequest().getPath().toString();
+        ResponseDTO<ErrorDTO> response = new ResponseDTO<>(
+                appsmithError.getHttpErrorCode(),
+                new ErrorDTO(
+                        appsmithError.getAppErrorCode(),
+                        appsmithError.getErrorType(),
+                        appsmithError.getMessage(e.getMessage()),
+                        appsmithError.getTitle()));
+
+        return getResponseDTOMono(urlPath, response);
+    }
+
     /**
      * This function catches the generic Exception class and is meant to be a catch all to ensure that we don't leak
      * any information to the client. Ideally, the function #catchAppsmithException should be used
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 837ac01723..f45f07f8b5 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
@@ -693,11 +693,23 @@ public class ApplicationForkingServiceCEImpl implements ApplicationForkingServic
 
             // Normal Application forking with developer/edit access
             Flux<BaseDomain> pageFlux = applicationMono.flatMapMany(application -> newPageRepository
-                    .findAllByApplicationIdsWithoutPermission(List.of(application.getId()), List.of("id", "policies"))
+                    .findIdsAndPoliciesByApplicationIdIn(List.of(application.getId()))
+                    .map(idPoliciesOnly -> {
+                        NewPage newPage = new NewPage();
+                        newPage.setId(idPoliciesOnly.id());
+                        newPage.setPolicies(idPoliciesOnly.policies());
+                        return newPage;
+                    })
                     .flatMap(newPageRepository::setUserPermissionsInObject));
 
             Flux<BaseDomain> actionFlux = applicationMono.flatMapMany(application -> newActionRepository
-                    .findAllByApplicationIdsWithoutPermission(List.of(application.getId()), List.of("id", "policies"))
+                    .findIdsAndPoliciesByApplicationIdIn(List.of(application.getId()))
+                    .map(idPoliciesOnly -> {
+                        NewAction newAction = new NewAction();
+                        newAction.setId(idPoliciesOnly.id());
+                        newAction.setPolicies(idPoliciesOnly.policies());
+                        return newAction;
+                    })
                     .flatMap(newActionRepository::setUserPermissionsInObject));
 
             Flux<BaseDomain> actionCollectionFlux =
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/CommonGitFileUtils.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/CommonGitFileUtils.java
index 916f54ea0c..d9710bd520 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/CommonGitFileUtils.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/CommonGitFileUtils.java
@@ -2,7 +2,7 @@ package com.appsmith.server.helpers;
 
 import com.appsmith.external.git.FileInterface;
 import com.appsmith.git.files.FileUtilsImpl;
-import com.appsmith.server.applications.git.ApplicationGitFileUtils;
+import com.appsmith.server.applications.git.ApplicationGitFileUtilsImpl;
 import com.appsmith.server.helpers.ce.CommonGitFileUtilsCE;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.SessionUserService;
@@ -17,7 +17,7 @@ import org.springframework.stereotype.Component;
 public class CommonGitFileUtils extends CommonGitFileUtilsCE {
 
     public CommonGitFileUtils(
-            ApplicationGitFileUtils applicationGitFileUtils,
+            ApplicationGitFileUtilsImpl applicationGitFileUtils,
             FileInterface fileUtils,
             AnalyticsService analyticsService,
             SessionUserService sessionUserService,
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/TextUtils.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/TextUtils.java
index ae8b5105f6..b749eb1ee1 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/TextUtils.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/TextUtils.java
@@ -15,14 +15,14 @@ public class TextUtils {
      * NON_LATIN regex matches any letter that is not a ASCII i.e. A-Za-z0-9, `-` and `_`
      * It'll match the unicode letters.
      * */
-    private static final Pattern NON_LATIN = Pattern.compile("[^\\w_-]");
+    private static final Pattern NON_LATIN = Pattern.compile("[^\\w-]");
 
-    /*
-     * The SEPARATORS pattern matches those characters which cane be replaced with `-`
-     * This includes Punctuation characters, `&`, space and not `-` itself. Details on `Punct`
-     * http://www.gnu.org/software/grep/manual/html_node/Character-Classes-and-Bracket-Expressions.html
-     * */
-    private static final Pattern SEPARATORS = Pattern.compile("[\\s\\p{Punct}&&[^-]]");
+    /**
+     * The SEPARATORS pattern matches those characters which will be replaced with `-`. This includes spaces and
+     * punctuation characters.
+     * <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/regex/Pattern.html#posix">Details on {@code Punct}</a>.
+     */
+    private static final Pattern SEPARATORS = Pattern.compile("[\\s\\p{Punct}]+");
 
     /**
      * Creates URL safe text aka slug from the input text. It supports english locale only.
@@ -36,7 +36,8 @@ public class TextUtils {
         if (inputText == null) {
             return "";
         }
-        // remove all the separators with a `-`
+
+        // Replace all spaces and punctuation with a `-`.
         String noseparators = SEPARATORS.matcher(inputText).replaceAll("-");
         String normalized = Normalizer.normalize(noseparators, Normalizer.Form.NFD);
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/ArtifactGitFileUtilsCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/ArtifactGitFileUtilsCE.java
index cc46f8287e..7d0ace2220 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/ArtifactGitFileUtilsCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/ArtifactGitFileUtilsCE.java
@@ -2,6 +2,7 @@ package com.appsmith.server.helpers.ce;
 
 import com.appsmith.external.models.ArtifactGitReference;
 import com.appsmith.server.dtos.ArtifactExchangeJson;
+import reactor.core.publisher.Mono;
 
 import java.util.Map;
 
@@ -9,6 +10,9 @@ public interface ArtifactGitFileUtilsCE<T extends ArtifactGitReference> {
 
     T createArtifactReferenceObject();
 
+    Mono<ArtifactExchangeJson> reconstructArtifactExchangeJsonFromFilesInRepository(
+            String workspaceId, String defaultArtifactId, String repoName, String branchName);
+
     void addArtifactReferenceFromExportedJson(
             ArtifactExchangeJson artifactExchangeJson, ArtifactGitReference artifactGitReference);
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/CommonGitFileUtilsCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/CommonGitFileUtilsCE.java
index d92c1d2dcc..95ca98c8dd 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/CommonGitFileUtilsCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/CommonGitFileUtilsCE.java
@@ -3,7 +3,6 @@ package com.appsmith.server.helpers.ce;
 import com.appsmith.external.constants.AnalyticsEvents;
 import com.appsmith.external.git.FileInterface;
 import com.appsmith.external.helpers.Stopwatch;
-import com.appsmith.external.models.ActionDTO;
 import com.appsmith.external.models.ApplicationGitReference;
 import com.appsmith.external.models.ArtifactGitReference;
 import com.appsmith.external.models.BaseDomain;
@@ -12,21 +11,11 @@ import com.appsmith.git.constants.CommonConstants;
 import com.appsmith.git.files.FileUtilsImpl;
 import com.appsmith.server.constants.ArtifactType;
 import com.appsmith.server.constants.FieldName;
-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.NewAction;
-import com.appsmith.server.domains.NewPage;
-import com.appsmith.server.domains.Theme;
-import com.appsmith.server.dtos.ActionCollectionDTO;
 import com.appsmith.server.dtos.ApplicationJson;
 import com.appsmith.server.dtos.ArtifactExchangeJson;
-import com.appsmith.server.dtos.PageDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.ArtifactGitFileUtils;
-import com.appsmith.server.helpers.CollectionUtils;
 import com.appsmith.server.migrations.JsonSchemaVersions;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.SessionUserService;
@@ -35,11 +24,6 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import lombok.RequiredArgsConstructor;
 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.collections.PredicateUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Import;
@@ -48,16 +32,11 @@ import reactor.core.Exceptions;
 import reactor.core.publisher.Mono;
 
 import java.io.IOException;
-import java.lang.reflect.Type;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 
-import static com.appsmith.external.helpers.AppsmithBeanUtils.copyNestedNonNullProperties;
 import static com.appsmith.git.constants.CommonConstants.CLIENT_SCHEMA_VERSION;
 import static com.appsmith.git.constants.CommonConstants.FILE_FORMAT_VERSION;
 import static com.appsmith.git.constants.CommonConstants.SERVER_SCHEMA_VERSION;
@@ -118,8 +97,8 @@ public class CommonGitFileUtilsCE {
 
         /*
            1. Checkout to branch
-           2. Create application reference for appsmith-git module
-           3. Save application to git repo
+           2. Create artifact reference for appsmith-git module
+           3. Save artifact to git repo
         */
         // TODO: see if event needs to be generalised or kept specific
         Stopwatch stopwatch = new Stopwatch(AnalyticsEvents.GIT_SERIALIZE_APP_RESOURCES_TO_LOCAL_FILE.getEventName());
@@ -203,23 +182,31 @@ public class CommonGitFileUtilsCE {
     /**
      * Method to reconstruct the application from the local git repo
      *
-     * @param workspaceId          To which workspace application needs to be rehydrated
-     * @param defaultApplicationId Root application for the current branched application
-     * @param branchName           for which branch the application needs to rehydrate
+     * @param workspaceId       To which workspace application needs to be rehydrated
+     * @param defaultArtifactId Root application for the current branched application
+     * @param branchName        for which branch the application needs to rehydrate
+     * @param artifactType
      * @return application reference from which entire application can be rehydrated
      */
-    public Mono<ApplicationJson> reconstructApplicationJsonFromGitRepoWithAnalytics(
-            String workspaceId, String defaultApplicationId, String repoName, String branchName) {
-        Stopwatch stopwatch = new Stopwatch(AnalyticsEvents.GIT_DESERIALIZE_APP_RESOURCES_FROM_FILE.getEventName());
+    public Mono<ArtifactExchangeJson> reconstructArtifactExchangeJsonFromGitRepoWithAnalytics(
+            String workspaceId,
+            String defaultArtifactId,
+            String repoName,
+            String branchName,
+            ArtifactType artifactType) {
 
+        Stopwatch stopwatch = new Stopwatch(AnalyticsEvents.GIT_DESERIALIZE_APP_RESOURCES_FROM_FILE.getEventName());
+        ArtifactGitFileUtils<?> artifactGitFileUtils = getArtifactBasedFileHelper(artifactType);
+        Map<String, String> constantsMap = artifactGitFileUtils.getConstantsMap();
         return Mono.zip(
-                        reconstructApplicationJsonFromGitRepo(workspaceId, defaultApplicationId, repoName, branchName),
+                        reconstructArtifactExchangeJsonFromGitRepo(
+                                workspaceId, defaultArtifactId, repoName, branchName, artifactType),
                         sessionUserService.getCurrentUser())
                 .flatMap(tuple -> {
                     stopwatch.stopTimer();
                     final Map<String, Object> data = Map.of(
-                            FieldName.APPLICATION_ID,
-                            defaultApplicationId,
+                            constantsMap.get(FieldName.ID),
+                            defaultArtifactId,
                             FieldName.ORGANIZATION_ID,
                             workspaceId,
                             FieldName.FLOW_NAME,
@@ -235,37 +222,16 @@ public class CommonGitFileUtilsCE {
                 });
     }
 
-    public Mono<ApplicationJson> reconstructApplicationJsonFromGitRepo(
-            String workspaceId, String defaultApplicationId, String repoName, String branchName) {
+    public Mono<ArtifactExchangeJson> reconstructArtifactExchangeJsonFromGitRepo(
+            String workspaceId,
+            String defaultApplicationId,
+            String repoName,
+            String branchName,
+            ArtifactType artifactType) {
 
-        Mono<ApplicationGitReference> appReferenceMono = fileUtils.reconstructApplicationReferenceFromGitRepo(
+        ArtifactGitFileUtils<?> artifactGitFileUtils = getArtifactBasedFileHelper(artifactType);
+        return artifactGitFileUtils.reconstructArtifactExchangeJsonFromFilesInRepository(
                 workspaceId, defaultApplicationId, repoName, branchName);
-        return appReferenceMono.map(applicationReference -> {
-            // Extract application metadata from the json
-            ApplicationJson metadata =
-                    getApplicationResource(applicationReference.getMetadata(), ApplicationJson.class);
-            ApplicationJson applicationJson = getApplicationJsonFromGitReference(applicationReference);
-            copyNestedNonNullProperties(metadata, applicationJson);
-            return applicationJson;
-        });
-    }
-
-    protected <T> List<T> getApplicationResource(Map<String, Object> resources, Type type) {
-
-        List<T> deserializedResources = new ArrayList<>();
-        if (!CollectionUtils.isNullOrEmpty(resources)) {
-            for (Map.Entry<String, Object> resource : resources.entrySet()) {
-                deserializedResources.add(getApplicationResource(resource.getValue(), type));
-            }
-        }
-        return deserializedResources;
-    }
-
-    public <T> T getApplicationResource(Object resource, Type type) {
-        if (resource == null) {
-            return null;
-        }
-        return gson.fromJson(gson.toJson(resource), type);
     }
 
     /**
@@ -312,180 +278,6 @@ public class CommonGitFileUtilsCE {
         removeUnwantedFieldsFromBaseDomain(datasource);
     }
 
-    protected ApplicationJson getApplicationJsonFromGitReference(ApplicationGitReference applicationReference) {
-        ApplicationJson applicationJson = new ApplicationJson();
-
-        setApplicationInApplicationJson(applicationReference, applicationJson);
-
-        setThemesInApplicationJson(applicationReference, applicationJson);
-
-        setCustomJsLibsInApplicationJson(applicationReference, applicationJson);
-
-        setNewPagesInApplicationJson(applicationReference, applicationJson);
-
-        setNewActionsInApplicationJson(applicationReference, applicationJson);
-
-        setActionCollectionsInApplicationJson(applicationReference, applicationJson);
-
-        setDatasourcesInApplicationJson(applicationReference, applicationJson);
-
-        return applicationJson;
-    }
-
-    private void setApplicationInApplicationJson(
-            ApplicationGitReference applicationReference, ApplicationJson applicationJson) {
-        // Extract application data from the json
-        Application application = getApplicationResource(applicationReference.getApplication(), Application.class);
-        applicationJson.setExportedApplication(application);
-
-        if (application != null && !CollectionUtils.isNullOrEmpty(application.getPages())) {
-            // Remove null values
-            org.apache.commons.collections.CollectionUtils.filter(
-                    application.getPages(), PredicateUtils.notNullPredicate());
-            // Create a deep clone of application pages to update independently
-            application.setViewMode(false);
-            final List<ApplicationPage> applicationPages =
-                    new ArrayList<>(application.getPages().size());
-            application
-                    .getPages()
-                    .forEach(applicationPage ->
-                            applicationPages.add(gson.fromJson(gson.toJson(applicationPage), ApplicationPage.class)));
-            application.setPublishedPages(applicationPages);
-        }
-    }
-
-    private void setThemesInApplicationJson(
-            ApplicationGitReference applicationReference, ApplicationJson applicationJson) {
-        applicationJson.setEditModeTheme(getApplicationResource(applicationReference.getTheme(), Theme.class));
-        // Clone the edit mode theme to published theme as both should be same for git connected application because we
-        // do deploy and push as a single operation
-        applicationJson.setPublishedTheme(applicationJson.getEditModeTheme());
-    }
-
-    private void setDatasourcesInApplicationJson(
-            ApplicationGitReference applicationReference, ApplicationJson applicationJson) {
-        // Extract datasources
-        applicationJson.setDatasourceList(
-                getApplicationResource(applicationReference.getDatasources(), DatasourceStorage.class));
-    }
-
-    private void setActionCollectionsInApplicationJson(
-            ApplicationGitReference applicationReference, ApplicationJson applicationJson) {
-        // Extract actionCollection
-        if (CollectionUtils.isNullOrEmpty(applicationReference.getActionCollections())) {
-            applicationJson.setActionCollectionList(new ArrayList<>());
-        } else {
-            Map<String, String> actionCollectionBody = applicationReference.getActionCollectionBody();
-            List<ActionCollection> actionCollections =
-                    getApplicationResource(applicationReference.getActionCollections(), ActionCollection.class);
-            // Remove null values if present
-            org.apache.commons.collections.CollectionUtils.filter(actionCollections, PredicateUtils.notNullPredicate());
-            actionCollections.forEach(actionCollection -> {
-                // Set the js object body to the unpublished collection
-                // Since file version v3 we are splitting the js object code and metadata separately
-                String keyName = actionCollection.getUnpublishedCollection().getName()
-                        + actionCollection.getUnpublishedCollection().getPageId();
-                if (actionCollectionBody != null && actionCollectionBody.containsKey(keyName)) {
-                    actionCollection.getUnpublishedCollection().setBody(actionCollectionBody.get(keyName));
-                }
-                // As we are publishing the app and then committing to git we expect the published and unpublished
-                // actionCollectionDTO will be same, so we create a deep copy for the published version for
-                // actionCollection from unpublishedActionCollectionDTO
-                actionCollection.setPublishedCollection(gson.fromJson(
-                        gson.toJson(actionCollection.getUnpublishedCollection()), ActionCollectionDTO.class));
-            });
-            applicationJson.setActionCollectionList(actionCollections);
-        }
-    }
-
-    private void setNewActionsInApplicationJson(
-            ApplicationGitReference applicationReference, ApplicationJson applicationJson) {
-        // Extract actions
-        if (CollectionUtils.isNullOrEmpty(applicationReference.getActions())) {
-            applicationJson.setActionList(new ArrayList<>());
-        } else {
-            Map<String, String> actionBody = applicationReference.getActionBody();
-            List<NewAction> actions = getApplicationResource(applicationReference.getActions(), NewAction.class);
-            // Remove null values if present
-            org.apache.commons.collections.CollectionUtils.filter(actions, PredicateUtils.notNullPredicate());
-            actions.forEach(newAction -> {
-                // With the file version v4 we have split the actions and metadata separately into two files
-                // So we need to set the body to the unpublished action
-                String keyName = newAction.getUnpublishedAction().getName()
-                        + newAction.getUnpublishedAction().getPageId();
-                if (actionBody != null
-                        && (actionBody.containsKey(keyName))
-                        && !StringUtils.isEmpty(actionBody.get(keyName))) {
-                    // For REMOTE plugin like Twilio the user actions are stored in key value pairs and hence they need
-                    // to be
-                    // deserialized separately unlike the body which is stored as string in the db.
-                    if (newAction.getPluginType().toString().equals("REMOTE")) {
-                        Map<String, Object> formData = gson.fromJson(actionBody.get(keyName), Map.class);
-                        newAction
-                                .getUnpublishedAction()
-                                .getActionConfiguration()
-                                .setFormData(formData);
-                    } else {
-                        newAction
-                                .getUnpublishedAction()
-                                .getActionConfiguration()
-                                .setBody(actionBody.get(keyName));
-                    }
-                }
-                // As we are publishing the app and then committing to git we expect the published and unpublished
-                // actionDTO will be same, so we create a deep copy for the published version for action from
-                // unpublishedActionDTO
-                newAction.setPublishedAction(
-                        gson.fromJson(gson.toJson(newAction.getUnpublishedAction()), ActionDTO.class));
-            });
-            applicationJson.setActionList(actions);
-        }
-    }
-
-    private void setCustomJsLibsInApplicationJson(
-            ApplicationGitReference applicationReference, ApplicationJson applicationJson) {
-        List<CustomJSLib> customJSLibList =
-                getApplicationResource(applicationReference.getJsLibraries(), CustomJSLib.class);
-
-        // remove the duplicate js libraries if there is any
-        List<CustomJSLib> customJSLibListWithoutDuplicates = new ArrayList<>(new HashSet<>(customJSLibList));
-
-        applicationJson.setCustomJSLibList(customJSLibListWithoutDuplicates);
-    }
-
-    private void setNewPagesInApplicationJson(
-            ApplicationGitReference applicationReference, ApplicationJson applicationJson) {
-        // Extract pages
-        List<NewPage> pages = getApplicationResource(applicationReference.getPages(), NewPage.class);
-        // Remove null values
-        org.apache.commons.collections.CollectionUtils.filter(pages, PredicateUtils.notNullPredicate());
-        // Set the DSL to page object before saving
-        Map<String, String> pageDsl = applicationReference.getPageDsl();
-        pages.forEach(page -> {
-            JSONParser jsonParser = new JSONParser();
-            try {
-                if (pageDsl != null && pageDsl.get(page.getUnpublishedPage().getName()) != null) {
-                    page.getUnpublishedPage().getLayouts().get(0).setDsl((JSONObject) jsonParser.parse(
-                            pageDsl.get(page.getUnpublishedPage().getName())));
-                }
-            } catch (ParseException e) {
-                log.error(
-                        "Error parsing the page dsl for page: {}",
-                        page.getUnpublishedPage().getName(),
-                        e);
-                throw new AppsmithException(
-                        AppsmithError.JSON_PROCESSING_ERROR,
-                        page.getUnpublishedPage().getName());
-            }
-        });
-        pages.forEach(newPage -> {
-            // As we are publishing the app and then committing to git we expect the published and unpublished PageDTO
-            // will be same, so we create a deep copy for the published version for page from the unpublishedPageDTO
-            newPage.setPublishedPage(gson.fromJson(gson.toJson(newPage.getUnpublishedPage()), PageDTO.class));
-        });
-        applicationJson.setPageList(pages);
-    }
-
     public Mono<Long> deleteIndexLockFile(Path path) {
         return fileUtils.deleteIndexLockFile(path, INDEX_LOCK_FILE_STALE_TIME);
     }
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 52d88916ef..714da0b1eb 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
@@ -58,7 +58,6 @@ import io.micrometer.observation.ObservationRegistry;
 import jakarta.validation.Validator;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
-import org.bson.types.ObjectId;
 import org.springframework.data.domain.Sort;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedCaseInsensitiveMap;
@@ -79,6 +78,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -467,7 +467,7 @@ public class NewActionServiceCEImpl extends BaseService<NewActionRepository, New
 
     protected void setGitSyncIdInNewAction(NewAction newAction) {
         if (newAction.getGitSyncId() == null) {
-            newAction.setGitSyncId(newAction.getApplicationId() + "_" + new ObjectId());
+            newAction.setGitSyncId(newAction.getApplicationId() + "_" + UUID.randomUUID());
         }
     }
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/importable/applications/NewActionApplicationImportableServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/importable/applications/NewActionApplicationImportableServiceCEImpl.java
index 030ab4ab56..7608801c32 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/importable/applications/NewActionApplicationImportableServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/importable/applications/NewActionApplicationImportableServiceCEImpl.java
@@ -19,7 +19,6 @@ import com.appsmith.server.newactions.base.NewActionService;
 import com.appsmith.server.repositories.NewActionRepository;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
-import org.bson.types.ObjectId;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 
@@ -27,6 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.UUID;
 
 @RequiredArgsConstructor
 @Service
@@ -144,7 +144,7 @@ public class NewActionApplicationImportableServiceCEImpl
 
         // generate gitSyncId if it's not present
         if (newAction.getGitSyncId() == null) {
-            newAction.setGitSyncId(newAction.getApplicationId() + "_" + new ObjectId());
+            newAction.setGitSyncId(newAction.getApplicationId() + "_" + UUID.randomUUID());
         }
     }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCE.java
index 5e8ab93fa5..08b3800528 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCE.java
@@ -6,6 +6,7 @@ import com.appsmith.server.domains.Layout;
 import com.appsmith.server.domains.NewPage;
 import com.appsmith.server.dtos.ApplicationPagesDTO;
 import com.appsmith.server.dtos.PageDTO;
+import com.appsmith.server.dtos.PageUpdateDTO;
 import com.appsmith.server.services.CrudService;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -28,8 +29,6 @@ public interface NewPageServiceCE extends CrudService<NewPage, String> {
 
     Flux<NewPage> findNewPagesByApplicationId(String applicationId, AclPermission permission);
 
-    Flux<NewPage> findNewPagesByApplicationId(String applicationId, Optional<AclPermission> permission);
-
     Mono<PageDTO> saveUnpublishedPage(PageDTO page);
 
     Mono<PageDTO> createDefault(PageDTO object);
@@ -62,7 +61,7 @@ public interface NewPageServiceCE extends CrudService<NewPage, String> {
 
     Mono<PageDTO> updatePage(String pageId, PageDTO page);
 
-    Mono<PageDTO> updatePageByDefaultPageIdAndBranch(String defaultPageId, PageDTO page, String branchName);
+    Mono<PageDTO> updatePageByDefaultPageIdAndBranch(String defaultPageId, PageUpdateDTO page, String branchName);
 
     Mono<NewPage> save(NewPage page);
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCEImpl.java
index 369b20a251..4e8a0242c5 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceCEImpl.java
@@ -13,11 +13,11 @@ import com.appsmith.server.domains.NewPage;
 import com.appsmith.server.dtos.ApplicationPagesDTO;
 import com.appsmith.server.dtos.PageDTO;
 import com.appsmith.server.dtos.PageNameIdDTO;
+import com.appsmith.server.dtos.PageUpdateDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.helpers.TextUtils;
-import com.appsmith.server.repositories.ApplicationSnapshotRepository;
 import com.appsmith.server.repositories.NewPageRepository;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.BaseService;
@@ -45,6 +45,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 import static com.appsmith.external.helpers.AppsmithBeanUtils.copyNewFieldValuesIntoOldObject;
@@ -58,7 +59,6 @@ public class NewPageServiceCEImpl extends BaseService<NewPageRepository, NewPage
     private final ResponseUtils responseUtils;
     private final ApplicationPermission applicationPermission;
     private final PagePermission pagePermission;
-    private final ApplicationSnapshotRepository applicationSnapshotRepository;
 
     @Autowired
     public NewPageServiceCEImpl(
@@ -69,15 +69,13 @@ public class NewPageServiceCEImpl extends BaseService<NewPageRepository, NewPage
             UserDataService userDataService,
             ResponseUtils responseUtils,
             ApplicationPermission applicationPermission,
-            PagePermission pagePermission,
-            ApplicationSnapshotRepository applicationSnapshotRepository) {
+            PagePermission pagePermission) {
         super(validator, repository, analyticsService);
         this.applicationService = applicationService;
         this.userDataService = userDataService;
         this.responseUtils = responseUtils;
         this.applicationPermission = applicationPermission;
         this.pagePermission = pagePermission;
-        this.applicationSnapshotRepository = applicationSnapshotRepository;
     }
 
     @Override
@@ -149,7 +147,7 @@ public class NewPageServiceCEImpl extends BaseService<NewPageRepository, NewPage
                     newPage.setUnpublishedPage(page);
                     // gitSyncId will be used to sync resource across instances
                     if (newPage.getGitSyncId() == null) {
-                        newPage.setGitSyncId(page.getApplicationId() + "_" + new ObjectId());
+                        newPage.setGitSyncId(page.getApplicationId() + "_" + UUID.randomUUID());
                     }
                     return repository.save(newPage);
                 })
@@ -165,7 +163,7 @@ public class NewPageServiceCEImpl extends BaseService<NewPageRepository, NewPage
         newPage.setPolicies(object.getPolicies());
         if (newPage.getGitSyncId() == null) {
             // Make sure gitSyncId will be unique
-            newPage.setGitSyncId(newPage.getApplicationId() + "_" + new ObjectId());
+            newPage.setGitSyncId(newPage.getApplicationId() + "_" + UUID.randomUUID());
         }
         DefaultResources defaultResources = object.getDefaultResources();
         newPage.setDefaultResources(defaultResources);
@@ -473,11 +471,6 @@ public class NewPageServiceCEImpl extends BaseService<NewPageRepository, NewPage
         return repository.findByApplicationId(applicationId, permission);
     }
 
-    @Override
-    public Flux<NewPage> findNewPagesByApplicationId(String applicationId, Optional<AclPermission> permission) {
-        return repository.findByApplicationId(applicationId, permission);
-    }
-
     @Override
     public Mono<List<NewPage>> archivePagesByApplicationId(String applicationId, AclPermission permission) {
         return findNewPagesByApplicationId(applicationId, permission)
@@ -527,10 +520,11 @@ public class NewPageServiceCEImpl extends BaseService<NewPageRepository, NewPage
     }
 
     @Override
-    public Mono<PageDTO> updatePageByDefaultPageIdAndBranch(String defaultPageId, PageDTO page, String branchName) {
+    public Mono<PageDTO> updatePageByDefaultPageIdAndBranch(
+            String defaultPageId, PageUpdateDTO page, String branchName) {
         return repository
                 .findPageByBranchNameAndDefaultPageId(branchName, defaultPageId, pagePermission.getEditPermission())
-                .flatMap(newPage -> updatePage(newPage.getId(), page))
+                .flatMap(newPage -> updatePage(newPage.getId(), page.toPageDTO()))
                 .map(responseUtils::updatePageDTOWithDefaultResources);
     }
 
@@ -538,7 +532,7 @@ public class NewPageServiceCEImpl extends BaseService<NewPageRepository, NewPage
     public Mono<NewPage> save(NewPage page) {
         // gitSyncId will be used to sync resource across instances
         if (page.getGitSyncId() == null) {
-            page.setGitSyncId(page.getApplicationId() + "_" + new ObjectId());
+            page.setGitSyncId(page.getApplicationId() + "_" + UUID.randomUUID());
         }
         return repository.save(page);
     }
@@ -576,7 +570,7 @@ public class NewPageServiceCEImpl extends BaseService<NewPageRepository, NewPage
     public Flux<NewPage> saveAll(List<NewPage> pages) {
         pages.stream()
                 .filter(newPage -> newPage.getGitSyncId() == null)
-                .forEach(newPage -> newPage.setGitSyncId(newPage.getId() + "_" + new ObjectId()));
+                .forEach(newPage -> newPage.setGitSyncId(newPage.getId() + "_" + UUID.randomUUID()));
         return repository.saveAll(pages);
     }
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceImpl.java
index a737fdd02e..dfd2ac191c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/base/NewPageServiceImpl.java
@@ -2,7 +2,6 @@ package com.appsmith.server.newpages.base;
 
 import com.appsmith.server.applications.base.ApplicationService;
 import com.appsmith.server.helpers.ResponseUtils;
-import com.appsmith.server.repositories.ApplicationSnapshotRepository;
 import com.appsmith.server.repositories.NewPageRepository;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.UserDataService;
@@ -24,8 +23,7 @@ public class NewPageServiceImpl extends NewPageServiceCEImpl implements NewPageS
             UserDataService userDataService,
             ResponseUtils responseUtils,
             ApplicationPermission applicationPermission,
-            PagePermission pagePermission,
-            ApplicationSnapshotRepository applicationSnapshotRepository) {
+            PagePermission pagePermission) {
 
         super(
                 validator,
@@ -35,7 +33,6 @@ public class NewPageServiceImpl extends NewPageServiceCEImpl implements NewPageS
                 userDataService,
                 responseUtils,
                 applicationPermission,
-                pagePermission,
-                applicationSnapshotRepository);
+                pagePermission);
     }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/exportable/NewPageExportableServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/exportable/NewPageExportableServiceCEImpl.java
index 0606690969..da7ecf8a6d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/exportable/NewPageExportableServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/exportable/NewPageExportableServiceCEImpl.java
@@ -22,7 +22,6 @@ import java.time.Instant;
 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;
@@ -55,8 +54,8 @@ public class NewPageExportableServiceCEImpl implements ExportableServiceCE<NewPa
             ArtifactExchangeJson artifactExchangeJson) {
 
         ApplicationJson applicationJson = (ApplicationJson) artifactExchangeJson;
-        Optional<AclPermission> optionalPermission = Optional.ofNullable(pagePermission.getExportPermission(
-                exportingMetaDTO.getIsGitSync(), exportingMetaDTO.getExportWithConfiguration()));
+        AclPermission optionalPermission = pagePermission.getExportPermission(
+                exportingMetaDTO.getIsGitSync(), exportingMetaDTO.getExportWithConfiguration());
 
         List<String> unpublishedPages = exportingMetaDTO.getUnpublishedContextIds();
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/importable/NewPageImportableServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/importable/NewPageImportableServiceCEImpl.java
index d507243b92..297393ff44 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/importable/NewPageImportableServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newpages/importable/NewPageImportableServiceCEImpl.java
@@ -84,7 +84,7 @@ public class NewPageImportableServiceCEImpl implements ImportableServiceCE<NewPa
         // For git-sync this will not be empty
         Mono<List<NewPage>> existingPagesMono = importableArtifactMono
                 .flatMap(application -> newPageService
-                        .findNewPagesByApplicationId(application.getId(), Optional.empty())
+                        .findNewPagesByApplicationId(application.getId(), null)
                         .collectList())
                 .cache();
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/projections/ApplicationSnapshotResponseDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/projections/ApplicationSnapshotResponseDTO.java
new file mode 100644
index 0000000000..86ca6bf165
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/projections/ApplicationSnapshotResponseDTO.java
@@ -0,0 +1,14 @@
+package com.appsmith.server.projections;
+
+import com.appsmith.server.helpers.DateUtils;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.time.Instant;
+
+public record ApplicationSnapshotResponseDTO(@JsonIgnore Instant updatedAt) {
+    @JsonInclude
+    public String getUpdatedTime() {
+        return updatedAt == null ? null : DateUtils.ISO_FORMATTER.format(updatedAt);
+    }
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/projections/IdPoliciesOnly.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/projections/IdPoliciesOnly.java
new file mode 100644
index 0000000000..852cb022a6
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/projections/IdPoliciesOnly.java
@@ -0,0 +1,8 @@
+package com.appsmith.server.projections;
+
+import com.appsmith.external.models.Policy;
+import lombok.NonNull;
+
+import java.util.Set;
+
+public record IdPoliciesOnly(@NonNull String id, Set<Policy> policies) {}
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 da42da1743..db6e5c1c67 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
@@ -5,7 +5,7 @@ import com.appsmith.server.dtos.ResponseDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.ratelimiting.RateLimitService;
-import com.appsmith.server.ratelimiting.annotations.*;
+import com.appsmith.server.ratelimiting.annotations.RateLimit;
 import com.appsmith.server.services.SessionUserService;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ActionCollectionRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ActionCollectionRepositoryCE.java
index 7380a6d068..125d1b6d4b 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ActionCollectionRepositoryCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ActionCollectionRepositoryCE.java
@@ -1,11 +1,16 @@
 package com.appsmith.server.repositories.ce;
 
 import com.appsmith.server.domains.ActionCollection;
+import com.appsmith.server.projections.IdPoliciesOnly;
 import com.appsmith.server.repositories.BaseRepository;
 import com.appsmith.server.repositories.CustomActionCollectionRepository;
 import reactor.core.publisher.Flux;
 
+import java.util.List;
+
 public interface ActionCollectionRepositoryCE
         extends BaseRepository<ActionCollection, String>, CustomActionCollectionRepository {
     Flux<ActionCollection> findByApplicationId(String applicationId);
+
+    Flux<IdPoliciesOnly> findIdsAndPoliciesByApplicationIdIn(List<String> applicationIds);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ApplicationSnapshotRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ApplicationSnapshotRepositoryCE.java
index 2be4d29f96..c2f64cfeb9 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ApplicationSnapshotRepositoryCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ApplicationSnapshotRepositoryCE.java
@@ -1,6 +1,7 @@
 package com.appsmith.server.repositories.ce;
 
 import com.appsmith.server.domains.ApplicationSnapshot;
+import com.appsmith.server.projections.ApplicationSnapshotResponseDTO;
 import com.appsmith.server.repositories.BaseRepository;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -10,4 +11,6 @@ public interface ApplicationSnapshotRepositoryCE
     Flux<ApplicationSnapshot> findByApplicationId(String applicationId);
 
     Mono<Void> deleteAllByApplicationId(String applicationId);
+
+    Mono<ApplicationSnapshotResponseDTO> findByApplicationIdAndChunkOrder(String applicationId, Integer chunkOrder);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationSnapshotRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationSnapshotRepositoryCE.java
index 52887f17a9..f9a23f1103 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationSnapshotRepositoryCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationSnapshotRepositoryCE.java
@@ -2,8 +2,5 @@ package com.appsmith.server.repositories.ce;
 
 import com.appsmith.server.domains.ApplicationSnapshot;
 import com.appsmith.server.repositories.AppsmithRepository;
-import reactor.core.publisher.Mono;
 
-public interface CustomApplicationSnapshotRepositoryCE extends AppsmithRepository<ApplicationSnapshot> {
-    Mono<ApplicationSnapshot> findWithoutData(String applicationId);
-}
+public interface CustomApplicationSnapshotRepositoryCE extends AppsmithRepository<ApplicationSnapshot> {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationSnapshotRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationSnapshotRepositoryCEImpl.java
index 8d45a4f4b1..1688cd6a68 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationSnapshotRepositoryCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationSnapshotRepositoryCEImpl.java
@@ -1,27 +1,7 @@
 package com.appsmith.server.repositories.ce;
 
 import com.appsmith.server.domains.ApplicationSnapshot;
-import com.appsmith.server.helpers.ce.bridge.Bridge;
-import com.appsmith.server.helpers.ce.bridge.BridgeQuery;
 import com.appsmith.server.repositories.BaseAppsmithRepositoryImpl;
-import reactor.core.publisher.Mono;
-
-import java.util.List;
 
 public class CustomApplicationSnapshotRepositoryCEImpl extends BaseAppsmithRepositoryImpl<ApplicationSnapshot>
-        implements CustomApplicationSnapshotRepositoryCE {
-
-    @Override
-    public Mono<ApplicationSnapshot> findWithoutData(String applicationId) {
-        BridgeQuery<ApplicationSnapshot> query = Bridge.<ApplicationSnapshot>equal(
-                        ApplicationSnapshot.Fields.applicationId, applicationId)
-                .equal(ApplicationSnapshot.Fields.chunkOrder, 1);
-
-        List<String> fieldNames = List.of(
-                ApplicationSnapshot.Fields.applicationId,
-                ApplicationSnapshot.Fields.chunkOrder,
-                ApplicationSnapshot.Fields.createdAt,
-                ApplicationSnapshot.Fields.updatedAt);
-        return queryBuilder().criteria(query).fields(fieldNames).one();
-    }
-}
+        implements CustomApplicationSnapshotRepositoryCE {}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceRepositoryCE.java
index a1d223200d..8923668aa6 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceRepositoryCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceRepositoryCE.java
@@ -6,14 +6,9 @@ import com.appsmith.server.repositories.AppsmithRepository;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import java.util.List;
-import java.util.Set;
-
 public interface CustomDatasourceRepositoryCE extends AppsmithRepository<Datasource> {
 
     Flux<Datasource> findAllByWorkspaceId(String workspaceId, AclPermission permission);
 
     Mono<Datasource> findByNameAndWorkspaceId(String name, String workspaceId, AclPermission aclPermission);
-
-    Flux<Datasource> findAllByIdsWithoutPermission(Set<String> ids, List<String> includeFields);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceRepositoryCEImpl.java
index 0683d89256..eb982061b1 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceRepositoryCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomDatasourceRepositoryCEImpl.java
@@ -8,9 +8,6 @@ import org.springframework.data.domain.Sort;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import java.util.List;
-import java.util.Set;
-
 public class CustomDatasourceRepositoryCEImpl extends BaseAppsmithRepositoryImpl<Datasource>
         implements CustomDatasourceRepositoryCE {
 
@@ -31,12 +28,4 @@ public class CustomDatasourceRepositoryCEImpl extends BaseAppsmithRepositoryImpl
                 .permission(aclPermission)
                 .one();
     }
-
-    @Override
-    public Flux<Datasource> findAllByIdsWithoutPermission(Set<String> ids, List<String> includeFields) {
-        return queryBuilder()
-                .criteria(Bridge.in(Datasource.Fields.id, ids))
-                .fields(includeFields)
-                .all();
-    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewPageRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewPageRepositoryCE.java
index 1ee7f2f99d..ec442ee204 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewPageRepositoryCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewPageRepositoryCE.java
@@ -12,11 +12,8 @@ import java.util.Optional;
 
 public interface CustomNewPageRepositoryCE extends AppsmithRepository<NewPage> {
 
-    @Deprecated
     Flux<NewPage> findByApplicationId(String applicationId, AclPermission aclPermission);
 
-    Flux<NewPage> findByApplicationId(String applicationId, Optional<AclPermission> permission);
-
     Flux<NewPage> findByApplicationIdAndNonDeletedEditMode(String applicationId, AclPermission aclPermission);
 
     Mono<NewPage> findByIdAndLayoutsIdAndViewMode(
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewPageRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewPageRepositoryCEImpl.java
index f40b13b386..6bf66e0b6b 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewPageRepositoryCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewPageRepositoryCEImpl.java
@@ -42,14 +42,6 @@ public class CustomNewPageRepositoryCEImpl extends BaseAppsmithRepositoryImpl<Ne
                 .all();
     }
 
-    @Override
-    public Flux<NewPage> findByApplicationId(String applicationId, Optional<AclPermission> permission) {
-        return queryBuilder()
-                .criteria(Bridge.equal(NewPage.Fields.applicationId, applicationId))
-                .permission(permission.orElse(null))
-                .all();
-    }
-
     @Override
     public Flux<NewPage> findByApplicationIdAndNonDeletedEditMode(String applicationId, AclPermission aclPermission) {
         BridgeQuery<NewPage> q = Bridge.<NewPage>equal(NewPage.Fields.applicationId, applicationId)
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/DatasourceRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/DatasourceRepositoryCE.java
index e96ba30002..b58554b9a6 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/DatasourceRepositoryCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/DatasourceRepositoryCE.java
@@ -1,12 +1,14 @@
 package com.appsmith.server.repositories.ce;
 
 import com.appsmith.external.models.Datasource;
+import com.appsmith.server.projections.IdPoliciesOnly;
 import com.appsmith.server.repositories.BaseRepository;
 import com.appsmith.server.repositories.CustomDatasourceRepository;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.util.List;
+import java.util.Set;
 
 public interface DatasourceRepositoryCE extends BaseRepository<Datasource, String>, CustomDatasourceRepository {
 
@@ -15,4 +17,6 @@ public interface DatasourceRepositoryCE extends BaseRepository<Datasource, Strin
     Flux<Datasource> findAllByWorkspaceId(String workspaceId);
 
     Mono<Long> countByDeletedAtNull();
+
+    Flux<IdPoliciesOnly> findIdsAndPoliciesByIdIn(Set<String> datasourceIds);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/NewActionRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/NewActionRepositoryCE.java
index 505981ef1d..524c587a26 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/NewActionRepositoryCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/NewActionRepositoryCE.java
@@ -1,12 +1,15 @@
 package com.appsmith.server.repositories.ce;
 
 import com.appsmith.server.domains.NewAction;
+import com.appsmith.server.projections.IdPoliciesOnly;
 import com.appsmith.server.repositories.BaseRepository;
 import com.appsmith.server.repositories.CustomNewActionRepository;
 import org.springframework.data.mongodb.repository.Meta;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.util.List;
+
 public interface NewActionRepositoryCE extends BaseRepository<NewAction, String>, CustomNewActionRepository {
 
     @Meta(cursorBatchSize = 10000)
@@ -16,4 +19,6 @@ public interface NewActionRepositoryCE extends BaseRepository<NewAction, String>
     Flux<NewAction> findAllByIdIn(Iterable<String> ids);
 
     Mono<Long> countByDeletedAtNull();
+
+    Flux<IdPoliciesOnly> findIdsAndPoliciesByApplicationIdIn(List<String> applicationIds);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/NewPageRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/NewPageRepositoryCE.java
index 96cc0c264e..f85d203bfa 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/NewPageRepositoryCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/NewPageRepositoryCE.java
@@ -1,14 +1,19 @@
 package com.appsmith.server.repositories.ce;
 
 import com.appsmith.server.domains.NewPage;
+import com.appsmith.server.projections.IdPoliciesOnly;
 import com.appsmith.server.repositories.BaseRepository;
 import com.appsmith.server.repositories.CustomNewPageRepository;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.util.List;
+
 public interface NewPageRepositoryCE extends BaseRepository<NewPage, String>, CustomNewPageRepository {
 
     Flux<NewPage> findByApplicationId(String applicationId);
 
     Mono<Long> countByDeletedAtNull();
+
+    Flux<IdPoliciesOnly> findIdsAndPoliciesByApplicationIdIn(List<String> applicationIds);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CommonGitServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CommonGitServiceImpl.java
index 770f662de6..9e7e2d8c26 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CommonGitServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CommonGitServiceImpl.java
@@ -2,17 +2,21 @@ package com.appsmith.server.services;
 
 import com.appsmith.external.git.GitExecutor;
 import com.appsmith.git.service.GitExecutorImpl;
+import com.appsmith.server.configurations.EmailConfig;
 import com.appsmith.server.domains.Application;
 import com.appsmith.server.exports.internal.ExportService;
 import com.appsmith.server.helpers.CommonGitFileUtils;
 import com.appsmith.server.helpers.GitPrivateRepoHelper;
 import com.appsmith.server.helpers.RedisUtils;
+import com.appsmith.server.helpers.ce.GitAutoCommitHelper;
 import com.appsmith.server.imports.internal.ImportService;
+import com.appsmith.server.repositories.GitDeployKeysRepository;
 import com.appsmith.server.services.ce_compatible.CommonGitServiceCECompatibleImpl;
 import io.micrometer.observation.ObservationRegistry;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Import;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.reactive.TransactionalOperator;
 
 @Slf4j
 @Service
@@ -20,30 +24,38 @@ import org.springframework.stereotype.Service;
 public class CommonGitServiceImpl extends CommonGitServiceCECompatibleImpl implements CommonGitService {
 
     public CommonGitServiceImpl(
+            GitDeployKeysRepository gitDeployKeysRepository,
             GitPrivateRepoHelper gitPrivateRepoHelper,
             CommonGitFileUtils commonGitFileUtils,
             RedisUtils redisUtils,
             SessionUserService sessionUserService,
             UserDataService userDataService,
             UserService userService,
+            EmailConfig emailConfig,
+            TransactionalOperator transactionalOperator,
             AnalyticsService analyticsService,
             ObservationRegistry observationRegistry,
             ExportService exportService,
             ImportService importService,
             GitExecutor gitExecutor,
-            GitArtifactHelper<Application> gitApplicationHelper) {
+            GitArtifactHelper<Application> gitApplicationHelper,
+            GitAutoCommitHelper gitAutoCommitHelper) {
         super(
+                gitDeployKeysRepository,
                 gitPrivateRepoHelper,
                 commonGitFileUtils,
                 redisUtils,
                 sessionUserService,
                 userDataService,
                 userService,
+                emailConfig,
+                transactionalOperator,
                 analyticsService,
                 observationRegistry,
                 exportService,
                 importService,
                 gitExecutor,
-                gitApplicationHelper);
+                gitApplicationHelper,
+                gitAutoCommitHelper);
     }
 }
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 18693fea13..2f59c63b8f 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
@@ -3,6 +3,7 @@ package com.appsmith.server.services.ce;
 import com.appsmith.external.constants.AnalyticsEvents;
 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.external.models.PluginType;
 import com.appsmith.external.models.Policy;
@@ -1471,13 +1472,31 @@ public class ApplicationPageServiceCEImpl implements ApplicationPageServiceCE {
     private Mono<Boolean> validateAllObjectsForPermissions(
             Mono<Application> applicationMono, AppsmithError expectedError) {
         Flux<BaseDomain> pageFlux = applicationMono.flatMapMany(application -> newPageRepository
-                .findAllByApplicationIdsWithoutPermission(List.of(application.getId()), List.of("id", "policies"))
+                .findIdsAndPoliciesByApplicationIdIn(List.of(application.getId()))
+                .map(idPoliciesOnly -> {
+                    NewPage newPage = new NewPage();
+                    newPage.setId(idPoliciesOnly.id());
+                    newPage.setPolicies(idPoliciesOnly.policies());
+                    return newPage;
+                })
                 .flatMap(newPageRepository::setUserPermissionsInObject));
         Flux<BaseDomain> actionFlux = applicationMono.flatMapMany(application -> newActionRepository
-                .findAllByApplicationIdsWithoutPermission(List.of(application.getId()), List.of("id", "policies"))
+                .findIdsAndPoliciesByApplicationIdIn(List.of(application.getId()))
+                .map(idPoliciesOnly -> {
+                    NewAction newAction = new NewAction();
+                    newAction.setId(idPoliciesOnly.id());
+                    newAction.setPolicies(idPoliciesOnly.policies());
+                    return newAction;
+                })
                 .flatMap(newActionRepository::setUserPermissionsInObject));
         Flux<BaseDomain> actionCollectionFlux = applicationMono.flatMapMany(application -> actionCollectionRepository
-                .findAllByApplicationIds(List.of(application.getId()), List.of("id", "policies"))
+                .findIdsAndPoliciesByApplicationIdIn(List.of(application.getId()))
+                .map(idPoliciesOnly -> {
+                    ActionCollection actionCollection = new ActionCollection();
+                    actionCollection.setId(idPoliciesOnly.id());
+                    actionCollection.setPolicies(idPoliciesOnly.policies());
+                    return actionCollection;
+                })
                 .flatMap(actionCollectionRepository::setUserPermissionsInObject));
 
         Mono<Boolean> pagesValidatedForPermission = UserPermissionUtils.validateDomainObjectPermissionsOrError(
@@ -1510,7 +1529,7 @@ public class ApplicationPageServiceCEImpl implements ApplicationPageServiceCE {
         Flux<BaseDomain> datasourceFlux = applicationMono
                 .flatMapMany(application -> newActionRepository.findAllByApplicationIdsWithoutPermission(
                         List.of(application.getId()),
-                        List.of(BaseDomain.Fields.id, NewAction.Fields.unpublishedAction_datasource_id)))
+                        List.of(NewAction.Fields.id, NewAction.Fields.unpublishedAction_datasource_id)))
                 .collectList()
                 .map(actions -> {
                     return actions.stream()
@@ -1521,8 +1540,13 @@ public class ApplicationPageServiceCEImpl implements ApplicationPageServiceCE {
                             .collect(Collectors.toSet());
                 })
                 .flatMapMany(datasourceIds -> datasourceRepository
-                        .findAllByIdsWithoutPermission(datasourceIds, List.of("id", "policies"))
-                        .flatMap(datasourceRepository::setUserPermissionsInObject));
+                        .findIdsAndPoliciesByIdIn(datasourceIds)
+                        .flatMap(idPolicy -> {
+                            Datasource datasource = new Datasource();
+                            datasource.setId(idPolicy.id());
+                            datasource.setPolicies(idPolicy.policies());
+                            return datasourceRepository.setUserPermissionsInObject(datasource);
+                        }));
 
         return UserPermissionUtils.validateDomainObjectPermissionsOrError(
                         datasourceFlux,
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationSnapshotServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationSnapshotServiceCE.java
index 33bc8329fd..dcb455f89e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationSnapshotServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationSnapshotServiceCE.java
@@ -1,7 +1,7 @@
 package com.appsmith.server.services.ce;
 
 import com.appsmith.server.domains.Application;
-import com.appsmith.server.domains.ApplicationSnapshot;
+import com.appsmith.server.projections.ApplicationSnapshotResponseDTO;
 import reactor.core.publisher.Mono;
 
 public interface ApplicationSnapshotServiceCE {
@@ -15,7 +15,7 @@ public interface ApplicationSnapshotServiceCE {
      */
     Mono<Boolean> createApplicationSnapshot(String applicationId, String branchName);
 
-    Mono<ApplicationSnapshot> getWithoutDataByApplicationId(String applicationId, String branchName);
+    Mono<ApplicationSnapshotResponseDTO> getWithoutDataByApplicationId(String applicationId, String branchName);
 
     Mono<Application> restoreSnapshot(String applicationId, String branchName);
 
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 e6c9e924a4..9f87c5d446 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
@@ -12,6 +12,7 @@ import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.exports.internal.ExportService;
 import com.appsmith.server.helpers.ResponseUtils;
 import com.appsmith.server.imports.internal.ImportService;
+import com.appsmith.server.projections.ApplicationSnapshotResponseDTO;
 import com.appsmith.server.repositories.ApplicationSnapshotRepository;
 import com.appsmith.server.solutions.ApplicationPermission;
 import com.google.gson.Gson;
@@ -67,12 +68,13 @@ public class ApplicationSnapshotServiceCEImpl implements ApplicationSnapshotServ
     }
 
     @Override
-    public Mono<ApplicationSnapshot> getWithoutDataByApplicationId(String applicationId, String branchName) {
+    public Mono<ApplicationSnapshotResponseDTO> getWithoutDataByApplicationId(String applicationId, String branchName) {
         // get application first to check the permission and get child aka branched application ID
         return applicationService
                 .findBranchedApplicationId(branchName, applicationId, applicationPermission.getEditPermission())
-                .flatMap(applicationSnapshotRepository::findWithoutData)
-                .defaultIfEmpty(new ApplicationSnapshot());
+                .flatMap(branchedApplicationId ->
+                        applicationSnapshotRepository.findByApplicationIdAndChunkOrder(branchedApplicationId, 1))
+                .defaultIfEmpty(new ApplicationSnapshotResponseDTO(null));
     }
 
     @Override
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AssetServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AssetServiceCEImpl.java
index faa3d19b62..e424ec4c1f 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AssetServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AssetServiceCEImpl.java
@@ -20,7 +20,8 @@ import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import javax.imageio.ImageIO;
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Image;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CommonGitServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CommonGitServiceCE.java
index ccf8999e2e..c7cca9e12a 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CommonGitServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CommonGitServiceCE.java
@@ -1,13 +1,24 @@
 package com.appsmith.server.services.ce;
 
+import com.appsmith.external.dtos.GitBranchDTO;
+import com.appsmith.external.dtos.GitLogDTO;
 import com.appsmith.external.dtos.GitStatusDTO;
+import com.appsmith.external.dtos.MergeStatusDTO;
 import com.appsmith.server.constants.ArtifactType;
 import com.appsmith.server.domains.Artifact;
+import com.appsmith.server.domains.GitArtifactMetadata;
+import com.appsmith.server.domains.GitAuth;
 import com.appsmith.server.domains.GitProfile;
+import com.appsmith.server.dtos.AutoCommitProgressDTO;
+import com.appsmith.server.dtos.GitCommitDTO;
 import com.appsmith.server.dtos.GitConnectDTO;
+import com.appsmith.server.dtos.GitDocsDTO;
+import com.appsmith.server.dtos.GitMergeDTO;
+import com.appsmith.server.dtos.GitPullDTO;
 import org.eclipse.jgit.lib.BranchTrackingStatus;
 import reactor.core.publisher.Mono;
 
+import java.util.List;
 import java.util.Map;
 
 public interface CommonGitServiceCE {
@@ -17,7 +28,33 @@ public interface CommonGitServiceCE {
     Mono<Map<String, GitProfile>> updateOrCreateGitProfileForCurrentUser(
             GitProfile gitProfile, String defaultArtifactId);
 
-    Mono<GitStatusDTO> getStatus(String defaultArtifactId, boolean compareRemote, String branchName);
+    Mono<GitProfile> getDefaultGitProfileOrCreateIfEmpty();
+
+    Mono<GitProfile> getGitProfileForUser(String defaultArtifactId);
+
+    Mono<? extends Artifact> updateGitMetadata(
+            String applicationId, GitArtifactMetadata gitArtifactMetadata, ArtifactType artifactType);
+
+    Mono<GitArtifactMetadata> getGitArtifactMetadata(String defaultApplicationId, ArtifactType artifactType);
+
+    Mono<GitAuth> generateSSHKey(String keyType);
+
+    Mono<Boolean> testConnection(String defaultApplicationId, ArtifactType artifactType);
+
+    Mono<List<GitDocsDTO>> getGitDocUrls();
+
+    Mono<List<GitBranchDTO>> listBranchForArtifact(
+            String defaultArtifactId, Boolean pruneBranches, String currentBranch, ArtifactType artifactType);
+
+    // Git Operations: basic git operation of the interface
+
+    Mono<? extends Artifact> createBranch(
+            String defaultArtifactId, GitBranchDTO branchDTO, String srcBranch, ArtifactType artifactType);
+
+    Mono<GitStatusDTO> getStatus(
+            String defaultArtifactId, boolean compareRemote, String branchName, ArtifactType artifactType);
+
+    Mono<List<GitLogDTO>> getCommitHistory(String branchName, String defaultArtifactId, ArtifactType artifactType);
 
     Mono<BranchTrackingStatus> fetchRemoteChanges(
             Artifact defaultArtifact, Artifact branchedArtifact, String branchName, boolean isFileLock);
@@ -25,8 +62,49 @@ public interface CommonGitServiceCE {
     Mono<BranchTrackingStatus> fetchRemoteChanges(
             String defaultApplicationId, String branchName, boolean isFileLock, ArtifactType artifactType);
 
+    Mono<String> commitArtifact(
+            GitCommitDTO commitDTO,
+            String defaultArtifactId,
+            String branchName,
+            boolean doAmend,
+            ArtifactType artifactType);
+
+    Mono<String> commitArtifact(
+            GitCommitDTO commitDTO, String defaultApplicationId, String branchName, ArtifactType artifactType);
+
+    Mono<? extends Artifact> checkoutBranch(
+            String defaultArtifactId, String branchName, boolean addFileLock, ArtifactType artifactType);
+
+    Mono<? extends Artifact> deleteBranch(String defaultArtifactId, String branchName, ArtifactType artifactType);
+
+    Mono<GitPullDTO> pullArtifact(String defaultArtifactId, String branchName, ArtifactType artifactType);
+
+    Mono<String> pushArtifact(String defaultArtifactId, String branchName, ArtifactType artifactType);
+
+    Mono<? extends Artifact> detachRemote(String defaultArtifactId, ArtifactType artifactType);
+
+    Mono<MergeStatusDTO> mergeBranch(String applicationId, GitMergeDTO gitMergeDTO, ArtifactType artifactType);
+
+    Mono<MergeStatusDTO> isBranchMergeable(String applicationId, GitMergeDTO gitMergeDTO, ArtifactType artifactType);
+
+    Mono<String> createConflictedBranch(String defaultApplicationId, String branchName, ArtifactType artifactType);
+
+    // Artifact Git OPS
     Mono<? extends Artifact> connectArtifactToGit(
             String defaultArtifactId, GitConnectDTO gitConnectDTO, String origin, ArtifactType artifactType);
 
-    Mono<? extends Artifact> detachRemote(String defaultArtifactId, ArtifactType artifactType);
+    Mono<? extends Artifact> discardChanges(String defaultApplicationId, String branchName, ArtifactType artifactType);
+
+    // Autocommit methods
+
+    Mono<List<String>> updateProtectedBranches(
+            String defaultArtifactId, List<String> branchNames, ArtifactType artifactType);
+
+    Mono<List<String>> getProtectedBranches(String defaultArtifactId, ArtifactType artifactType);
+
+    Mono<Boolean> toggleAutoCommitEnabled(String defaultArtifactId, ArtifactType artifactType);
+
+    Mono<AutoCommitProgressDTO> getAutoCommitProgress(String applicationId, ArtifactType artifactType);
+
+    Mono<Boolean> autoCommitApplication(String defaultApplicationId, String branchName, ArtifactType artifactType);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CommonGitServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CommonGitServiceCEImpl.java
index 92cb22f6db..801d8800bc 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CommonGitServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CommonGitServiceCEImpl.java
@@ -1,10 +1,16 @@
 package com.appsmith.server.services.ce;
 
 import com.appsmith.external.constants.AnalyticsEvents;
+import com.appsmith.external.constants.ErrorReferenceDocUrl;
 import com.appsmith.external.dtos.GitBranchDTO;
+import com.appsmith.external.dtos.GitLogDTO;
 import com.appsmith.external.dtos.GitStatusDTO;
+import com.appsmith.external.dtos.MergeStatusDTO;
 import com.appsmith.external.git.GitExecutor;
+import com.appsmith.external.git.constants.GitConstants;
+import com.appsmith.external.git.constants.GitSpan;
 import com.appsmith.server.acl.AclPermission;
+import com.appsmith.server.configurations.EmailConfig;
 import com.appsmith.server.constants.ArtifactType;
 import com.appsmith.server.constants.Assets;
 import com.appsmith.server.constants.FieldName;
@@ -12,23 +18,32 @@ import com.appsmith.server.constants.GitDefaultCommitMessage;
 import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.ApplicationMode;
 import com.appsmith.server.domains.Artifact;
+import com.appsmith.server.domains.AutoCommitConfig;
 import com.appsmith.server.domains.GitArtifactMetadata;
 import com.appsmith.server.domains.GitAuth;
+import com.appsmith.server.domains.GitDeployKeys;
 import com.appsmith.server.domains.GitProfile;
 import com.appsmith.server.domains.User;
 import com.appsmith.server.domains.UserData;
 import com.appsmith.server.dtos.ArtifactExchangeJson;
+import com.appsmith.server.dtos.AutoCommitProgressDTO;
 import com.appsmith.server.dtos.GitCommitDTO;
 import com.appsmith.server.dtos.GitConnectDTO;
+import com.appsmith.server.dtos.GitDocsDTO;
+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.exports.internal.ExportService;
 import com.appsmith.server.helpers.CollectionUtils;
 import com.appsmith.server.helpers.CommonGitFileUtils;
+import com.appsmith.server.helpers.GitDeployKeyGenerator;
 import com.appsmith.server.helpers.GitPrivateRepoHelper;
 import com.appsmith.server.helpers.GitUtils;
 import com.appsmith.server.helpers.RedisUtils;
+import com.appsmith.server.helpers.ce.GitAutoCommitHelper;
 import com.appsmith.server.imports.internal.ImportService;
+import com.appsmith.server.repositories.GitDeployKeysRepository;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.GitArtifactHelper;
 import com.appsmith.server.services.SessionUserService;
@@ -38,6 +53,8 @@ import io.micrometer.observation.ObservationRegistry;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.jgit.api.errors.CannotDeleteCurrentBranchException;
+import org.eclipse.jgit.api.errors.CheckoutConflictException;
 import org.eclipse.jgit.api.errors.EmptyCommitException;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.api.errors.InvalidRemoteException;
@@ -45,7 +62,10 @@ import org.eclipse.jgit.api.errors.TransportException;
 import org.eclipse.jgit.errors.RepositoryNotFoundException;
 import org.eclipse.jgit.lib.BranchTrackingStatus;
 import org.eclipse.jgit.util.StringUtils;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.reactive.TransactionalOperator;
+import reactor.core.Exceptions;
 import reactor.core.observability.micrometer.Micrometer;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -54,7 +74,9 @@ import reactor.util.retry.Retry;
 
 import java.io.IOException;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.time.Instant;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -62,15 +84,23 @@ import java.util.Optional;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 
+import static com.appsmith.external.constants.AnalyticsEvents.GIT_ADD_PROTECTED_BRANCH;
+import static com.appsmith.external.constants.AnalyticsEvents.GIT_REMOVE_PROTECTED_BRANCH;
 import static com.appsmith.external.git.constants.GitConstants.DEFAULT_COMMIT_MESSAGE;
 import static com.appsmith.external.git.constants.GitConstants.EMPTY_COMMIT_ERROR_MESSAGE;
 import static com.appsmith.external.git.constants.GitConstants.GIT_CONFIG_ERROR;
 import static com.appsmith.external.git.constants.GitConstants.GIT_PROFILE_ERROR;
-import static com.appsmith.server.constants.ArtifactType.APPLICATION;
+import static com.appsmith.external.git.constants.ce.GitConstantsCE.CONFLICTED_SUCCESS_MESSAGE;
+import static com.appsmith.external.git.constants.ce.GitConstantsCE.MERGE_CONFLICT_BRANCH_NAME;
+import static com.appsmith.external.git.constants.ce.GitSpanCE.OPS_COMMIT;
+import static com.appsmith.external.git.constants.ce.GitSpanCE.OPS_STATUS;
+import static com.appsmith.git.constants.AppsmithBotAsset.APPSMITH_BOT_USERNAME;
 import static com.appsmith.server.constants.SerialiseArtifactObjective.VERSION_CONTROL;
 import static com.appsmith.server.constants.ce.FieldNameCE.DEFAULT;
 import static com.appsmith.server.helpers.GitUtils.MAX_RETRIES;
 import static com.appsmith.server.helpers.GitUtils.RETRY_DELAY;
+import static java.lang.Boolean.FALSE;
+import static java.lang.Boolean.TRUE;
 import static org.apache.commons.lang.ObjectUtils.defaultIfNull;
 
 @Slf4j
@@ -78,14 +108,17 @@ import static org.apache.commons.lang.ObjectUtils.defaultIfNull;
 @RequiredArgsConstructor
 public class CommonGitServiceCEImpl implements CommonGitServiceCE {
 
+    private final GitDeployKeysRepository gitDeployKeysRepository;
     private final GitPrivateRepoHelper gitPrivateRepoHelper;
     private final CommonGitFileUtils commonGitFileUtils;
     private final RedisUtils redisUtils;
-    private final SessionUserService sessionUserService;
+    protected final SessionUserService sessionUserService;
     private final UserDataService userDataService;
-    private final UserService userService;
+    protected final UserService userService;
+    private final EmailConfig emailConfig;
+    private final TransactionalOperator transactionalOperator;
 
-    private final AnalyticsService analyticsService;
+    protected final AnalyticsService analyticsService;
     private final ObservationRegistry observationRegistry;
 
     private final ExportService exportService;
@@ -93,20 +126,43 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
 
     private final GitExecutor gitExecutor;
     private final GitArtifactHelper<Application> gitApplicationHelper;
+    private final GitAutoCommitHelper gitAutoCommitHelper;
+
     private static final String ORIGIN = "origin/";
     private static final String REMOTE_NAME_REPLACEMENT = "";
 
+    private Mono<Boolean> addFileLock(String defaultArtifactId, boolean isLockRequired) {
+        if (!Boolean.TRUE.equals(isLockRequired)) {
+            return Mono.just(Boolean.TRUE);
+        }
+
+        return Mono.defer(() -> addFileLock(defaultArtifactId));
+    }
+
     private Mono<Boolean> addFileLock(String defaultArtifactId) {
         return redisUtils
                 .addFileLock(defaultArtifactId)
                 .retryWhen(Retry.fixedDelay(MAX_RETRIES, RETRY_DELAY)
                         .onRetryExhaustedThrow((retryBackoffSpec, retrySignal) -> {
                             throw new AppsmithException(AppsmithError.GIT_FILE_IN_USE);
-                        }));
+                        }))
+                .name(GitSpan.ADD_FILE_LOCK)
+                .tap(Micrometer.observation(observationRegistry));
+    }
+
+    private Mono<Boolean> releaseFileLock(String defaultArtifactId, boolean isLockRequired) {
+        if (!Boolean.TRUE.equals(isLockRequired)) {
+            return Mono.just(Boolean.TRUE);
+        }
+
+        return releaseFileLock(defaultArtifactId);
     }
 
     private Mono<Boolean> releaseFileLock(String defaultArtifactId) {
-        return redisUtils.releaseFileLock(defaultArtifactId);
+        return redisUtils
+                .releaseFileLock(defaultArtifactId)
+                .name(GitSpan.RELEASE_FILE_LOCK)
+                .tap(Micrometer.observation(observationRegistry));
     }
 
     public GitArtifactHelper<?> getArtifactGitService(@NonNull ArtifactType artifactType) {
@@ -117,28 +173,272 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
     }
 
     @Override
-    public Mono<GitStatusDTO> getStatus(String defaultArtifactId, boolean compareRemote, String branchName) {
-        return getStatus(defaultArtifactId, branchName, true, compareRemote);
+    public Mono<GitAuth> generateSSHKey(String keyType) {
+        GitAuth gitAuth = GitDeployKeyGenerator.generateSSHKey(keyType);
+
+        GitDeployKeys gitDeployKeys = new GitDeployKeys();
+        gitDeployKeys.setGitAuth(gitAuth);
+
+        return sessionUserService
+                .getCurrentUser()
+                .flatMap(user -> {
+                    gitDeployKeys.setEmail(user.getEmail());
+                    return gitDeployKeysRepository
+                            .findByEmail(user.getEmail())
+                            .switchIfEmpty(gitDeployKeysRepository.save(gitDeployKeys))
+                            .flatMap(gitDeployKeys1 -> {
+                                if (gitDeployKeys.equals(gitDeployKeys1)) {
+                                    return Mono.just(gitDeployKeys1);
+                                }
+                                // Overwrite the existing keys
+                                gitDeployKeys1.setGitAuth(gitDeployKeys.getGitAuth());
+                                return gitDeployKeysRepository.save(gitDeployKeys1);
+                            });
+                })
+                .thenReturn(gitAuth);
     }
 
-    private Mono<GitStatusDTO> getStatus(String defaultArtifactId, String branchName, boolean isFileLock) {
-        return getStatus(defaultArtifactId, branchName, isFileLock, true);
+    @Override
+    public Mono<? extends Artifact> updateGitMetadata(
+            String defaultArtifactId, GitArtifactMetadata gitArtifactMetadata, ArtifactType artifactType) {
+
+        if (Optional.ofNullable(gitArtifactMetadata).isEmpty()) {
+            return Mono.error(
+                    new AppsmithException(AppsmithError.INVALID_PARAMETER, "Git metadata values cannot be null"));
+        }
+
+        // For default artifact we expect a GitAuth to be a part of gitMetadata.
+        // We are using save method to leverage @Encrypted annotation used for private SSH keys.
+        // TODO: ensure artifact.saveArtifact should set the transient fields
+        GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(artifactType);
+        AclPermission artifactEditPermission = gitArtifactHelper.getArtifactEditPermission();
+        return gitArtifactHelper
+                .getArtifactById(defaultArtifactId, artifactEditPermission)
+                .flatMap(artifact -> updateArtifactWithGitMetadataGivenPermission(artifact, gitArtifactMetadata));
+    }
+
+    /**
+     * Method to get commit history for application branch
+     *
+     * @param defaultArtifactId artifact for which the commit history is needed
+     * @return list of commits
+     **/
+    @Override
+    public Mono<List<GitLogDTO>> getCommitHistory(
+            String branchName, String defaultArtifactId, ArtifactType artifactType) {
+        GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(artifactType);
+        AclPermission artifactReadPermission = gitArtifactHelper.getArtifactReadPermission();
+
+        Mono<? extends Artifact> artifactMono = gitArtifactHelper.getArtifactByDefaultIdAndBranchName(
+                defaultArtifactId, branchName, artifactReadPermission);
+
+        return artifactMono.flatMap(this::getCommitHistory);
+    }
+
+    protected Mono<List<GitLogDTO>> getCommitHistory(Artifact branchedArtifact) {
+        GitArtifactMetadata gitData = branchedArtifact.getGitArtifactMetadata();
+        if (gitData == null
+                || StringUtils.isEmptyOrNull(
+                        branchedArtifact.getGitArtifactMetadata().getBranchName())) {
+            return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_CONFIGURATION, GIT_CONFIG_ERROR));
+        }
+
+        GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(branchedArtifact.getArtifactType());
+        Path baseRepoSuffix = gitArtifactHelper.getRepoSuffixPath(
+                branchedArtifact.getWorkspaceId(), gitData.getDefaultArtifactId(), gitData.getRepoName());
+
+        Mono<List<GitLogDTO>> commitHistoryMono = gitExecutor
+                .checkoutToBranch(baseRepoSuffix, gitData.getBranchName())
+                .onErrorResume(e ->
+                        Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "checkout", e.getMessage())))
+                .then(gitExecutor
+                        .getCommitHistory(baseRepoSuffix)
+                        .onErrorResume(e -> Mono.error(
+                                new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "log", e.getMessage()))));
+
+        return Mono.create(
+                sink -> commitHistoryMono.subscribe(sink::success, sink::error, null, sink.currentContext()));
+    }
+
+    @Override
+    public Mono<GitStatusDTO> getStatus(
+            String defaultArtifactId, boolean compareRemote, String branchName, ArtifactType artifactType) {
+        return getStatus(defaultArtifactId, branchName, true, compareRemote, artifactType);
+    }
+
+    private Mono<GitStatusDTO> getStatus(
+            String defaultArtifactId, String branchName, boolean isFileLock, ArtifactType artifactType) {
+        return getStatus(defaultArtifactId, branchName, isFileLock, true, artifactType);
+    }
+
+    protected Mono<GitStatusDTO> getStatus(
+            Artifact defaultArtifact,
+            Artifact branchedArtifact,
+            String branchName,
+            boolean isFileLock,
+            boolean compareRemote) {
+
+        if (StringUtils.isEmptyOrNull(branchName)) {
+            return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.BRANCH_NAME));
+        }
+
+        ArtifactType artifactType = defaultArtifact.getArtifactType();
+        GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(artifactType);
+
+        GitArtifactMetadata defaultGitMetadata = defaultArtifact.getGitArtifactMetadata();
+        final String defaultArtifactId = defaultGitMetadata.getDefaultArtifactId();
+        final String finalBranchName = branchName.replaceFirst(ORIGIN, REMOTE_NAME_REPLACEMENT);
+
+        /*
+           1. Copy resources from DB to local repo
+           2. Fetch the current status from local repo
+        */
+        Mono<? extends ArtifactExchangeJson> exportedArtifactJsonMono = exportService
+                .exportByArtifactId(branchedArtifact.getId(), VERSION_CONTROL, artifactType)
+                .elapsed()
+                .map(longTuple2 -> {
+                    log.debug("export took: {}", longTuple2.getT1());
+                    return longTuple2.getT2();
+                });
+
+        Mono<GitStatusDTO> statusMono = Mono.zip(
+                        Mono.just(defaultGitMetadata), Mono.just(branchedArtifact), exportedArtifactJsonMono)
+                .flatMap(artifactAndJsonTuple3 -> addFileLock(defaultArtifactId, isFileLock)
+                        .elapsed()
+                        .map(elapsedTuple -> {
+                            log.debug("file lock took: {}", elapsedTuple.getT1());
+                            return artifactAndJsonTuple3;
+                        }))
+                .flatMap(tuple -> {
+                    GitArtifactMetadata defaultArtifactMetadata = tuple.getT1();
+                    Artifact exportableArtifact = tuple.getT2();
+                    ArtifactExchangeJson artifactExchangeJson = tuple.getT3();
+
+                    GitArtifactMetadata gitData = exportableArtifact.getGitArtifactMetadata();
+                    gitData.setGitAuth(defaultArtifactMetadata.getGitAuth());
+
+                    Path repoSuffix = gitArtifactHelper.getRepoSuffixPath(
+                            exportableArtifact.getWorkspaceId(), gitData.getDefaultArtifactId(), gitData.getRepoName());
+
+                    try {
+                        // Create a Mono to fetch the status from remote
+                        Path repoSuffixForFetchRemote = gitArtifactHelper.getRepoSuffixPath(
+                                exportableArtifact.getWorkspaceId(),
+                                gitData.getDefaultArtifactId(),
+                                gitData.getRepoName());
+
+                        GitAuth gitAuth = gitData.getGitAuth();
+                        Mono<String> fetchRemoteMono;
+
+                        if (compareRemote) {
+                            fetchRemoteMono = Mono.defer(() -> gitExecutor.fetchRemote(
+                                            repoSuffixForFetchRemote,
+                                            gitAuth.getPublicKey(),
+                                            gitAuth.getPrivateKey(),
+                                            false,
+                                            branchName,
+                                            false))
+                                    .onErrorResume(error -> Mono.error(new AppsmithException(
+                                            AppsmithError.GIT_GENERIC_ERROR, error.getMessage())));
+                        } else {
+                            fetchRemoteMono = Mono.just("ignored");
+                        }
+
+                        return Mono.zip(
+                                commonGitFileUtils.saveArtifactToLocalRepo(
+                                        repoSuffix, artifactExchangeJson, finalBranchName),
+                                Mono.just(repoSuffix),
+                                fetchRemoteMono);
+                    } catch (IOException | GitAPIException e) {
+                        return Mono.error(
+                                new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "status", e.getMessage()));
+                    }
+                })
+                .elapsed()
+                .flatMap(tuple -> {
+                    log.debug("saveApplicationToLocalRepo took: {}", tuple.getT1());
+                    return gitExecutor
+                            .getStatus(tuple.getT2().getT1(), finalBranchName)
+                            .elapsed()
+                            .flatMap(tuple2 -> {
+                                log.debug("git status took: {}", tuple2.getT1());
+                                // Remove any files which are copied by hard resetting the repo
+                                try {
+                                    GitStatusDTO result = tuple2.getT2();
+                                    return gitExecutor
+                                            .resetToLastCommit(tuple.getT2().getT2(), branchName)
+                                            .thenReturn(result);
+                                } catch (Exception e) {
+                                    log.error(
+                                            "failed to reset to last commit for application: {}, branch: {}",
+                                            defaultArtifactId,
+                                            branchName,
+                                            e);
+                                    return Mono.error(new AppsmithException(
+                                            AppsmithError.GIT_ACTION_FAILED, "status", e.getMessage()));
+                                }
+                            });
+                })
+                .elapsed()
+                .flatMap(tuple2 -> {
+                    log.debug("reset to last commit took: {}", tuple2.getT1());
+                    GitStatusDTO result = tuple2.getT2();
+                    return releaseFileLock(defaultArtifactId, isFileLock).thenReturn(result);
+                    // release the lock if there's a successful response
+                })
+                .onErrorResume(throwable -> {
+                    /*
+                     in case of any error, the global exception handler will release the lock
+                     hence we don't need to do that manually
+                    */
+                    log.error(
+                            "Error to get status for application: {}, branch: {}",
+                            defaultArtifactId,
+                            branchName,
+                            throwable);
+                    return Mono.error(new AppsmithException(AppsmithError.GIT_GENERIC_ERROR, throwable.getMessage()));
+                })
+                .tag("gitStatus", defaultArtifactId)
+                .name(AnalyticsEvents.GIT_STATUS.getEventName())
+                .tap(Micrometer.observation(observationRegistry));
+
+        return Mono.zip(statusMono, sessionUserService.getCurrentUser())
+                .elapsed()
+                .flatMap(objects -> {
+                    Long elapsedTime = objects.getT1();
+                    log.debug("Multi mono took: {}", elapsedTime);
+                    GitStatusDTO gitStatusDTO = objects.getT2().getT1();
+                    User currentUser = objects.getT2().getT2();
+                    String flowName;
+                    if (compareRemote) {
+                        flowName = AnalyticsEvents.GIT_STATUS.getEventName();
+                    } else {
+                        flowName = AnalyticsEvents.GIT_STATUS_WITHOUT_FETCH.getEventName();
+                    }
+
+                    return sendUnitExecutionTimeAnalyticsEvent(flowName, elapsedTime, currentUser, branchedArtifact)
+                            .thenReturn(gitStatusDTO);
+                })
+                .name(OPS_STATUS)
+                .tap(Micrometer.observation(observationRegistry));
     }
 
     /**
      * Get the status of the mentioned branch
      *
-     * @param defaultArtifactId     root/default application
-     * @param branchName           for which the status is required
-     * @param isFileLock           if the locking is required, since the status API is used in the other flows of git
-     *                             Only for the direct hits from the client the locking will be added
+     * @param defaultArtifactId root/default application
+     * @param branchName        for which the status is required
+     * @param isFileLock        if the locking is required, since the status API is used in the other flows of git
+     *                          Only for the direct hits from the client the locking will be added
+     * @param artifactType
      * @return Map of json file names which are added, modified, conflicting, removed and the working tree if this is clean
      */
     private Mono<GitStatusDTO> getStatus(
-            String defaultArtifactId, String branchName, boolean isFileLock, boolean compareRemote) {
-
-        // This variable is just for testing purpose, will be removed with a method parameter.
-        ArtifactType artifactType = ArtifactType.APPLICATION;
+            String defaultArtifactId,
+            String branchName,
+            boolean isFileLock,
+            boolean compareRemote,
+            ArtifactType artifactType) {
 
         if (StringUtils.isEmptyOrNull(branchName)) {
             return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.BRANCH_NAME));
@@ -296,7 +596,9 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
                     }
                     return sendUnitExecutionTimeAnalyticsEvent(flowName, elapsedTime, currentUser, artifact)
                             .thenReturn(gitStatusDTO);
-                });
+                })
+                .name(OPS_STATUS)
+                .tap(Micrometer.observation(observationRegistry));
     }
 
     @Override
@@ -335,9 +637,7 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
                     gitData.setGitAuth(defaultGitData.getGitAuth());
 
                     Path repoSuffix = artifactGitHelper.getRepoSuffixPath(
-                            branchedArtifact.getWorkspaceId(),
-                            gitData.getDefaultApplicationId(),
-                            gitData.getRepoName());
+                            branchedArtifact.getWorkspaceId(), gitData.getDefaultArtifactId(), gitData.getRepoName());
 
                     Path repoPath = gitExecutor.createRepoPath(repoSuffix);
                     Mono<Boolean> checkoutBranchMono = gitExecutor.checkoutToBranch(repoSuffix, finalBranchName);
@@ -387,7 +687,9 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
                                     currentUser,
                                     branchedArtifact)
                             .thenReturn(branchTrackingStatus);
-                });
+                })
+                .name(GitSpan.OPS_FETCH_REMOTE)
+                .tap(Micrometer.observation(observationRegistry));
 
         return Mono.create(sink -> {
             fetchRemoteStatusMono.subscribe(sink::success, sink::error, null, sink.currentContext());
@@ -450,7 +752,7 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
                     gitData.setGitAuth(defaultArtifactMetadata.getGitAuth());
 
                     Path repoSuffix = artifactGitHelper.getRepoSuffixPath(
-                            artifact.getWorkspaceId(), gitData.getDefaultApplicationId(), gitData.getRepoName());
+                            artifact.getWorkspaceId(), gitData.getDefaultArtifactId(), gitData.getRepoName());
 
                     Path repoPath = gitExecutor.createRepoPath(repoSuffix);
                     Mono<Boolean> checkoutBranchMono = gitExecutor.checkoutToBranch(repoSuffix, finalBranchName);
@@ -498,7 +800,9 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
                     return sendUnitExecutionTimeAnalyticsEvent(
                                     AnalyticsEvents.GIT_FETCH.getEventName(), elapsedTime, currentUser, artifact)
                             .thenReturn(branchTrackingStatus);
-                });
+                })
+                .name(GitSpan.OPS_FETCH_REMOTE)
+                .tap(Micrometer.observation(observationRegistry));
 
         return Mono.create(sink -> {
             fetchRemoteStatusMono.subscribe(sink::success, sink::error, null, sink.currentContext());
@@ -528,6 +832,7 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
                 AnalyticsEvents.UNIT_EXECUTION_TIME.getEventName(), currentUser.getUsername(), data);
     }
 
+    @Override
     public Mono<GitArtifactMetadata> getGitArtifactMetadata(String defaultApplicationId, ArtifactType artifactType) {
 
         GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(artifactType);
@@ -729,7 +1034,7 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
 
                                         // Set branchName for each artifact resource
                                         return exportService
-                                                .exportByArtifactId(artifactId, VERSION_CONTROL, APPLICATION)
+                                                .exportByArtifactId(artifactId, VERSION_CONTROL, artifactType)
                                                 .flatMap(artifactExchangeJson -> {
                                                     artifactExchangeJson
                                                             .getArtifact()
@@ -842,7 +1147,7 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
      * @param artifactType
      * @return success message
      */
-    //    @Override
+    @Override
     public Mono<String> commitArtifact(
             GitCommitDTO commitDTO,
             String defaultArtifactId,
@@ -860,6 +1165,7 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
      * @param defaultArtifactId application branch on which the commit needs to be done
      * @return success message
      */
+    @Override
     public Mono<String> commitArtifact(
             GitCommitDTO commitDTO, String defaultArtifactId, String branchName, ArtifactType artifactType) {
         return this.commitArtifact(commitDTO, defaultArtifactId, branchName, false, false, artifactType);
@@ -963,7 +1269,7 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
                     String errorEntity = "";
                     if (StringUtils.isEmptyOrNull(gitArtifactMetadata.getBranchName())) {
                         errorEntity = "branch name";
-                    } else if (StringUtils.isEmptyOrNull(gitArtifactMetadata.getDefaultApplicationId())) {
+                    } else if (StringUtils.isEmptyOrNull(gitArtifactMetadata.getDefaultArtifactId())) {
                         // TODO: make this artifact
                         errorEntity = "default artifact";
                     } else if (StringUtils.isEmptyOrNull(gitArtifactMetadata.getRepoName())) {
@@ -976,7 +1282,7 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
                     }
 
                     return Mono.zip(
-                            exportService.exportByArtifactId(branchedArtifact.getId(), VERSION_CONTROL, APPLICATION),
+                            exportService.exportByArtifactId(branchedArtifact.getId(), VERSION_CONTROL, artifactType),
                             Mono.just(branchedArtifact));
                 })
                 .flatMap(tuple -> {
@@ -998,7 +1304,7 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
                     // We don't require to check for permission from this point because, permission is already
                     // established
                     Mono<? extends Artifact> branchedArtifactMono =
-                            updateArtifactWithGitMetadataGivenPermission(branchedArtifact, gitData, artifactType);
+                            updateArtifactWithGitMetadataGivenPermission(branchedArtifact, gitData);
                     return Mono.zip(
                             repoPathMono,
                             userDataService.getGitProfileForCurrentUser(defaultArtifactId),
@@ -1101,8 +1407,7 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
                                     branchedArtifact.getGitArtifactMetadata().getIsRepoPrivate(),
                                     isSystemGenerated))
                             .thenReturn(status)
-                            .tag("gitCommit", defaultArtifactId)
-                            .name(AnalyticsEvents.GIT_COMMIT.getEventName())
+                            .name(OPS_COMMIT)
                             .tap(Micrometer.observation(observationRegistry));
                 });
 
@@ -1112,7 +1417,7 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
     }
 
     private Mono<? extends Artifact> updateArtifactWithGitMetadataGivenPermission(
-            Artifact artifact, GitArtifactMetadata gitMetadata, ArtifactType artifactType) {
+            Artifact artifact, GitArtifactMetadata gitMetadata) {
 
         if (Optional.ofNullable(gitMetadata).isEmpty()) {
             return Mono.error(
@@ -1123,7 +1428,22 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
         // For default application we expect a GitAuth to be a part of gitMetadata. We are using save method to leverage
         // @Encrypted annotation used for private SSH keys
         // applicationService.save sets the transient fields so no need to set it again from this method
-        return getArtifactGitService(artifactType).saveArtifact(artifact);
+        return getArtifactGitService(artifact.getArtifactType()).saveArtifact(artifact);
+    }
+
+    @Override
+    public Mono<String> pushArtifact(String defaultArtifactId, String branchName, ArtifactType artifactType) {
+
+        if (StringUtils.isEmptyOrNull(branchName)) {
+            throw new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.BRANCH_NAME);
+        }
+
+        GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(artifactType);
+        AclPermission artifactEditPermission = gitArtifactHelper.getArtifactEditPermission();
+
+        return gitArtifactHelper
+                .getArtifactByDefaultIdAndBranchName(defaultArtifactId, branchName, artifactEditPermission)
+                .flatMap(branchedArtifact -> pushArtifact(branchedArtifact, true, true));
     }
 
     /**
@@ -1132,7 +1452,7 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
      * @param branchedArtifact application which needs to be pushed to remote repo
      * @return Success message
      */
-    private Mono<String> pushArtifact(Artifact branchedArtifact, boolean doPublish, boolean isFileLock) {
+    protected Mono<String> pushArtifact(Artifact branchedArtifact, boolean doPublish, boolean isFileLock) {
 
         GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(branchedArtifact.getArtifactType());
         // Make sure that ssh Key is unEncrypted for the use.
@@ -1168,7 +1488,7 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
 
                     if (gitData == null
                             || StringUtils.isEmptyOrNull(gitData.getBranchName())
-                            || StringUtils.isEmptyOrNull(gitData.getDefaultApplicationId())
+                            || StringUtils.isEmptyOrNull(gitData.getDefaultArtifactId())
                             || StringUtils.isEmptyOrNull(gitData.getGitAuth().getPrivateKey())) {
 
                         return Mono.error(
@@ -1176,7 +1496,7 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
                     }
 
                     Path baseRepoSuffix = gitArtifactHelper.getRepoSuffixPath(
-                            artifact.getWorkspaceId(), gitData.getDefaultApplicationId(), gitData.getRepoName());
+                            artifact.getWorkspaceId(), gitData.getDefaultArtifactId(), gitData.getRepoName());
                     GitAuth gitAuth = gitData.getGitAuth();
 
                     return gitExecutor
@@ -1230,7 +1550,9 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
                                     artifact,
                                     artifact.getGitArtifactMetadata().getIsRepoPrivate()))
                             .thenReturn(pushStatus);
-                });
+                })
+                .name(GitSpan.OPS_PUSH)
+                .tap(Micrometer.observation(observationRegistry));
 
         return Mono.create(sink -> pushStatusMono.subscribe(sink::success, sink::error, null, sink.currentContext()));
     }
@@ -1283,6 +1605,192 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
         return Mono.just(pushResult);
     }
 
+    @Override
+    public Mono<? extends Artifact> checkoutBranch(
+            String defaultArtifactId, String branchName, boolean addFileLock, ArtifactType artifactType) {
+
+        if (StringUtils.isEmptyOrNull(branchName)) {
+            return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.BRANCH_NAME));
+        }
+
+        GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(artifactType);
+        AclPermission artifactEditPermission = gitArtifactHelper.getArtifactEditPermission();
+
+        Mono<? extends Artifact> sourceArtifactMono = gitArtifactHelper.getArtifactByDefaultIdAndBranchName(
+                defaultArtifactId, branchName, artifactEditPermission);
+        return sourceArtifactMono.flatMap(sourceArtifact -> checkoutBranch(sourceArtifact, branchName, addFileLock));
+    }
+
+    protected Mono<? extends Artifact> checkoutBranch(Artifact sourceArtifact, String branchName, boolean addFileLock) {
+
+        if (StringUtils.isEmptyOrNull(branchName)) {
+            return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.BRANCH_NAME));
+        }
+
+        GitArtifactMetadata gitArtifactMetadata = sourceArtifact.getGitArtifactMetadata();
+        String defaultArtifactId = gitArtifactMetadata.getDefaultArtifactId();
+        GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(sourceArtifact.getArtifactType());
+
+        Mono<? extends Artifact> sourceAritfactMono = Mono.just(sourceArtifact);
+
+        // If the user is trying to check out remote branch, create a new branch if the branch does not exist already
+        if (branchName.startsWith(ORIGIN)) {
+            String finalBranchName = branchName.replaceFirst(ORIGIN, REMOTE_NAME_REPLACEMENT);
+            Path repoPath = gitArtifactHelper.getRepoSuffixPath(
+                    sourceArtifact.getWorkspaceId(),
+                    gitArtifactMetadata.getDefaultArtifactId(),
+                    gitArtifactMetadata.getRepoName());
+
+            sourceAritfactMono = addFileLock(defaultArtifactId)
+                    .then(gitExecutor.listBranches(repoPath))
+                    .flatMap(branchList -> releaseFileLock(defaultArtifactId).thenReturn(branchList))
+                    .flatMap(gitBranchDTOList -> {
+                        long branchMatchCount = gitBranchDTOList.stream()
+                                .filter(gitBranchDTO ->
+                                        gitBranchDTO.getBranchName().equals(finalBranchName))
+                                .count();
+                        if (branchMatchCount == 0) {
+                            return checkoutRemoteBranch(
+                                    defaultArtifactId, finalBranchName, sourceArtifact.getArtifactType());
+                        } else {
+                            return Mono.error(new AppsmithException(
+                                    AppsmithError.GIT_ACTION_FAILED,
+                                    "checkout",
+                                    branchName + " already exists in local - "
+                                            + branchName.replaceFirst(ORIGIN, REMOTE_NAME_REPLACEMENT)));
+                        }
+                    });
+        } else {
+
+            if (isDefaultGitMetadataInvalid(gitArtifactMetadata)) {
+                return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_SSH_CONFIGURATION));
+            }
+
+            sourceAritfactMono = gitArtifactHelper
+                    .getArtifactByDefaultIdAndBranchName(
+                            defaultArtifactId, branchName, gitArtifactHelper.getArtifactReadPermission())
+                    .flatMap(artifact -> addAnalyticsForGitOperation(
+                            AnalyticsEvents.GIT_CHECKOUT_BRANCH,
+                            artifact,
+                            artifact.getGitArtifactMetadata().getIsRepoPrivate()))
+                    .map(gitArtifactHelper::updateArtifactWithDefaultReponseUtils);
+        }
+
+        return releaseFileLock(defaultArtifactId, addFileLock)
+                .then(sourceAritfactMono)
+                .tag(GitConstants.GitMetricConstants.CHECKOUT_REMOTE, FALSE.toString())
+                .name(GitSpan.OPS_CHECKOUT_BRANCH)
+                .tap(Micrometer.observation(observationRegistry))
+                .onErrorResume(throwable -> {
+                    return Mono.error(throwable);
+                });
+    }
+
+    private Mono<? extends Artifact> checkoutRemoteBranch(
+            String defaultArtifactId, String branchName, ArtifactType artifactType) {
+        GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(artifactType);
+        AclPermission artifactEditPermission = gitArtifactHelper.getArtifactEditPermission();
+
+        Mono<? extends Artifact> defaultArtifactMono =
+                gitArtifactHelper.getArtifactById(defaultArtifactId, artifactEditPermission);
+        Mono<? extends Artifact> checkoutRemoteBranchMono = addFileLock(defaultArtifactId)
+                .zipWith(defaultArtifactMono)
+                .flatMap(tuple2 -> {
+                    Artifact artifact = tuple2.getT2();
+                    GitArtifactMetadata gitArtifactMetadata = artifact.getGitArtifactMetadata();
+                    String repoName = gitArtifactMetadata.getRepoName();
+
+                    Path repoPath =
+                            gitArtifactHelper.getRepoSuffixPath(artifact.getWorkspaceId(), defaultArtifactId, repoName);
+
+                    return gitExecutor
+                            .fetchRemote(
+                                    repoPath,
+                                    gitArtifactMetadata.getGitAuth().getPublicKey(),
+                                    gitArtifactMetadata.getGitAuth().getPrivateKey(),
+                                    false,
+                                    branchName,
+                                    true)
+                            .flatMap(fetchStatus -> gitExecutor
+                                    .checkoutRemoteBranch(repoPath, branchName)
+                                    .zipWith(Mono.just(artifact))
+                                    .onErrorResume(error -> Mono.error(new AppsmithException(
+                                            AppsmithError.GIT_ACTION_FAILED, "checkout branch", error.getMessage()))));
+                })
+                .flatMap(tuple2 -> {
+                    /*
+                     * create a new application(each application => git branch)
+                     * Populate the application from the file system
+                     * Check if the existing branch track the given remote branch using the StoredConfig
+                     * Use the create branch method with isRemoteFlag or use the setStartPoint ,method in createBranch method
+                     * */
+
+                    Artifact artifact = tuple2.getT2();
+                    Mono<? extends Artifact> artifactMono;
+                    GitArtifactMetadata srcBranchGitData = artifact.getGitArtifactMetadata();
+                    if (branchName.equals(srcBranchGitData.getBranchName())) {
+                        /*
+                         in this case, user deleted the initial default branch and now wants to check out to that branch.
+                         as we didn't delete the application object but only the branch from git repo,
+                         we can just use this existing application without creating a new one.
+                        */
+                        artifactMono = Mono.just(artifact);
+                    } else {
+                        // create new Artifact
+                        artifactMono = gitArtifactHelper.createNewArtifactForCheckout(artifact, branchName);
+                    }
+
+                    Mono<ArtifactExchangeJson> artifactExchangeJsonMono =
+                            commonGitFileUtils.reconstructArtifactExchangeJsonFromGitRepoWithAnalytics(
+                                    artifact.getWorkspaceId(),
+                                    defaultArtifactId,
+                                    srcBranchGitData.getRepoName(),
+                                    branchName,
+                                    artifactType);
+
+                    return artifactExchangeJsonMono.zipWith(artifactMono).onErrorResume(throwable -> {
+                        if (throwable instanceof DuplicateKeyException) {
+                            artifactExchangeJsonMono.zipWith(Mono.just(artifact));
+                        }
+
+                        log.error(" Git checkout remote branch failed {}", throwable.getMessage());
+                        return Mono.error(new AppsmithException(
+                                AppsmithError.GIT_ACTION_FAILED, " --checkout", throwable.getMessage()));
+                    });
+
+                    // We need to handle the case specifically for default branch of Appsmith
+                    // if user switches default branch and tries to delete the default branch we do not delete
+                    // resource from db
+                    // This is an exception only for the above case and in such case if the user tries to check
+                    // out the branch again
+                    // It results in an error as the resources are already present in db
+                    // So we just rehydrate from the file system to the existing resource on the db
+
+                })
+                .flatMap(tuple -> {
+                    // Get the latest artifact mono with all the changes
+                    ArtifactExchangeJson artifactExchangeJson = tuple.getT1();
+                    Artifact artifact = tuple.getT2();
+                    return importService
+                            .importArtifactInWorkspaceFromGit(
+                                    artifact.getWorkspaceId(), artifact.getId(), artifactExchangeJson, branchName)
+                            .flatMap(artifact1 -> addAnalyticsForGitOperation(
+                                    AnalyticsEvents.GIT_CHECKOUT_REMOTE_BRANCH,
+                                    artifact1,
+                                    Boolean.TRUE.equals(
+                                            artifact1.getGitArtifactMetadata().getIsRepoPrivate())))
+                            .map(gitArtifactHelper::updateArtifactWithDefaultReponseUtils)
+                            .flatMap(artifact1 ->
+                                    releaseFileLock(defaultArtifactId).then(Mono.just(artifact1)));
+                })
+                .tag(GitConstants.GitMetricConstants.CHECKOUT_REMOTE, TRUE.toString())
+                .name(GitSpan.OPS_CHECKOUT_BRANCH)
+                .tap(Micrometer.observation(observationRegistry));
+
+        return Mono.create(
+                sink -> checkoutRemoteBranchMono.subscribe(sink::success, sink::error, null, sink.currentContext()));
+    }
+
     /**
      * Method to remove all the git metadata for the application and connected resources. This will remove:
      * - local repo
@@ -1311,7 +1819,7 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
                     String repoName = gitArtifactMetadata.getRepoName();
 
                     Path repoSuffix = gitArtifactHelper.getRepoSuffixPath(
-                            defaultArtifact.getWorkspaceId(), gitArtifactMetadata.getDefaultApplicationId(), repoName);
+                            defaultArtifact.getWorkspaceId(), gitArtifactMetadata.getDefaultArtifactId(), repoName);
                     String defaultApplicationBranchName = gitArtifactMetadata.getBranchName();
                     String remoteUrl = gitArtifactMetadata.getRemoteUrl();
                     String privateKey = gitArtifactMetadata.getGitAuth().getPrivateKey();
@@ -1351,11 +1859,341 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
                             .then(addAnalyticsForGitOperation(
                                     AnalyticsEvents.GIT_DISCONNECT, updatedDefaultArtifact, false))
                             .map(gitArtifactHelper::updateArtifactWithDefaultReponseUtils);
-                });
+                })
+                .name(GitSpan.OPS_DETACH_REMOTE)
+                .tap(Micrometer.observation(observationRegistry));
 
         return Mono.create(sink -> disconnectMono.subscribe(sink::success, sink::error, null, sink.currentContext()));
     }
 
+    @Override
+    public Mono<? extends Artifact> createBranch(
+            String defaultArtifactId, GitBranchDTO branchDTO, String srcBranch, ArtifactType artifactType) {
+
+        /*
+        1. Check if the src artifact is available and user have sufficient permissions
+        2. Create and checkout to requested branch
+        3. Rehydrate the artifact from source artifact reference
+         */
+
+        if (StringUtils.isEmptyOrNull(srcBranch)
+                || srcBranch.startsWith(ORIGIN)
+                || branchDTO.getBranchName().startsWith(ORIGIN)) {
+            return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.BRANCH_NAME));
+        }
+
+        GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(artifactType);
+        AclPermission artifactEditPermission = gitArtifactHelper.getArtifactEditPermission();
+
+        Mono<? extends Artifact> createBranchMono = gitArtifactHelper
+                .getArtifactByDefaultIdAndBranchName(defaultArtifactId, srcBranch, artifactEditPermission)
+                .zipWhen(sourceArtifact -> {
+                    GitArtifactMetadata gitData = sourceArtifact.getGitArtifactMetadata();
+                    if (sourceArtifact.getId().equals(gitData.getDefaultArtifactId())) {
+                        return Mono.just(sourceArtifact.getGitArtifactMetadata().getGitAuth());
+                    }
+
+                    return gitArtifactHelper
+                            .getSshKeys(gitData.getDefaultArtifactId())
+                            .map(gitAuthDTO -> {
+                                GitAuth gitAuth = new GitAuth();
+                                gitAuth.setPrivateKey(gitAuthDTO.getPrivateKey());
+                                gitAuth.setPublicKey(gitAuthDTO.getPublicKey());
+                                gitAuth.setDocUrl(gitAuthDTO.getDocUrl());
+                                return gitAuth;
+                            });
+                })
+                .flatMap(tuple -> {
+                    Artifact sourceArtifact = tuple.getT1();
+                    GitAuth defaultGitAuth = tuple.getT2();
+                    GitArtifactMetadata srcBranchGitData = sourceArtifact.getGitArtifactMetadata();
+
+                    if (srcBranchGitData == null
+                            || StringUtils.isEmptyOrNull(srcBranchGitData.getDefaultArtifactId())
+                            || StringUtils.isEmptyOrNull(srcBranchGitData.getRepoName())) {
+                        return Mono.error(
+                                new AppsmithException(
+                                        AppsmithError.INVALID_GIT_CONFIGURATION,
+                                        "Unable to find the parent branch. Please create a branch from other available branches"));
+                    }
+
+                    Path repoSuffix = gitArtifactHelper.getRepoSuffixPath(
+                            sourceArtifact.getWorkspaceId(),
+                            srcBranchGitData.getDefaultArtifactId(),
+                            srcBranchGitData.getRepoName());
+
+                    // Create a new branch from the parent checked out branch
+                    return addFileLock(srcBranchGitData.getDefaultArtifactId())
+                            .flatMap(status -> gitExecutor.checkoutToBranch(repoSuffix, srcBranch))
+                            .onErrorResume(error -> Mono.error(new AppsmithException(
+                                    AppsmithError.GIT_ACTION_FAILED, "checkout", "Unable to find " + srcBranch)))
+                            .zipWhen(isCheckedOut -> gitExecutor
+                                    .fetchRemote(
+                                            repoSuffix,
+                                            defaultGitAuth.getPublicKey(),
+                                            defaultGitAuth.getPrivateKey(),
+                                            false,
+                                            srcBranch,
+                                            true)
+                                    .onErrorResume(error -> Mono.error(
+                                            new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "fetch", error))))
+                            .flatMap(ignore -> gitExecutor
+                                    .listBranches(repoSuffix)
+                                    .flatMap(branchList -> {
+                                        boolean isDuplicateName = branchList.stream()
+                                                // We are only supporting origin as the remote name so this is safe
+                                                //  but needs to be altered if we start supporting user defined remote
+                                                // names
+                                                .anyMatch(branch -> branch.getBranchName()
+                                                        .replaceFirst(ORIGIN, REMOTE_NAME_REPLACEMENT)
+                                                        .equals(branchDTO.getBranchName()));
+
+                                        if (isDuplicateName) {
+                                            return Mono.error(new AppsmithException(
+                                                    AppsmithError.DUPLICATE_KEY_USER_ERROR,
+                                                    "remotes/origin/" + branchDTO.getBranchName(),
+                                                    FieldName.BRANCH_NAME));
+                                        }
+                                        return gitExecutor.createAndCheckoutToBranch(
+                                                repoSuffix, branchDTO.getBranchName());
+                                    }))
+                            .flatMap(branchName -> {
+                                final String sourceArtifactId = sourceArtifact.getId();
+
+                                Mono<? extends ArtifactExchangeJson> artifactExchangeJsonMono =
+                                        exportService.exportByArtifactId(
+                                                sourceArtifactId, VERSION_CONTROL, artifactType);
+                                Mono<? extends Artifact> newArtifactFromSourceMono =
+                                        gitArtifactHelper.createNewArtifactForCheckout(sourceArtifact, branchName);
+
+                                return Mono.zip(newArtifactFromSourceMono, artifactExchangeJsonMono);
+                            })
+                            .onErrorResume(error -> Mono.error(new AppsmithException(
+                                    AppsmithError.GIT_ACTION_FAILED, "branch", error.getMessage())));
+                })
+                .flatMap(tuple -> {
+                    Artifact savedArtifact = tuple.getT1();
+                    return importService
+                            .importArtifactInWorkspaceFromGit(
+                                    savedArtifact.getWorkspaceId(),
+                                    savedArtifact.getId(),
+                                    tuple.getT2(),
+                                    branchDTO.getBranchName())
+                            .flatMap(newBranchArtifact -> {
+                                // Commit and push for new branch created this is to avoid issues when user tries to
+                                // create a
+                                // new branch from uncommitted branch
+                                GitArtifactMetadata gitData = newBranchArtifact.getGitArtifactMetadata();
+                                GitCommitDTO commitDTO = new GitCommitDTO();
+                                commitDTO.setCommitMessage(DEFAULT_COMMIT_MESSAGE
+                                        + GitDefaultCommitMessage.BRANCH_CREATED.getReason()
+                                        + gitData.getBranchName());
+                                commitDTO.setDoPush(true);
+                                return commitArtifact(
+                                                commitDTO,
+                                                gitData.getDefaultArtifactId(),
+                                                gitData.getBranchName(),
+                                                artifactType)
+                                        .thenReturn(newBranchArtifact);
+                            });
+                })
+                .flatMap(newBranchArtifact -> releaseFileLock(
+                                newBranchArtifact.getGitArtifactMetadata().getDefaultArtifactId())
+                        .then(addAnalyticsForGitOperation(
+                                AnalyticsEvents.GIT_CREATE_BRANCH,
+                                newBranchArtifact,
+                                newBranchArtifact.getGitArtifactMetadata().getIsRepoPrivate())))
+                .map(gitArtifactHelper::updateArtifactWithDefaultReponseUtils)
+                .name(GitSpan.OPS_CREATE_BRANCH)
+                .tap(Micrometer.observation(observationRegistry));
+
+        return Mono.create(sink -> createBranchMono.subscribe(sink::success, sink::error, null, sink.currentContext()));
+    }
+
+    /**
+     * Method to pull artifact json files from remote repo, make a commit with the changes present in local DB and
+     * make a system commit to remote repo
+     *
+     * @param defaultArtifactId artifact for which we want to pull remote changes and merge
+     * @param branchName        remoteBranch from which the changes will be pulled and merged
+     * @param artifactType
+     * @return return the status of pull operation
+     */
+    @Override
+    public Mono<GitPullDTO> pullArtifact(String defaultArtifactId, String branchName, ArtifactType artifactType) {
+        /*
+         * 1.Dehydrate the artifact from DB so that the file system has the latest artifact data
+         * 2.Do git pull after the rehydration and merge the remote changes to the current branch
+         *   On Merge conflict - throw exception and ask user to resolve these conflicts on remote
+         *   TODO create new branch and push the changes to remote and ask the user to resolve it on github/gitlab UI
+         * 3.Then rehydrate from the file system to DB so that the latest changes from remote are rendered to the artifact
+         * 4.Get the latest artifact from the DB and send it back to client
+         * */
+
+        if (!org.springframework.util.StringUtils.hasText(branchName)) {
+            return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, branchName));
+        }
+
+        GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(artifactType);
+
+        final String finalBranchName = branchName.replaceFirst(ORIGIN, REMOTE_NAME_REPLACEMENT);
+        AclPermission artifactEditPermission = gitArtifactHelper.getArtifactEditPermission();
+
+        Mono<? extends Artifact> defaultArtifactMono =
+                gitArtifactHelper.getArtifactById(defaultArtifactId, artifactEditPermission);
+
+        Mono<? extends Artifact> branchedArtifactMono = gitArtifactHelper.getArtifactByDefaultIdAndBranchName(
+                defaultArtifactId, finalBranchName, artifactEditPermission);
+
+        Mono<GitPullDTO> pullDTOMono = Mono.zip(defaultArtifactMono, branchedArtifactMono)
+                .flatMap(tuple2 -> {
+                    Artifact defaultArtifact = tuple2.getT1();
+                    Artifact branchedArtifact = tuple2.getT2();
+                    GitArtifactMetadata gitMetadata = defaultArtifact.getGitArtifactMetadata();
+                    Mono<GitStatusDTO> statusMono =
+                            getStatus(defaultArtifact, branchedArtifact, finalBranchName, false, true);
+                    return addFileLock(gitMetadata.getDefaultArtifactId())
+                            .then(Mono.zip(statusMono, Mono.just(defaultArtifact), Mono.just(branchedArtifact)));
+                })
+                .flatMap(tuple -> {
+                    GitStatusDTO status = tuple.getT1();
+                    Artifact defaultArtifact = tuple.getT2();
+                    Artifact branchedArtifact = tuple.getT3();
+
+                    // Check if the repo is clean
+                    if (!CollectionUtils.isNullOrEmpty(status.getModified())) {
+                        return Mono.error(
+                                new AppsmithException(
+                                        AppsmithError.GIT_ACTION_FAILED,
+                                        "pull",
+                                        "There are uncommitted changes present in your local. Please commit them first and then try git pull"));
+                    }
+                    return pullAndRehydrateArtifact(defaultArtifact, branchedArtifact, branchName)
+                            // Release file lock after the pull operation
+                            .flatMap(gitPullDTO ->
+                                    releaseFileLock(defaultArtifactId).then(Mono.just(gitPullDTO)));
+                })
+                .name(GitSpan.OPS_PULL)
+                .tap(Micrometer.observation(observationRegistry));
+
+        return Mono.create(sink -> pullDTOMono.subscribe(sink::success, sink::error, null, sink.currentContext()));
+    }
+
+    /**
+     * Method to pull the files from remote repo and rehydrate the application
+     *
+     * @param defaultArtifact : base artifact
+     * @param branchedArtifact : a branch created from branches of base artifact
+     * @param branchName       branch for which the pull is required
+     * @return pull DTO with updated application
+     */
+    private Mono<GitPullDTO> pullAndRehydrateArtifact(
+            Artifact defaultArtifact, Artifact branchedArtifact, String branchName) {
+        /*
+        1. Checkout to the concerned branch
+        2. Do git pull after
+            On Merge conflict - throw exception and ask user to resolve these conflicts on remote
+            TODO create new branch and push the changes to remote and ask the user to resolve it on github/gitlab UI
+        3. Rehydrate the application from filesystem so that the latest changes from remote are rendered to the application
+        */
+
+        GitArtifactMetadata gitData = defaultArtifact.getGitArtifactMetadata();
+        if (isDefaultGitMetadataInvalid(gitData)) {
+            return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_CONFIGURATION, GIT_CONFIG_ERROR));
+        }
+
+        ArtifactType artifactType = defaultArtifact.getArtifactType();
+        GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(artifactType);
+        Path repoSuffix = gitArtifactHelper.getRepoSuffixPath(
+                defaultArtifact.getWorkspaceId(), gitData.getDefaultArtifactId(), gitData.getRepoName());
+
+        return Mono.just(branchedArtifact)
+                .flatMap(branchedArtifact1 -> {
+                    // git checkout and pull origin branchName
+                    try {
+                        Mono<MergeStatusDTO> pullStatusMono = gitExecutor
+                                .checkoutToBranch(repoSuffix, branchName)
+                                .then(gitExecutor.pullApplication(
+                                        repoSuffix,
+                                        gitData.getRemoteUrl(),
+                                        branchName,
+                                        gitData.getGitAuth().getPrivateKey(),
+                                        gitData.getGitAuth().getPublicKey()))
+                                .onErrorResume(error -> {
+                                    if (error.getMessage().contains("conflict")) {
+                                        return Mono.error(new AppsmithException(
+                                                AppsmithError.GIT_PULL_CONFLICTS, error.getMessage()));
+                                    } else if (error.getMessage().contains("Nothing to fetch")) {
+                                        MergeStatusDTO mergeStatus = new MergeStatusDTO();
+                                        mergeStatus.setStatus(
+                                                "Nothing to fetch from remote. All changes are up to date.");
+                                        mergeStatus.setMergeAble(true);
+                                        return Mono.just(mergeStatus);
+                                    }
+                                    return Mono.error(new AppsmithException(
+                                            AppsmithError.GIT_ACTION_FAILED, "pull", error.getMessage()));
+                                })
+                                .cache();
+                        // Rehydrate the application from file system
+                        Mono<ArtifactExchangeJson> artifactExchangeJsonMono = pullStatusMono.flatMap(
+                                status -> commonGitFileUtils.reconstructArtifactExchangeJsonFromGitRepoWithAnalytics(
+                                        branchedArtifact1.getWorkspaceId(),
+                                        branchedArtifact1
+                                                .getGitArtifactMetadata()
+                                                .getDefaultArtifactId(),
+                                        branchedArtifact1
+                                                .getGitArtifactMetadata()
+                                                .getRepoName(),
+                                        branchName,
+                                        artifactType));
+
+                        return Mono.zip(pullStatusMono, Mono.just(branchedArtifact1), artifactExchangeJsonMono);
+                    } catch (IOException e) {
+                        return Mono.error(new AppsmithException(AppsmithError.GIT_FILE_SYSTEM_ERROR, e.getMessage()));
+                    }
+                })
+                .flatMap(tuple -> {
+                    MergeStatusDTO status = tuple.getT1();
+                    Artifact branchedApplication = tuple.getT2();
+                    ArtifactExchangeJson artifactExchangeJson = tuple.getT3();
+
+                    // Get the latest application with all the changes
+                    // Commit and push changes to sync with remote
+                    return importService
+                            .importArtifactInWorkspaceFromGit(
+                                    branchedApplication.getWorkspaceId(),
+                                    branchedApplication.getId(),
+                                    artifactExchangeJson,
+                                    branchName)
+                            .flatMap(artifact -> addAnalyticsForGitOperation(
+                                            AnalyticsEvents.GIT_PULL,
+                                            artifact,
+                                            artifact.getGitArtifactMetadata().getIsRepoPrivate())
+                                    .thenReturn(artifact))
+                            .flatMap(artifact -> {
+                                GitCommitDTO commitDTO = new GitCommitDTO();
+                                commitDTO.setCommitMessage(DEFAULT_COMMIT_MESSAGE
+                                        + GitDefaultCommitMessage.SYNC_WITH_REMOTE_AFTER_PULL.getReason());
+                                commitDTO.setDoPush(true);
+
+                                Artifact artifactWithUpdatedResource =
+                                        gitArtifactHelper.updateArtifactWithDefaultReponseUtils(artifact);
+                                GitPullDTO gitPullDTO = new GitPullDTO();
+                                gitPullDTO.setMergeStatus(status);
+                                gitPullDTO.setArtifact(artifactWithUpdatedResource);
+
+                                // Make commit and push after pull is successful to have a clean repo
+                                return this.commitArtifact(
+                                                commitDTO,
+                                                artifact.getGitArtifactMetadata()
+                                                        .getDefaultArtifactId(),
+                                                branchName,
+                                                artifactType)
+                                        .thenReturn(gitPullDTO);
+                            });
+                });
+    }
+
     @Override
     public Mono<Map<String, GitProfile>> updateOrCreateGitProfileForCurrentUser(
             GitProfile gitProfile, String defaultArtifactId) {
@@ -1441,6 +2279,64 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
         return updateOrCreateGitProfileForCurrentUser(gitProfile, DEFAULT);
     }
 
+    @Override
+    public Mono<GitProfile> getDefaultGitProfileOrCreateIfEmpty() {
+        // Get default git profile if the default is empty then use Appsmith profile as a fallback value
+        return getGitProfileForUser(DEFAULT).flatMap(gitProfile -> {
+            if (StringUtils.isEmptyOrNull(gitProfile.getAuthorName())
+                    || StringUtils.isEmptyOrNull(gitProfile.getAuthorEmail())) {
+                return updateGitProfileWithAppsmithProfile(DEFAULT);
+            }
+            gitProfile.setUseGlobalProfile(null);
+            return Mono.just(gitProfile);
+        });
+    }
+
+    @Override
+    public Mono<GitProfile> getGitProfileForUser(String defaultArtifactId) {
+        return userDataService.getForCurrentUser().map(userData -> {
+            GitProfile gitProfile = userData.getGitProfileByKey(defaultArtifactId);
+            if (gitProfile != null && gitProfile.getUseGlobalProfile() == null) {
+                gitProfile.setUseGlobalProfile(true);
+            } else if (gitProfile == null) {
+                // If the profile is requested for repo specific using the applicationId
+                GitProfile gitProfile1 = new GitProfile();
+                gitProfile1.setAuthorName("");
+                gitProfile1.setAuthorEmail("");
+                gitProfile1.setUseGlobalProfile(true);
+                return gitProfile1;
+            }
+            return gitProfile;
+        });
+    }
+
+    private Mono<GitProfile> updateGitProfileWithAppsmithProfile(String key) {
+        return sessionUserService
+                .getCurrentUser()
+                .flatMap(user -> userService.findByEmail(user.getEmail()))
+                .flatMap(currentUser -> {
+                    GitProfile gitProfile = new GitProfile();
+                    String authorName = StringUtils.isEmptyOrNull(currentUser.getName())
+                            ? currentUser.getUsername().split("@")[0]
+                            : currentUser.getName();
+                    gitProfile.setAuthorEmail(currentUser.getEmail());
+                    gitProfile.setAuthorName(authorName);
+                    gitProfile.setUseGlobalProfile(null);
+                    return userDataService.getForUser(currentUser).flatMap(userData -> {
+                        UserData updates = new UserData();
+                        if (CollectionUtils.isNullOrEmpty(userData.getGitProfiles())) {
+                            updates.setGitProfiles(Map.of(key, gitProfile));
+                        } else {
+                            userData.getGitProfiles().put(key, gitProfile);
+                            updates.setGitProfiles(userData.getGitProfiles());
+                        }
+                        return userDataService
+                                .updateForUser(currentUser, updates)
+                                .thenReturn(gitProfile);
+                    });
+                });
+    }
+
     private Mono<? extends Artifact> addAnalyticsForGitOperation(
             AnalyticsEvents eventName, Artifact artifact, Boolean isRepoPrivate) {
         return addAnalyticsForGitOperation(eventName, artifact, "", "", isRepoPrivate, false);
@@ -1499,8 +2395,8 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
         GitArtifactMetadata gitData = artifact.getGitArtifactMetadata();
         Map<String, Object> analyticsProps = new HashMap<>();
         if (gitData != null) {
-            analyticsProps.put(FieldName.APPLICATION_ID, gitData.getDefaultApplicationId());
-            analyticsProps.put("appId", gitData.getDefaultApplicationId());
+            analyticsProps.put(FieldName.APPLICATION_ID, gitData.getDefaultArtifactId());
+            analyticsProps.put("appId", gitData.getDefaultArtifactId());
             analyticsProps.put(FieldName.BRANCH_NAME, branchName);
             analyticsProps.put(FieldName.GIT_HOSTING_PROVIDER, GitUtils.getGitProviderName(gitData.getRemoteUrl()));
             analyticsProps.put(FieldName.REPO_URL, gitData.getRemoteUrl());
@@ -1542,4 +2438,1055 @@ public class CommonGitServiceCEImpl implements CommonGitServiceCE {
                 || StringUtils.isEmptyOrNull(gitArtifactMetadata.getGitAuth().getPrivateKey())
                 || StringUtils.isEmptyOrNull(gitArtifactMetadata.getGitAuth().getPublicKey());
     }
+
+    @Override
+    public Mono<? extends Artifact> deleteBranch(
+            String defaultArtifactId, String branchName, ArtifactType artifactType) {
+
+        GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(artifactType);
+        AclPermission artifactEditPermission = gitArtifactHelper.getArtifactEditPermission();
+
+        Mono<? extends Artifact> defaultArtifactMono =
+                gitArtifactHelper.getArtifactById(defaultArtifactId, artifactEditPermission);
+
+        Mono<? extends Artifact> deleteBranchMono = defaultArtifactMono
+                .zipWhen(defaultArtifact ->
+                        gitPrivateRepoHelper.isBranchProtected(defaultArtifact.getGitArtifactMetadata(), branchName))
+                .map(objects -> {
+                    if (objects.getT2()) {
+                        throw new AppsmithException(
+                                AppsmithError.GIT_ACTION_FAILED,
+                                "delete",
+                                "Cannot delete protected branch " + branchName);
+                    }
+                    return objects.getT1();
+                })
+                .flatMap(defaultArtifact -> addFileLock(defaultArtifactId).map(status -> defaultArtifact))
+                .flatMap(defaultArtifact -> {
+                    GitArtifactMetadata gitArtifactMetadata = defaultArtifact.getGitArtifactMetadata();
+                    Path repoPath = gitArtifactHelper.getRepoSuffixPath(
+                            defaultArtifact.getWorkspaceId(), defaultArtifactId, gitArtifactMetadata.getRepoName());
+
+                    if (branchName.equals(gitArtifactMetadata.getDefaultBranchName())) {
+                        return Mono.error(new AppsmithException(
+                                AppsmithError.GIT_ACTION_FAILED, "delete branch", " Cannot delete default branch"));
+                    }
+                    return gitExecutor
+                            .deleteBranch(repoPath, branchName)
+                            .onErrorResume(throwable -> {
+                                log.error("Delete branch failed {}", throwable.getMessage());
+                                if (throwable instanceof CannotDeleteCurrentBranchException) {
+                                    return Mono.error(new AppsmithException(
+                                            AppsmithError.GIT_ACTION_FAILED,
+                                            "delete branch",
+                                            "Cannot delete current checked out branch"));
+                                }
+                                return Mono.error(new AppsmithException(
+                                        AppsmithError.GIT_ACTION_FAILED, "delete branch", throwable.getMessage()));
+                            })
+                            .flatMap(isBranchDeleted ->
+                                    releaseFileLock(defaultArtifactId).map(status -> isBranchDeleted))
+                            .flatMap(isBranchDeleted -> {
+                                if (FALSE.equals(isBranchDeleted)) {
+                                    return Mono.error(new AppsmithException(
+                                            AppsmithError.GIT_ACTION_FAILED,
+                                            " delete branch. Branch does not exists in the repo"));
+                                }
+
+                                return gitArtifactHelper
+                                        .getArtifactByDefaultIdAndBranchName(
+                                                defaultArtifactId, branchName, artifactEditPermission)
+                                        .flatMap(branchedArtifact -> {
+                                            if (branchedArtifact
+                                                    .getId()
+                                                    .equals(branchedArtifact
+                                                            .getGitArtifactMetadata()
+                                                            .getDefaultArtifactId())) {
+                                                return Mono.just(branchedArtifact);
+                                            }
+
+                                            return gitArtifactHelper.deleteArtifactByResource(branchedArtifact);
+                                        })
+                                        .onErrorResume(throwable -> {
+                                            log.warn("Unable to find branch with name ", throwable);
+                                            return addAnalyticsForGitOperation(
+                                                            AnalyticsEvents.GIT_DELETE_BRANCH,
+                                                            defaultArtifact,
+                                                            throwable.getClass().getName(),
+                                                            throwable.getMessage(),
+                                                            gitArtifactMetadata.getIsRepoPrivate())
+                                                    .flatMap(application1 -> Mono.just(application1));
+                                        });
+                            });
+                })
+                .flatMap(branchedArtifact -> addAnalyticsForGitOperation(
+                        AnalyticsEvents.GIT_DELETE_BRANCH,
+                        branchedArtifact,
+                        branchedArtifact.getGitArtifactMetadata().getIsRepoPrivate()))
+                .map(gitArtifactHelper::updateArtifactWithDefaultReponseUtils)
+                .name(GitSpan.OPS_DELETE_BRANCH)
+                .tap(Micrometer.observation(observationRegistry));
+
+        return Mono.create(sink -> deleteBranchMono.subscribe(sink::success, sink::error, null, sink.currentContext()));
+    }
+
+    @Override
+    public Mono<? extends Artifact> discardChanges(
+            String defaultArtifactId, String branchName, ArtifactType artifactType) {
+
+        if (StringUtils.isEmptyOrNull(defaultArtifactId)) {
+            return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.APPLICATION_ID));
+        }
+
+        GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(artifactType);
+        AclPermission artifactEditPermission = gitArtifactHelper.getArtifactEditPermission();
+
+        Mono<? extends Artifact> branchedArtifactMonoCached = gitArtifactHelper.getArtifactByDefaultIdAndBranchName(
+                defaultArtifactId, branchName, artifactEditPermission);
+
+        Mono<? extends Artifact> discardChangeMono;
+
+        // Rehydrate the artifact from local file system
+        discardChangeMono = branchedArtifactMonoCached
+                // Add file lock before proceeding with the git operation
+                .flatMap(branchedArtifact -> addFileLock(defaultArtifactId).thenReturn(branchedArtifact))
+                .flatMap(branchedArtifact -> {
+                    GitArtifactMetadata gitData = branchedArtifact.getGitArtifactMetadata();
+                    if (gitData == null || StringUtils.isEmptyOrNull(gitData.getDefaultArtifactId())) {
+                        return Mono.error(
+                                new AppsmithException(AppsmithError.INVALID_GIT_CONFIGURATION, GIT_CONFIG_ERROR));
+                    }
+                    Path repoSuffix = Paths.get(
+                            branchedArtifact.getWorkspaceId(), gitData.getDefaultArtifactId(), gitData.getRepoName());
+                    return gitExecutor
+                            .rebaseBranch(repoSuffix, branchName)
+                            .flatMap(rebaseStatus -> {
+                                return commonGitFileUtils.reconstructArtifactExchangeJsonFromGitRepoWithAnalytics(
+                                        branchedArtifact.getWorkspaceId(),
+                                        branchedArtifact
+                                                .getGitArtifactMetadata()
+                                                .getDefaultArtifactId(),
+                                        branchedArtifact
+                                                .getGitArtifactMetadata()
+                                                .getRepoName(),
+                                        branchName,
+                                        artifactType);
+                            })
+                            .onErrorResume(throwable -> {
+                                log.error("Git Discard & Rebase failed {}", throwable.getMessage());
+                                return Mono.error(
+                                        new AppsmithException(
+                                                AppsmithError.GIT_ACTION_FAILED,
+                                                "discard changes",
+                                                "Please create a new branch and resolve the conflicts on remote repository before proceeding ahead."));
+                            })
+                            .flatMap(artifactExchangeJson -> importService.importArtifactInWorkspaceFromGit(
+                                    branchedArtifact.getWorkspaceId(),
+                                    branchedArtifact.getId(),
+                                    artifactExchangeJson,
+                                    branchName))
+                            // Update the last deployed status after the rebase
+                            .flatMap(importedArtifact -> publishArtifact(importedArtifact, true));
+                })
+                .flatMap(branchedArtifact -> releaseFileLock(defaultArtifactId)
+                        .then(this.addAnalyticsForGitOperation(
+                                AnalyticsEvents.GIT_DISCARD_CHANGES, branchedArtifact, null)))
+                .map(gitArtifactHelper::updateArtifactWithDefaultReponseUtils)
+                .name(GitSpan.OPS_DISCARD_CHANGES)
+                .tap(Micrometer.observation(observationRegistry));
+
+        return Mono.create(
+                sink -> discardChangeMono.subscribe(sink::success, sink::error, null, sink.currentContext()));
+    }
+
+    @Override
+    public Mono<MergeStatusDTO> mergeBranch(
+            String defaultArtifactId, GitMergeDTO gitMergeDTO, ArtifactType artifactType) {
+        /*
+         * 1.Dehydrate the artifact from Mongodb so that the file system has the latest artifact data for both the source and destination branch artifact
+         * 2.Do git checkout destinationBranch ---> git merge sourceBranch after the rehydration
+         *   On Merge conflict - create new branch and push the changes to remote and ask the user to resolve it on Github/Gitlab UI
+         * 3.Then rehydrate from the file system to mongodb so that the latest changes from remote are rendered to the artifact
+         * 4.Get the latest artifact mono from the mongodb and send it back to client
+         * */
+
+        final String sourceBranch = gitMergeDTO.getSourceBranch();
+        final String destinationBranch = gitMergeDTO.getDestinationBranch();
+
+        if (StringUtils.isEmptyOrNull(sourceBranch) || StringUtils.isEmptyOrNull(destinationBranch)) {
+            return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.BRANCH_NAME));
+        } else if (sourceBranch.startsWith(ORIGIN)) {
+            return Mono.error(
+                    new AppsmithException(AppsmithError.UNSUPPORTED_OPERATION_FOR_REMOTE_BRANCH, sourceBranch));
+        } else if (destinationBranch.startsWith(ORIGIN)) {
+            return Mono.error(
+                    new AppsmithException(AppsmithError.UNSUPPORTED_OPERATION_FOR_REMOTE_BRANCH, destinationBranch));
+        }
+
+        GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(artifactType);
+        AclPermission artifactEditPermission = gitArtifactHelper.getArtifactEditPermission();
+
+        Mono<? extends Artifact> defaultArtifactMono =
+                gitArtifactHelper.getArtifactById(defaultArtifactId, artifactEditPermission);
+
+        Mono<MergeStatusDTO> mergeMono = defaultArtifactMono
+                .flatMap(defaultArtifact -> {
+                    GitArtifactMetadata gitData = defaultArtifact.getGitArtifactMetadata();
+                    return addFileLock(gitData.getDefaultArtifactId()).then(Mono.just(defaultArtifact));
+                })
+                .flatMap(defaultArtifact -> {
+                    GitArtifactMetadata gitArtifactMetadata = defaultArtifact.getGitArtifactMetadata();
+                    if (isDefaultGitMetadataInvalid(defaultArtifact.getGitArtifactMetadata())) {
+                        return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_SSH_CONFIGURATION));
+                    }
+                    Path repoSuffix = gitArtifactHelper.getRepoSuffixPath(
+                            defaultArtifact.getWorkspaceId(),
+                            gitArtifactMetadata.getDefaultArtifactId(),
+                            gitArtifactMetadata.getRepoName());
+
+                    // 1. Hydrate from db to file system for both branch Artifacts
+                    Mono<Path> pathToFile = this.getStatus(defaultArtifactId, sourceBranch, false, artifactType)
+                            .flatMap(status -> {
+                                if (!Integer.valueOf(0).equals(status.getBehindCount())) {
+                                    return Mono.error(new AppsmithException(
+                                            AppsmithError.GIT_MERGE_FAILED_REMOTE_CHANGES,
+                                            status.getBehindCount(),
+                                            sourceBranch));
+                                } else if (!status.getIsClean()) {
+                                    return Mono.error(new AppsmithException(
+                                            AppsmithError.GIT_MERGE_FAILED_LOCAL_CHANGES, sourceBranch));
+                                }
+                                return this.getStatus(defaultArtifactId, destinationBranch, false, artifactType)
+                                        .map(status1 -> {
+                                            if (!Integer.valueOf(0).equals(status.getBehindCount())) {
+                                                return Mono.error(new AppsmithException(
+                                                        AppsmithError.GIT_MERGE_FAILED_REMOTE_CHANGES,
+                                                        status.getBehindCount(),
+                                                        destinationBranch));
+                                            } else if (!status.getIsClean()) {
+                                                return Mono.error(new AppsmithException(
+                                                        AppsmithError.GIT_MERGE_FAILED_LOCAL_CHANGES,
+                                                        destinationBranch));
+                                            }
+                                            return status1;
+                                        });
+                            })
+                            .thenReturn(repoSuffix);
+
+                    return Mono.zip(Mono.just(defaultArtifact), pathToFile).onErrorResume(error -> {
+                        log.error("Error in repo status check for application " + defaultArtifactId, error);
+                        if (error instanceof AppsmithException) {
+                            return Mono.error(error);
+                        }
+                        return Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "status", error));
+                    });
+                })
+                .flatMap(tuple -> {
+                    Artifact defaultArtifact = tuple.getT1();
+                    Path repoSuffix = tuple.getT2();
+
+                    // 2. git checkout destinationBranch ---> git merge sourceBranch
+                    return Mono.zip(
+                                    gitExecutor.mergeBranch(repoSuffix, sourceBranch, destinationBranch),
+                                    Mono.just(defaultArtifact))
+                            .onErrorResume(error -> addAnalyticsForGitOperation(
+                                            AnalyticsEvents.GIT_MERGE,
+                                            defaultArtifact,
+                                            error.getClass().getName(),
+                                            error.getMessage(),
+                                            defaultArtifact
+                                                    .getGitArtifactMetadata()
+                                                    .getIsRepoPrivate())
+                                    .flatMap(application -> {
+                                        if (error instanceof GitAPIException) {
+                                            return Mono.error(new AppsmithException(
+                                                    AppsmithError.GIT_MERGE_CONFLICTS, error.getMessage()));
+                                        }
+                                        return Mono.error(new AppsmithException(
+                                                AppsmithError.GIT_ACTION_FAILED, "merge", error.getMessage()));
+                                    }));
+                })
+                .flatMap(mergeStatusTuple -> {
+                    Artifact defaultArtifact = mergeStatusTuple.getT2();
+                    String mergeStatus = mergeStatusTuple.getT1();
+
+                    // 3. rehydrate from file system to db
+                    Mono<? extends ArtifactExchangeJson> artifactExchangeJsonMono =
+                            commonGitFileUtils.reconstructArtifactExchangeJsonFromGitRepo(
+                                    defaultArtifact.getWorkspaceId(),
+                                    defaultArtifact.getGitArtifactMetadata().getDefaultArtifactId(),
+                                    defaultArtifact.getGitArtifactMetadata().getRepoName(),
+                                    destinationBranch,
+                                    artifactType);
+
+                    return Mono.zip(
+                            Mono.just(mergeStatus),
+                            gitArtifactHelper.getArtifactByDefaultIdAndBranchName(
+                                    defaultArtifactId, destinationBranch, artifactEditPermission),
+                            artifactExchangeJsonMono);
+                })
+                .flatMap(tuple -> {
+                    Artifact destinationArtifact = tuple.getT2();
+                    ArtifactExchangeJson artifactExchangeJson = tuple.getT3();
+                    MergeStatusDTO mergeStatusDTO = new MergeStatusDTO();
+                    mergeStatusDTO.setStatus(tuple.getT1());
+                    mergeStatusDTO.setMergeAble(TRUE);
+
+                    // 4. Get the latest application mono with all the changes
+                    return importService
+                            .importArtifactInWorkspaceFromGit(
+                                    destinationArtifact.getWorkspaceId(),
+                                    destinationArtifact.getId(),
+                                    artifactExchangeJson,
+                                    destinationBranch.replaceFirst(ORIGIN, REMOTE_NAME_REPLACEMENT))
+                            .flatMap(artifact -> {
+                                GitCommitDTO commitDTO = new GitCommitDTO();
+                                commitDTO.setDoPush(true);
+                                commitDTO.setCommitMessage(DEFAULT_COMMIT_MESSAGE
+                                        + GitDefaultCommitMessage.SYNC_REMOTE_AFTER_MERGE.getReason()
+                                        + sourceBranch);
+                                return this.commitArtifact(
+                                                commitDTO, defaultArtifactId, destinationBranch, artifactType)
+                                        .map(commitStatus -> mergeStatusDTO)
+                                        .zipWith(Mono.just(artifact));
+                            });
+                })
+                .flatMap(tuple -> {
+                    MergeStatusDTO mergeStatusDTO = tuple.getT1();
+                    Artifact artifact = tuple.getT2();
+
+                    // Send analytics event
+                    return releaseFileLock(defaultArtifactId).flatMap(status -> addAnalyticsForGitOperation(
+                                    AnalyticsEvents.GIT_MERGE,
+                                    artifact,
+                                    artifact.getGitArtifactMetadata().getIsRepoPrivate())
+                            .thenReturn(mergeStatusDTO));
+                })
+                .name(GitSpan.OPS_MERGE_BRANCH)
+                .tap(Micrometer.observation(observationRegistry));
+
+        return Mono.create(sink -> mergeMono.subscribe(sink::success, sink::error, null, sink.currentContext()));
+    }
+
+    @Override
+    public Mono<MergeStatusDTO> isBranchMergeable(
+            String defaultArtifactId, GitMergeDTO gitMergeDTO, ArtifactType artifactType) {
+
+        final String sourceBranch = gitMergeDTO.getSourceBranch();
+        final String destinationBranch = gitMergeDTO.getDestinationBranch();
+
+        if (StringUtils.isEmptyOrNull(sourceBranch) || StringUtils.isEmptyOrNull(destinationBranch)) {
+            return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.BRANCH_NAME));
+        } else if (sourceBranch.startsWith(ORIGIN)) {
+            return Mono.error(
+                    new AppsmithException(AppsmithError.UNSUPPORTED_OPERATION_FOR_REMOTE_BRANCH, sourceBranch));
+        } else if (destinationBranch.startsWith(ORIGIN)) {
+            return Mono.error(
+                    new AppsmithException(AppsmithError.UNSUPPORTED_OPERATION_FOR_REMOTE_BRANCH, destinationBranch));
+        }
+
+        GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(artifactType);
+        AclPermission artifactEditPermission = gitArtifactHelper.getArtifactEditPermission();
+
+        Mono<? extends Artifact> defaultArtifactMono =
+                gitArtifactHelper.getArtifactById(defaultArtifactId, artifactEditPermission);
+
+        Mono<MergeStatusDTO> mergeableStatusMono = defaultArtifactMono.flatMap(artifact -> {
+            GitArtifactMetadata gitArtifactMetadata = artifact.getGitArtifactMetadata();
+            if (isDefaultGitMetadataInvalid(artifact.getGitArtifactMetadata())) {
+                return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_SSH_CONFIGURATION));
+            }
+
+            Path repoSuffix = gitArtifactHelper.getRepoSuffixPath(
+                    artifact.getWorkspaceId(),
+                    gitArtifactMetadata.getDefaultArtifactId(),
+                    gitArtifactMetadata.getRepoName());
+
+            // 1. Hydrate from db to file system for both branch Applications
+            // Update function call
+            return addFileLock(defaultArtifactId)
+                    .flatMap(status -> this.getStatus(defaultArtifactId, sourceBranch, false, artifactType))
+                    .flatMap(srcBranchStatus -> {
+                        if (!Integer.valueOf(0).equals(srcBranchStatus.getBehindCount())) {
+                            return addAnalyticsForGitOperation(
+                                            AnalyticsEvents.GIT_MERGE_CHECK,
+                                            artifact,
+                                            AppsmithError.GIT_MERGE_FAILED_LOCAL_CHANGES.name(),
+                                            AppsmithError.GIT_MERGE_FAILED_LOCAL_CHANGES.getMessage(
+                                                    srcBranchStatus.getBehindCount(), destinationBranch),
+                                            artifact.getGitArtifactMetadata().getIsRepoPrivate(),
+                                            false,
+                                            false)
+                                    .then(Mono.error(Exceptions.propagate(new AppsmithException(
+                                            AppsmithError.GIT_MERGE_FAILED_REMOTE_CHANGES,
+                                            srcBranchStatus.getBehindCount(),
+                                            sourceBranch))));
+                        } else if (!srcBranchStatus.getIsClean()) {
+                            return addAnalyticsForGitOperation(
+                                            AnalyticsEvents.GIT_MERGE_CHECK,
+                                            artifact,
+                                            AppsmithError.GIT_MERGE_FAILED_LOCAL_CHANGES.name(),
+                                            AppsmithError.GIT_MERGE_FAILED_LOCAL_CHANGES.getMessage(destinationBranch),
+                                            artifact.getGitArtifactMetadata().getIsRepoPrivate(),
+                                            false,
+                                            false)
+                                    .then(Mono.error(Exceptions.propagate(new AppsmithException(
+                                            AppsmithError.GIT_MERGE_FAILED_LOCAL_CHANGES, sourceBranch))));
+                        }
+                        return this.getStatus(defaultArtifactId, destinationBranch, false, artifactType)
+                                .map(destBranchStatus -> {
+                                    if (!Integer.valueOf(0).equals(destBranchStatus.getBehindCount())) {
+                                        return addAnalyticsForGitOperation(
+                                                        AnalyticsEvents.GIT_MERGE_CHECK,
+                                                        artifact,
+                                                        AppsmithError.GIT_MERGE_FAILED_REMOTE_CHANGES.name(),
+                                                        AppsmithError.GIT_MERGE_FAILED_REMOTE_CHANGES.getMessage(
+                                                                destBranchStatus.getBehindCount(), destinationBranch),
+                                                        artifact.getGitArtifactMetadata()
+                                                                .getIsRepoPrivate(),
+                                                        false,
+                                                        false)
+                                                .then(Mono.error(Exceptions.propagate(new AppsmithException(
+                                                        AppsmithError.GIT_MERGE_FAILED_REMOTE_CHANGES,
+                                                        destBranchStatus.getBehindCount(),
+                                                        destinationBranch))));
+                                    } else if (!destBranchStatus.getIsClean()) {
+                                        return addAnalyticsForGitOperation(
+                                                        AnalyticsEvents.GIT_MERGE_CHECK,
+                                                        artifact,
+                                                        AppsmithError.GIT_MERGE_FAILED_LOCAL_CHANGES.name(),
+                                                        AppsmithError.GIT_MERGE_FAILED_LOCAL_CHANGES.getMessage(
+                                                                destinationBranch),
+                                                        artifact.getGitArtifactMetadata()
+                                                                .getIsRepoPrivate(),
+                                                        false,
+                                                        false)
+                                                .then(Mono.error(Exceptions.propagate(new AppsmithException(
+                                                        AppsmithError.GIT_MERGE_FAILED_LOCAL_CHANGES,
+                                                        destinationBranch))));
+                                    }
+                                    return destBranchStatus;
+                                });
+                    })
+                    .onErrorResume(error -> {
+                        log.error("Error in merge status check artifact " + defaultArtifactId, error);
+                        if (error instanceof AppsmithException) {
+                            return Mono.error(error);
+                        }
+                        return Mono.error(new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "status", error));
+                    })
+                    .then(gitExecutor
+                            .isMergeBranch(repoSuffix, sourceBranch, destinationBranch)
+                            .flatMap(mergeStatusDTO -> releaseFileLock(defaultArtifactId)
+                                    .flatMap(mergeStatus -> addAnalyticsForGitOperation(
+                                            AnalyticsEvents.GIT_MERGE_CHECK,
+                                            artifact,
+                                            null,
+                                            null,
+                                            artifact.getGitArtifactMetadata().getIsRepoPrivate(),
+                                            false,
+                                            mergeStatusDTO.isMergeAble()))
+                                    .then(Mono.just(mergeStatusDTO))))
+                    .onErrorResume(error -> {
+                        try {
+                            return gitExecutor
+                                    .resetToLastCommit(repoSuffix, destinationBranch)
+                                    .map(reset -> {
+                                        MergeStatusDTO mergeStatus = new MergeStatusDTO();
+                                        mergeStatus.setMergeAble(false);
+                                        mergeStatus.setStatus("Merge check failed!");
+                                        mergeStatus.setMessage(error.getMessage());
+                                        if (error instanceof CheckoutConflictException) {
+                                            mergeStatus.setConflictingFiles(
+                                                    ((CheckoutConflictException) error).getConflictingPaths());
+                                        }
+                                        mergeStatus.setReferenceDoc(
+                                                ErrorReferenceDocUrl.GIT_MERGE_CONFLICT.getDocUrl());
+                                        return mergeStatus;
+                                    })
+                                    .flatMap(mergeStatusDTO -> addAnalyticsForGitOperation(
+                                                    AnalyticsEvents.GIT_MERGE_CHECK,
+                                                    artifact,
+                                                    error.getClass().getName(),
+                                                    error.getMessage(),
+                                                    artifact.getGitArtifactMetadata()
+                                                            .getIsRepoPrivate(),
+                                                    false,
+                                                    false)
+                                            .map(application1 -> mergeStatusDTO));
+                        } catch (GitAPIException | IOException e) {
+                            log.error("Error while resetting to last commit", e);
+                            return Mono.error(new AppsmithException(
+                                    AppsmithError.GIT_ACTION_FAILED, "reset --hard HEAD", e.getMessage()));
+                        }
+                    });
+        });
+
+        return Mono.create(
+                sink -> mergeableStatusMono.subscribe(sink::success, sink::error, null, sink.currentContext()));
+    }
+
+    @Override
+    public Mono<String> createConflictedBranch(String defaultArtifactId, String branchName, ArtifactType artifactType) {
+
+        if (StringUtils.isEmptyOrNull(branchName)) {
+            return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.BRANCH_NAME));
+        }
+
+        GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(artifactType);
+        AclPermission artifactEditPermission = gitArtifactHelper.getArtifactEditPermission();
+        Mono<GitArtifactMetadata> gitArtifactMetadataMono = getGitArtifactMetadata(defaultArtifactId, artifactType);
+
+        Mono<? extends Artifact> branchedArtifactMonoCached = gitArtifactHelper
+                .getArtifactByDefaultIdAndBranchName(defaultArtifactId, branchName, artifactEditPermission)
+                .cache();
+        Mono<? extends ArtifactExchangeJson> artifactExchangeJsonMono = branchedArtifactMonoCached.flatMap(artifact ->
+                exportService.exportByArtifactId(artifact.getId(), VERSION_CONTROL, artifact.getArtifactType()));
+
+        Mono<String> conflictedBranchMono = Mono.zip(
+                        gitArtifactMetadataMono, branchedArtifactMonoCached, artifactExchangeJsonMono)
+                .flatMap(tuple -> {
+                    GitArtifactMetadata gitArtifactMetadata = tuple.getT1();
+                    Artifact branchedArtifact = tuple.getT2();
+                    ArtifactExchangeJson artifactExchangeJson = tuple.getT3();
+                    GitArtifactMetadata branchedGitArtifactMetadata = branchedArtifact.getGitArtifactMetadata();
+                    branchedGitArtifactMetadata.setGitAuth(gitArtifactMetadata.getGitAuth());
+
+                    Path repoSuffix = gitArtifactHelper.getRepoSuffixPath(
+                            branchedArtifact.getWorkspaceId(),
+                            branchedGitArtifactMetadata.getDefaultArtifactId(),
+                            branchedGitArtifactMetadata.getRepoName());
+
+                    try {
+                        return Mono.zip(
+                                commonGitFileUtils.saveArtifactToLocalRepoWithAnalytics(
+                                        repoSuffix, artifactExchangeJson, branchName),
+                                Mono.just(branchedGitArtifactMetadata),
+                                Mono.just(repoSuffix));
+                    } catch (IOException | GitAPIException e) {
+                        return Mono.error(
+                                new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "checkout", e.getMessage()));
+                    }
+                })
+                .flatMap(tuple -> {
+                    GitArtifactMetadata gitData = tuple.getT2();
+                    Path repoSuffix = tuple.getT3();
+                    return gitExecutor
+                            .createAndCheckoutToBranch(repoSuffix, branchName + MERGE_CONFLICT_BRANCH_NAME)
+                            .flatMap(conflictedBranchName -> commitAndPushWithDefaultCommit(
+                                            repoSuffix,
+                                            gitData.getGitAuth(),
+                                            gitData,
+                                            GitDefaultCommitMessage.CONFLICT_STATE)
+                                    .flatMap(successMessage -> gitExecutor.checkoutToBranch(repoSuffix, branchName))
+                                    .flatMap(isCheckedOut -> gitExecutor.deleteBranch(repoSuffix, conflictedBranchName))
+                                    .thenReturn(conflictedBranchName + CONFLICTED_SUCCESS_MESSAGE));
+                });
+
+        return Mono.create(
+                sink -> conflictedBranchMono.subscribe(sink::success, sink::error, null, sink.currentContext()));
+    }
+
+    private Mono<String> commitAndPushWithDefaultCommit(
+            Path repoSuffix, GitAuth auth, GitArtifactMetadata gitArtifactMetadata, GitDefaultCommitMessage reason) {
+        return gitExecutor
+                .commitArtifact(
+                        repoSuffix,
+                        DEFAULT_COMMIT_MESSAGE + reason.getReason(),
+                        APPSMITH_BOT_USERNAME,
+                        emailConfig.getSupportEmailAddress(),
+                        true,
+                        false)
+                .onErrorResume(error -> {
+                    if (error instanceof EmptyCommitException) {
+                        return Mono.just(EMPTY_COMMIT_ERROR_MESSAGE);
+                    }
+                    return Mono.error(
+                            new AppsmithException(AppsmithError.GIT_ACTION_FAILED, "commit", error.getMessage()));
+                })
+                .flatMap(commitMessage -> gitExecutor
+                        .pushApplication(
+                                repoSuffix,
+                                gitArtifactMetadata.getRemoteUrl(),
+                                auth.getPublicKey(),
+                                auth.getPrivateKey(),
+                                gitArtifactMetadata.getBranchName())
+                        .map(pushResult -> {
+                            if (pushResult.contains("REJECTED")) {
+                                throw new AppsmithException(AppsmithError.GIT_UPSTREAM_CHANGES);
+                            }
+                            return pushResult;
+                        }));
+    }
+
+    @Override
+    public Mono<Boolean> testConnection(String defaultArtifactId, ArtifactType artifactType) {
+
+        GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(artifactType);
+        AclPermission artifactEditPermission = gitArtifactHelper.getArtifactEditPermission();
+
+        return gitArtifactHelper
+                .getArtifactById(defaultArtifactId, artifactEditPermission)
+                .flatMap(artifact -> {
+                    GitArtifactMetadata gitArtifactMetadata = artifact.getGitArtifactMetadata();
+                    if (isDefaultGitMetadataInvalid(gitArtifactMetadata)) {
+                        return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_SSH_CONFIGURATION));
+                    }
+                    return gitExecutor
+                            .testConnection(
+                                    gitArtifactMetadata.getGitAuth().getPublicKey(),
+                                    gitArtifactMetadata.getGitAuth().getPrivateKey(),
+                                    gitArtifactMetadata.getRemoteUrl())
+                            .zipWith(Mono.just(artifact))
+                            .onErrorResume(error -> {
+                                log.error(
+                                        "Error while testing the connection to th remote repo "
+                                                + gitArtifactMetadata.getRemoteUrl() + " ",
+                                        error);
+                                return addAnalyticsForGitOperation(
+                                                AnalyticsEvents.GIT_TEST_CONNECTION,
+                                                artifact,
+                                                error.getClass().getName(),
+                                                error.getMessage(),
+                                                artifact.getGitArtifactMetadata()
+                                                        .getIsRepoPrivate())
+                                        .flatMap(application1 -> {
+                                            if (error instanceof TransportException) {
+                                                return Mono.error(new AppsmithException(
+                                                        AppsmithError.INVALID_GIT_SSH_CONFIGURATION));
+                                            }
+                                            if (error instanceof InvalidRemoteException) {
+                                                return Mono.error(new AppsmithException(
+                                                        AppsmithError.INVALID_GIT_CONFIGURATION, error.getMessage()));
+                                            }
+                                            if (error instanceof TimeoutException) {
+                                                return Mono.error(
+                                                        new AppsmithException(AppsmithError.GIT_EXECUTION_TIMEOUT));
+                                            }
+                                            return Mono.error(new AppsmithException(
+                                                    AppsmithError.GIT_GENERIC_ERROR, error.getMessage()));
+                                        });
+                            });
+                })
+                .flatMap(objects -> {
+                    Artifact artifact = objects.getT2();
+                    return addAnalyticsForGitOperation(
+                                    AnalyticsEvents.GIT_TEST_CONNECTION,
+                                    artifact,
+                                    artifact.getGitArtifactMetadata().getIsRepoPrivate())
+                            .thenReturn(objects.getT1());
+                });
+    }
+
+    /**
+     * In some scenarios:
+     * connect: after loading the modal, keyTypes is not available, so a network call has to be made to ssh-keypair.
+     * import: cannot make a ssh-keypair call because application Id doesn’t exist yet, so API fails.
+     *
+     * @return Git docs urls for all the scenarios, client will cache this data and use it
+     */
+    @Override
+    public Mono<List<GitDocsDTO>> getGitDocUrls() {
+        ErrorReferenceDocUrl[] docSet = ErrorReferenceDocUrl.values();
+        List<GitDocsDTO> gitDocsDTOList = new ArrayList<>();
+        for (ErrorReferenceDocUrl docUrl : docSet) {
+            GitDocsDTO gitDocsDTO = new GitDocsDTO();
+            gitDocsDTO.setDocKey(docUrl);
+            gitDocsDTO.setDocUrl(docUrl.getDocUrl());
+            gitDocsDTOList.add(gitDocsDTO);
+        }
+        return Mono.just(gitDocsDTOList);
+    }
+
+    @Override
+    public Mono<List<GitBranchDTO>> listBranchForArtifact(
+            String defaultArtifactId, Boolean pruneBranches, String currentBranch, ArtifactType artifactType) {
+        return getBranchList(defaultArtifactId, pruneBranches, currentBranch, true, artifactType);
+    }
+
+    protected Mono<List<GitBranchDTO>> getBranchList(
+            String defaultArtifactId,
+            Boolean pruneBranches,
+            String currentBranch,
+            boolean syncDefaultBranchWithRemote,
+            ArtifactType artifactType) {
+
+        // get the root artifact
+        GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(artifactType);
+        AclPermission artifactEditPermission = gitArtifactHelper.getArtifactEditPermission();
+
+        Mono<? extends Artifact> defaultArtifactMono =
+                gitArtifactHelper.getArtifactById(defaultArtifactId, artifactEditPermission);
+
+        Mono<List<GitBranchDTO>> branchMono = defaultArtifactMono
+                .flatMap(defaultArtifact -> {
+                    GitArtifactMetadata gitArtifactMetadata = defaultArtifact.getGitArtifactMetadata();
+                    if (gitArtifactMetadata == null
+                            || gitArtifactMetadata.getDefaultArtifactId() == null
+                            || gitArtifactMetadata.getRepoName() == null) {
+                        log.error("Git config is not present for application {}", defaultArtifact.getId());
+                        throw new AppsmithException(AppsmithError.INVALID_GIT_CONFIGURATION, GIT_CONFIG_ERROR);
+                    }
+
+                    Path repoPath = gitArtifactHelper.getRepoSuffixPath(
+                            defaultArtifact.getWorkspaceId(),
+                            gitArtifactMetadata.getDefaultArtifactId(),
+                            gitArtifactMetadata.getRepoName());
+
+                    Mono<String> defaultBranchMono;
+
+                    if (TRUE.equals(pruneBranches) && syncDefaultBranchWithRemote) {
+                        defaultBranchMono = syncDefaultBranchNameFromRemote(defaultArtifact, repoPath);
+                    } else {
+                        defaultBranchMono =
+                                Mono.just(GitUtils.getDefaultBranchName(defaultArtifact.getGitArtifactMetadata()));
+                    }
+                    return Mono.zip(defaultBranchMono, Mono.just(defaultArtifact), Mono.just(repoPath));
+                })
+                .flatMap(objects -> {
+                    String defaultBranchName = objects.getT1();
+                    Artifact defaultApplication = objects.getT2();
+                    Path repoPath = objects.getT3();
+                    return getBranchListWithDefaultBranchName(
+                            defaultApplication, repoPath, defaultBranchName, currentBranch, pruneBranches);
+                })
+                .onErrorResume(throwable -> {
+                    if (throwable instanceof RepositoryNotFoundException) {
+                        // this will clone the repo again
+                        return handleRepoNotFoundException(defaultArtifactId, artifactType);
+                    }
+                    return Mono.error(throwable);
+                });
+
+        return Mono.create(sink -> branchMono.subscribe(sink::success, sink::error, null, sink.currentContext()));
+    }
+
+    private Mono<String> syncDefaultBranchNameFromRemote(Artifact defaultArtifact, Path repoPath) {
+        GitArtifactMetadata metadata = defaultArtifact.getGitArtifactMetadata();
+        GitAuth gitAuth = metadata.getGitAuth();
+        return addFileLock(metadata.getDefaultArtifactId())
+                .then(gitExecutor.getRemoteDefaultBranch(
+                        repoPath, metadata.getRemoteUrl(), gitAuth.getPrivateKey(), gitAuth.getPublicKey()))
+                .flatMap(defaultBranchNameInRemote -> {
+                    String defaultBranchInDb = GitUtils.getDefaultBranchName(metadata);
+                    if (StringUtils.isEmptyOrNull(defaultBranchNameInRemote)) {
+                        // If the default branch name in remote is empty or same as the one in DB, nothing to do
+                        return Mono.just(defaultBranchInDb);
+                    }
+                    // check if default branch has been changed in remote
+                    if (defaultBranchNameInRemote.equals(defaultBranchInDb)) {
+                        return Mono.just(defaultBranchNameInRemote);
+                    }
+
+                    return updateDefaultBranchName(
+                                    metadata.getDefaultArtifactId(),
+                                    defaultBranchNameInRemote,
+                                    repoPath,
+                                    defaultArtifact.getArtifactType())
+                            .then()
+                            .thenReturn(defaultBranchNameInRemote);
+                })
+                .flatMap(branchName ->
+                        releaseFileLock(metadata.getDefaultArtifactId()).thenReturn(branchName));
+    }
+
+    private Flux<? extends Artifact> updateDefaultBranchName(
+            String defaultArtifactId, String defaultBranchName, Path repoPath, ArtifactType artifactType) {
+        // Get the artifact from DB by new defaultBranch name
+        GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(artifactType);
+        AclPermission artifactEditPermission = gitArtifactHelper.getArtifactEditPermission();
+        Mono<Artifact> artifactMono = gitArtifactHelper
+                .getArtifactByDefaultIdAndBranchName(defaultArtifactId, defaultBranchName, artifactEditPermission)
+                .map(artifact -> (Artifact) artifact);
+
+        Mono<? extends Artifact> fallbackArtifactMono =
+                Mono.defer(() -> checkoutRemoteBranch(defaultArtifactId, defaultBranchName, artifactType));
+
+        // Check if the branch is already present, If not follow checkout remote flow
+        return artifactMono
+                .onErrorResume(throwable -> fallbackArtifactMono)
+                // ensure the local branch exists
+                .then(gitExecutor
+                        .createAndCheckoutToBranch(repoPath, defaultBranchName)
+                        .onErrorComplete())
+                // Update the default branch name in all the child applications
+                .thenMany(gitArtifactHelper.getAllArtifactByDefaultId(defaultArtifactId, artifactEditPermission))
+                .flatMap(artifact -> {
+                    artifact.getGitArtifactMetadata().setDefaultBranchName(defaultBranchName);
+                    // clear the branch protection rules as the default branch name has been changed
+                    artifact.getGitArtifactMetadata().setBranchProtectionRules(null);
+                    return gitArtifactHelper.saveArtifact(artifact);
+                });
+    }
+
+    private Mono<List<GitBranchDTO>> handleRepoNotFoundException(String defaultArtifactId, ArtifactType artifactType) {
+
+        // clone application to the local filesystem again and update the defaultBranch for the application
+        // list branch and compare with branch applications and checkout if not exists
+
+        // get the root artifact
+        GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(artifactType);
+        AclPermission artifactEditPermission = gitArtifactHelper.getArtifactEditPermission();
+        AclPermission artifactReadPermission = gitArtifactHelper.getArtifactReadPermission();
+
+        Mono<? extends Artifact> defaultArtifactMono =
+                gitArtifactHelper.getArtifactById(defaultArtifactId, artifactEditPermission);
+
+        return defaultArtifactMono.flatMap(defaultArtifact -> {
+            GitArtifactMetadata gitArtifactMetadata = defaultArtifact.getGitArtifactMetadata();
+            Path repoPath = gitArtifactHelper.getRepoSuffixPath(
+                    defaultArtifact.getWorkspaceId(), defaultArtifact.getId(), gitArtifactMetadata.getRepoName());
+            GitAuth gitAuth = gitArtifactMetadata.getGitAuth();
+            return gitExecutor
+                    .cloneRemoteIntoArtifactRepo(
+                            repoPath,
+                            gitArtifactMetadata.getRemoteUrl(),
+                            gitAuth.getPrivateKey(),
+                            gitAuth.getPublicKey())
+                    .flatMap(defaultBranch -> gitExecutor.listBranches(repoPath))
+                    .flatMap(gitBranchDTOList -> {
+                        List<String> branchesToCheckout = new ArrayList<>();
+                        for (GitBranchDTO gitBranchDTO : gitBranchDTOList) {
+                            if (gitBranchDTO.getBranchName().startsWith("origin/")) {
+                                // remove origin/ prefix from the remote branch name
+                                String branchName = gitBranchDTO.getBranchName().replace("origin/", "");
+                                // The root defaultArtifact is always there, no need to check out it again
+                                if (!branchName.equals(gitArtifactMetadata.getBranchName())) {
+                                    branchesToCheckout.add(branchName);
+                                }
+                            } else if (gitBranchDTO
+                                    .getBranchName()
+                                    .equals(gitArtifactMetadata.getDefaultBranchName())) {
+                                /*
+                                 We just cloned from the remote default branch.
+                                 Update the isDefault flag If it's also set as default in DB
+                                */
+                                gitBranchDTO.setDefault(true);
+                            }
+                        }
+
+                        return Flux.fromIterable(branchesToCheckout)
+                                .flatMap(branchName -> gitArtifactHelper
+                                        .getArtifactByDefaultIdAndBranchName(
+                                                defaultArtifactId, branchName, artifactReadPermission)
+                                        // checkout the branch locally
+                                        .flatMap(artifact -> {
+                                            // Add the locally checked out branch to the branchList
+                                            GitBranchDTO gitBranchDTO = new GitBranchDTO();
+                                            gitBranchDTO.setBranchName(branchName);
+                                            // set the default branch flag if there's a match.
+                                            // This can happen when user has changed the default branch other
+                                            // than
+                                            // remote
+                                            gitBranchDTO.setDefault(gitArtifactMetadata
+                                                    .getDefaultBranchName()
+                                                    .equals(branchName));
+                                            gitBranchDTOList.add(gitBranchDTO);
+                                            return gitExecutor.checkoutRemoteBranch(repoPath, branchName);
+                                        })
+                                        // Return empty mono when the branched defaultArtifact is not in db
+                                        .onErrorResume(throwable -> Mono.empty()))
+                                .then(Mono.just(gitBranchDTOList));
+                    });
+        });
+    }
+
+    private Mono<List<GitBranchDTO>> getBranchListWithDefaultBranchName(
+            Artifact defaultArtifact,
+            Path repoPath,
+            String defaultBranchName,
+            String currentBranch,
+            boolean pruneBranches) {
+        return addFileLock(defaultArtifact.getId())
+                .flatMap(objects -> {
+                    GitArtifactMetadata gitArtifactMetadata = defaultArtifact.getGitArtifactMetadata();
+
+                    if (TRUE.equals(pruneBranches)) {
+                        return gitExecutor
+                                .fetchRemote(
+                                        repoPath,
+                                        gitArtifactMetadata.getGitAuth().getPublicKey(),
+                                        gitArtifactMetadata.getGitAuth().getPrivateKey(),
+                                        false,
+                                        currentBranch,
+                                        true)
+                                .then(gitExecutor.listBranches(repoPath));
+                    } else {
+                        return gitExecutor.listBranches(repoPath);
+                    }
+                })
+                .flatMap(branchDTOList ->
+                        releaseFileLock(defaultArtifact.getId()).thenReturn(branchDTOList))
+                .map(branchDTOList -> {
+                    for (GitBranchDTO branchDTO : branchDTOList) {
+                        if (StringUtils.equalsIgnoreCase(branchDTO.getBranchName(), defaultBranchName)) {
+                            branchDTO.setDefault(true);
+                            break;
+                        }
+                    }
+                    return branchDTOList;
+                })
+                .flatMap(gitBranchDTOList -> FALSE.equals(pruneBranches)
+                        ? Mono.just(gitBranchDTOList)
+                        : addAnalyticsForGitOperation(
+                                        AnalyticsEvents.GIT_PRUNE,
+                                        defaultArtifact,
+                                        defaultArtifact.getGitArtifactMetadata().getIsRepoPrivate())
+                                .thenReturn(gitBranchDTOList));
+    }
+
+    @Override
+    public Mono<List<String>> getProtectedBranches(String defaultArtifactId, ArtifactType artifactType) {
+
+        GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(artifactType);
+        AclPermission artifactEditPermission = gitArtifactHelper.getArtifactEditPermission();
+
+        Mono<? extends Artifact> defaultArtifactMono =
+                gitArtifactHelper.getArtifactById(defaultArtifactId, artifactEditPermission);
+
+        return defaultArtifactMono.map(defaultArtifact -> {
+            GitArtifactMetadata gitArtifactMetadata = defaultArtifact.getGitArtifactMetadata();
+            /*
+             user may have multiple branches as protected, but we only return the default branch
+             as protected branch if it's present in the list of protected branches
+            */
+            List<String> protectedBranches = gitArtifactMetadata.getBranchProtectionRules();
+            String defaultBranchName = gitArtifactMetadata.getDefaultBranchName();
+
+            if (!CollectionUtils.isNullOrEmpty(protectedBranches) && protectedBranches.contains(defaultBranchName)) {
+                return List.of(defaultBranchName);
+            } else {
+                return List.of();
+            }
+        });
+    }
+
+    /**
+     * This method is context aware
+     * @param defaultArtifactId : id of the root application
+     * @param branchName : branch name on which autocommit has to be done
+     * @param artifactType : type of artifact, this is application for now.
+     * @return flag whether the process has started or not.
+     */
+    @Override
+    public Mono<Boolean> autoCommitApplication(String defaultArtifactId, String branchName, ArtifactType artifactType) {
+        return gitAutoCommitHelper.autoCommitApplication(defaultArtifactId, branchName);
+    }
+
+    @Override
+    public Mono<AutoCommitProgressDTO> getAutoCommitProgress(String artifactId, ArtifactType artifactType) {
+        return gitAutoCommitHelper.getAutoCommitProgress(artifactId);
+    }
+
+    @Override
+    public Mono<Boolean> toggleAutoCommitEnabled(String defaultArtifactId, ArtifactType artifactType) {
+
+        GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(artifactType);
+        AclPermission artifactAutoCommitPermission = gitArtifactHelper.getArtifactAutoCommitPermission();
+
+        Mono<? extends Artifact> defaultArtifactMono =
+                gitArtifactHelper.getArtifactById(defaultArtifactId, artifactAutoCommitPermission);
+
+        return defaultArtifactMono
+                .map(defaultArtifact -> {
+                    GitArtifactMetadata gitArtifactMetadata = defaultArtifact.getGitArtifactMetadata();
+                    if (!defaultArtifact.getId().equals(gitArtifactMetadata.getDefaultArtifactId())) {
+                        log.error(
+                                "failed tp toggle auto commit. reason: {} is not the root defaultArtifact id",
+                                defaultArtifactId);
+                        throw new AppsmithException(AppsmithError.INVALID_PARAMETER, "default defaultArtifact id");
+                    }
+
+                    AutoCommitConfig autoCommitConfig = gitArtifactMetadata.getAutoCommitConfig();
+                    if (autoCommitConfig.getEnabled()) {
+                        autoCommitConfig.setEnabled(FALSE);
+                    } else {
+                        autoCommitConfig.setEnabled(TRUE);
+                    }
+                    // need to call the setter because getter returns a default config if attribute is null
+                    defaultArtifact.getGitArtifactMetadata().setAutoCommitConfig(autoCommitConfig);
+                    return defaultArtifact;
+                })
+                .flatMap(defaultArtifact -> gitArtifactHelper
+                        .saveArtifact(defaultArtifact)
+                        .thenReturn(defaultArtifact
+                                .getGitArtifactMetadata()
+                                .getAutoCommitConfig()
+                                .getEnabled()));
+    }
+
+    @Override
+    public Mono<List<String>> updateProtectedBranches(
+            String defaultArtifactId, List<String> branchNames, ArtifactType artifactType) {
+
+        GitArtifactHelper<?> gitArtifactHelper = getArtifactGitService(artifactType);
+        AclPermission artifactManageProtectedBranchPermission =
+                gitArtifactHelper.getArtifactManageProtectedBranchPermission();
+
+        Mono<? extends Artifact> defaultArtifactMono =
+                gitArtifactHelper.getArtifactById(defaultArtifactId, artifactManageProtectedBranchPermission);
+
+        return defaultArtifactMono
+                .flatMap(defaultArtifact -> {
+                    GitArtifactMetadata metadata = defaultArtifact.getGitArtifactMetadata();
+                    String defaultBranchName = metadata.getDefaultBranchName();
+
+                    if (branchNames.isEmpty()
+                            || (branchNames.size() == 1 && branchNames.get(0).equals(defaultBranchName))) {
+                        // keep a copy of old protected branches as it's required to send analytics event later
+                        List<String> oldProtectedBranches = metadata.getBranchProtectionRules() != null
+                                ? metadata.getBranchProtectionRules()
+                                : List.of();
+
+                        // user wants to unprotect all branches or user wants to protect only default branch
+                        metadata.setBranchProtectionRules(branchNames);
+                        return gitArtifactHelper
+                                .saveArtifact(defaultArtifact)
+                                .then(gitArtifactHelper.updateArtifactWithProtectedBranches(
+                                        defaultArtifactId, branchNames))
+                                .then(sendBranchProtectionAnalytics(defaultArtifact, oldProtectedBranches, branchNames))
+                                .thenReturn(branchNames);
+                    } else {
+                        // user want to protect multiple branches, not allowed
+                        return Mono.error(new AppsmithException(AppsmithError.UNSUPPORTED_OPERATION));
+                    }
+                })
+                .as(transactionalOperator::transactional);
+    }
+
+    /**
+     * Sends one or more analytics events when there's a change in protected branches.
+     * If n number of branches are un-protected and m number of branches are protected, it'll send m+n number of
+     * events. It receives the list of branches before and after the action.
+     * For example, if user has "main" and "develop" branches as protected and wants to include "staging" branch as
+     * protected as well, then oldProtectedBranches will be ["main", "develop"] and newProtectedBranches will be
+     * ["main", "develop", "staging"]
+     *
+     * @param artifact          Application object of the root artifact
+     * @param oldProtectedBranches List of branches that were protected before this action.
+     * @param newProtectedBranches List of branches that are going to be protected.
+     * @return An empty Mono
+     */
+    protected Mono<Void> sendBranchProtectionAnalytics(
+            Artifact artifact, List<String> oldProtectedBranches, List<String> newProtectedBranches) {
+        List<String> itemsAdded = new ArrayList<>(newProtectedBranches); // add all new items
+        itemsAdded.removeAll(oldProtectedBranches); // remove the items that were present earlier
+
+        List<String> itemsRemoved = new ArrayList<>(oldProtectedBranches); // add all old items
+        itemsRemoved.removeAll(newProtectedBranches); // remove the items that are also present in new list
+
+        List<Mono<? extends Artifact>> eventSenderMonos = new ArrayList<>();
+
+        // send an analytics event for each removed branch
+        for (String branchName : itemsRemoved) {
+            eventSenderMonos.add(addAnalyticsForGitOperation(GIT_REMOVE_PROTECTED_BRANCH, branchName, artifact));
+        }
+
+        // send an analytics event for each newly protected branch
+        for (String branchName : itemsAdded) {
+            eventSenderMonos.add(addAnalyticsForGitOperation(GIT_ADD_PROTECTED_BRANCH, branchName, artifact));
+        }
+
+        return Flux.merge(eventSenderMonos).then();
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitArtifactHelperCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitArtifactHelperCE.java
index 76c487f17d..3d1d75fbea 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitArtifactHelperCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitArtifactHelperCE.java
@@ -2,6 +2,7 @@ package com.appsmith.server.services.ce;
 
 import com.appsmith.server.acl.AclPermission;
 import com.appsmith.server.domains.Artifact;
+import com.appsmith.server.dtos.GitAuthDTO;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -11,23 +12,41 @@ import java.util.List;
 
 public interface GitArtifactHelperCE<T extends Artifact> {
 
+    AclPermission getArtifactReadPermission();
+
     AclPermission getArtifactEditPermission();
 
     AclPermission getArtifactGitConnectPermission();
 
+    AclPermission getArtifactAutoCommitPermission();
+
+    AclPermission getArtifactManageProtectedBranchPermission();
+
+    AclPermission getArtifactManageDefaultBranchPermission();
+
     Mono<T> getArtifactById(String artifactId, AclPermission aclPermission);
 
     Mono<T> getArtifactByDefaultIdAndBranchName(
             String defaultArtifactId, String branchName, AclPermission aclPermission);
 
+    Flux<T> getAllArtifactByDefaultId(String defaultArtifactId, AclPermission aclPermission);
+
+    Mono<GitAuthDTO> getSshKeys(String defaultArtifactId);
+
+    Mono<T> createNewArtifactForCheckout(Artifact sourceArtifact, String branchName);
+
     Mono<T> saveArtifact(Artifact artifact);
 
     Mono<T> updateArtifactWithSchemaVersions(Artifact artifact);
 
+    Mono<Void> updateArtifactWithProtectedBranches(String defaultArtifactId, List<String> branchNames);
+
     T updateArtifactWithDefaultReponseUtils(Artifact artifact);
 
     Flux<T> deleteAllBranches(String defaultArtifactId, List<String> branches);
 
+    Mono<T> deleteArtifactByResource(Artifact artifact);
+
     void resetAttributeInDefaultArtifact(Artifact defaultArtifact);
 
     Mono<T> disconnectEntitiesOfDefaultArtifact(Artifact artifact);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCE.java
index 18e09fa187..20fae6cafe 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCE.java
@@ -66,6 +66,7 @@ public interface GitServiceCE {
 
     Mono<String> createConflictedBranch(String defaultApplicationId, String branchName);
 
+    // TODO
     Mono<ApplicationImportDTO> importApplicationFromGit(String organisationId, GitConnectDTO gitConnectDTO);
 
     Mono<GitAuth> generateSSHKey(String keyType);
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 c8aeee333c..dff84f4ebc 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
@@ -3077,11 +3077,11 @@ public class GitServiceCEImpl implements GitServiceCE {
                                 auth.getPublicKey(),
                                 auth.getPrivateKey(),
                                 gitArtifactMetadata.getBranchName())
-                        .map(pushResult -> {
+                        .flatMap(pushResult -> {
                             if (pushResult.contains("REJECTED")) {
-                                throw new AppsmithException(AppsmithError.GIT_UPSTREAM_CHANGES);
+                                return Mono.error(new AppsmithException(AppsmithError.GIT_UPSTREAM_CHANGES));
                             }
-                            return pushResult;
+                            return Mono.just(pushResult);
                         }));
     }
 
@@ -3184,7 +3184,7 @@ public class GitServiceCEImpl implements GitServiceCE {
 
                                 GitPullDTO gitPullDTO = new GitPullDTO();
                                 gitPullDTO.setMergeStatus(status);
-                                gitPullDTO.setApplication(
+                                gitPullDTO.setArtifact(
                                         responseUtils.updateApplicationWithDefaultResources(application));
 
                                 // Make commit and push after pull is successful to have a clean repo
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce_compatible/CommonGitServiceCECompatibleImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce_compatible/CommonGitServiceCECompatibleImpl.java
index 6db46bf0ff..040fec47d0 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce_compatible/CommonGitServiceCECompatibleImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce_compatible/CommonGitServiceCECompatibleImpl.java
@@ -1,12 +1,15 @@
 package com.appsmith.server.services.ce_compatible;
 
 import com.appsmith.external.git.GitExecutor;
+import com.appsmith.server.configurations.EmailConfig;
 import com.appsmith.server.domains.Application;
 import com.appsmith.server.exports.internal.ExportService;
 import com.appsmith.server.helpers.CommonGitFileUtils;
 import com.appsmith.server.helpers.GitPrivateRepoHelper;
 import com.appsmith.server.helpers.RedisUtils;
+import com.appsmith.server.helpers.ce.GitAutoCommitHelper;
 import com.appsmith.server.imports.internal.ImportService;
+import com.appsmith.server.repositories.GitDeployKeysRepository;
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.GitArtifactHelper;
 import com.appsmith.server.services.SessionUserService;
@@ -16,36 +19,45 @@ import com.appsmith.server.services.ce.CommonGitServiceCEImpl;
 import io.micrometer.observation.ObservationRegistry;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.reactive.TransactionalOperator;
 
 @Slf4j
 @Service
 public class CommonGitServiceCECompatibleImpl extends CommonGitServiceCEImpl implements CommonGitServiceCECompatible {
 
     public CommonGitServiceCECompatibleImpl(
+            GitDeployKeysRepository gitDeployKeysRepository,
             GitPrivateRepoHelper gitPrivateRepoHelper,
             CommonGitFileUtils commonGitFileUtils,
             RedisUtils redisUtils,
             SessionUserService sessionUserService,
             UserDataService userDataService,
             UserService userService,
+            EmailConfig emailConfig,
+            TransactionalOperator transactionalOperator,
             AnalyticsService analyticsService,
             ObservationRegistry observationRegistry,
             ExportService exportService,
             ImportService importService,
             GitExecutor gitExecutor,
-            GitArtifactHelper<Application> gitApplicationHelper) {
+            GitArtifactHelper<Application> gitApplicationHelper,
+            GitAutoCommitHelper gitAutoCommitHelper) {
         super(
+                gitDeployKeysRepository,
                 gitPrivateRepoHelper,
                 commonGitFileUtils,
                 redisUtils,
                 sessionUserService,
                 userDataService,
                 userService,
+                emailConfig,
+                transactionalOperator,
                 analyticsService,
                 observationRegistry,
                 exportService,
                 importService,
                 gitExecutor,
-                gitApplicationHelper);
+                gitApplicationHelper,
+                gitAutoCommitHelper);
     }
 }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/controllers/PageControllerTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/controllers/PageControllerTest.java
new file mode 100644
index 0000000000..365d84bedc
--- /dev/null
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/controllers/PageControllerTest.java
@@ -0,0 +1,120 @@
+package com.appsmith.server.controllers;
+
+import com.appsmith.server.configurations.SecurityTestConfig;
+import com.appsmith.server.dtos.PageDTO;
+import com.appsmith.server.newpages.base.NewPageService;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Import;
+import org.springframework.http.MediaType;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.web.reactive.server.WebTestClient;
+import org.springframework.web.reactive.function.BodyInserters;
+import reactor.core.publisher.Mono;
+
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+
+@SpringBootTest
+@AutoConfigureWebTestClient
+@Import({SecurityTestConfig.class})
+public class PageControllerTest {
+
+    @Autowired
+    private WebTestClient client;
+
+    @MockBean
+    private NewPageService newPageService;
+
+    @Test
+    @WithMockUser
+    void noBody() {
+        client.put().uri("/api/v1/pages/abcdef").exchange().expectStatus().isBadRequest();
+    }
+
+    @ParameterizedTest
+    @ValueSource(
+            strings = {
+                "../mal", "..\\mal", "/mal", "C:\\mal", "mal/", "/mal/", "\\mal", "mal\\", "\\mal\\", ":mal", ":mal/",
+                ":mal\\", "",
+            })
+    @WithMockUser
+    void invalidName(String name) {
+        client.put()
+                .uri("/api/v1/pages/abcdef")
+                .contentType(MediaType.APPLICATION_JSON)
+                .body(BodyInserters.fromValue(Map.of("name", name)))
+                .exchange()
+                .expectStatus()
+                .isBadRequest()
+                .expectBody()
+                .jsonPath("$.errorDisplay")
+                .value(s -> assertThat((String) s).contains("Validation Failure"));
+
+        verifyNoInteractions(newPageService);
+    }
+
+    @ParameterizedTest
+    @ValueSource(
+            strings = {
+                "../mal",
+                "..\\mal",
+                "/mal",
+                "C:\\mal",
+                "mal/",
+                "/mal/",
+                "\\mal",
+                "mal\\",
+                "\\mal\\",
+                ":mal",
+                ":mal/",
+                ":mal\\",
+                "spaced content",
+                "newline\ncontent",
+                "  untrimmed  ",
+            })
+    @WithMockUser
+    void invalidCustomSlug(String slug) {
+        client.put()
+                .uri("/api/v1/pages/abcdef")
+                .contentType(MediaType.APPLICATION_JSON)
+                .body(BodyInserters.fromValue(Map.of("customSlug", slug)))
+                .exchange()
+                .expectStatus()
+                .isBadRequest()
+                .expectBody()
+                .jsonPath("$.errorDisplay")
+                .value(s -> assertThat((String) s).contains("Validation Failure"));
+
+        verifyNoInteractions(newPageService);
+    }
+
+    @Test
+    @WithMockUser
+    void emptyCustomSlugShouldBeOkay() {
+        doReturn(Mono.just(new PageDTO()))
+                .when(newPageService)
+                .updatePageByDefaultPageIdAndBranch(anyString(), any(), anyString());
+
+        client.put()
+                .uri("/api/v1/pages/abcdef")
+                .contentType(MediaType.APPLICATION_JSON)
+                .body(BodyInserters.fromValue(Map.of("customSlug", "")))
+                .exchange();
+
+        verify(newPageService, times(1)).updatePageByDefaultPageIdAndBranch(eq("abcdef"), any(), eq(null));
+    }
+}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/AppsmithErrorTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/AppsmithErrorTest.java
index 0f04932802..ef4b630a2e 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/AppsmithErrorTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/AppsmithErrorTest.java
@@ -6,18 +6,26 @@ import org.junit.jupiter.api.Test;
 import org.springframework.dao.DuplicateKeyException;
 
 import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class AppsmithErrorTest {
     @Test
     public void verifyUniquenessOfAppsmithErrorCode() {
-        assert (Arrays.stream(AppsmithError.values())
-                        .map(AppsmithError::getAppErrorCode)
-                        .distinct()
-                        .count()
-                == AppsmithError.values().length);
+        final List<String> duplicateErrorCodes = Arrays.stream(AppsmithError.values())
+                .collect(Collectors.groupingBy(AppsmithError::getAppErrorCode, Collectors.counting()))
+                .entrySet()
+                .stream()
+                .filter(entry -> entry.getValue() > 1)
+                .map(Map.Entry::getKey)
+                .toList();
+
+        assertThat(duplicateErrorCodes).isEmpty();
     }
 
     @Test
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/ApplicationSnapshotRepositoryTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/ApplicationSnapshotRepositoryTest.java
index fc2ebf225e..25fcc546d9 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/ApplicationSnapshotRepositoryTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/ApplicationSnapshotRepositoryTest.java
@@ -1,7 +1,7 @@
 package com.appsmith.server.repositories;
 
 import com.appsmith.server.domains.ApplicationSnapshot;
-import com.google.gson.Gson;
+import com.appsmith.server.projections.ApplicationSnapshotResponseDTO;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -20,9 +20,6 @@ public class ApplicationSnapshotRepositoryTest {
     @Autowired
     private ApplicationSnapshotRepository applicationSnapshotRepository;
 
-    @Autowired
-    private Gson gson;
-
     @Test
     @WithUserDetails("api_user")
     public void findWithoutData_WhenMatched_ReturnsMatchedDocumentWithoutData() {
@@ -38,15 +35,13 @@ public class ApplicationSnapshotRepositoryTest {
         snapshot2.setApplicationId(testAppId2);
         snapshot2.setChunkOrder(1);
 
-        Mono<ApplicationSnapshot> snapshotMono = applicationSnapshotRepository
+        Mono<ApplicationSnapshotResponseDTO> snapshotMono = applicationSnapshotRepository
                 .saveAll(List.of(snapshot1, snapshot2))
-                .then(applicationSnapshotRepository.findWithoutData(testAppId2));
+                .then(applicationSnapshotRepository.findByApplicationIdAndChunkOrder(testAppId2, 1));
 
         StepVerifier.create(snapshotMono)
                 .assertNext(applicationSnapshot -> {
-                    assertThat(applicationSnapshot.getApplicationId()).isEqualTo(testAppId2);
-                    assertThat(applicationSnapshot.getData()).isNull();
-                    assertThat(applicationSnapshot.getChunkOrder()).isEqualTo(1);
+                    assertThat(applicationSnapshot.updatedAt()).isNotNull();
                 })
                 .verifyComplete();
     }
@@ -65,14 +60,13 @@ public class ApplicationSnapshotRepositoryTest {
         snapshot2.setApplicationId(testAppId1);
         snapshot2.setChunkOrder(2);
 
-        Mono<ApplicationSnapshot> snapshotMono = applicationSnapshotRepository
+        Mono<ApplicationSnapshotResponseDTO> snapshotMono = applicationSnapshotRepository
                 .saveAll(List.of(snapshot1, snapshot2))
-                .then(applicationSnapshotRepository.findWithoutData(testAppId1));
+                .then(applicationSnapshotRepository.findByApplicationIdAndChunkOrder(testAppId1, 1));
 
         StepVerifier.create(snapshotMono)
                 .assertNext(applicationSnapshot -> {
-                    assertThat(applicationSnapshot.getApplicationId()).isEqualTo(testAppId1);
-                    assertThat(applicationSnapshot.getChunkOrder()).isEqualTo(1);
+                    assertThat(applicationSnapshot.updatedAt()).isNotNull();
                 })
                 .verifyComplete();
     }
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 ac76c01e7e..08dd28a190 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
@@ -10,6 +10,7 @@ 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.projections.ApplicationSnapshotResponseDTO;
 import com.appsmith.server.repositories.ApplicationSnapshotRepository;
 import com.appsmith.server.solutions.ApplicationPermission;
 import org.junit.jupiter.api.AfterEach;
@@ -91,7 +92,7 @@ public class ApplicationSnapshotServiceTest {
         Application testApplication = new Application();
         testApplication.setName("Test app for snapshot");
         testApplication.setWorkspaceId(workspace.getId());
-        Mono<ApplicationSnapshot> snapshotMono = applicationPageService
+        Mono<ApplicationSnapshotResponseDTO> snapshotMono = applicationPageService
                 .createApplication(testApplication)
                 .flatMap(application -> {
                     assert application.getId() != null;
@@ -104,8 +105,7 @@ public class ApplicationSnapshotServiceTest {
 
         StepVerifier.create(snapshotMono)
                 .assertNext(snapshot -> {
-                    assertThat(snapshot.getApplicationId()).isNotNull();
-                    assertThat(snapshot.getData()).isNull();
+                    assertThat(snapshot.updatedAt()).isNotNull();
                 })
                 .verifyComplete();
     }
@@ -116,7 +116,7 @@ public class ApplicationSnapshotServiceTest {
         Application testApplication = new Application();
         testApplication.setName("Test app for snapshot");
         testApplication.setWorkspaceId(workspace.getId());
-        Mono<ApplicationSnapshot> snapshotMono = applicationPageService
+        Mono<ApplicationSnapshotResponseDTO> snapshotMono = applicationPageService
                 .createApplication(testApplication)
                 .flatMap(application -> {
                     assert application.getId() != null;
@@ -131,8 +131,7 @@ public class ApplicationSnapshotServiceTest {
 
         StepVerifier.create(snapshotMono)
                 .assertNext(snapshot -> {
-                    assertThat(snapshot.getApplicationId()).isNotNull();
-                    assertThat(snapshot.getData()).isNull();
+                    assertThat(snapshot.updatedAt()).isNotNull();
                 })
                 .verifyComplete();
     }
@@ -152,7 +151,7 @@ public class ApplicationSnapshotServiceTest {
         gitArtifactMetadata.setDefaultApplicationId(testDefaultAppId);
         gitArtifactMetadata.setBranchName(testBranchName);
         testApplication.setGitApplicationMetadata(gitArtifactMetadata);
-        Mono<Tuple2<ApplicationSnapshot, Application>> tuple2Mono = applicationPageService
+        Mono<Tuple2<ApplicationSnapshotResponseDTO, Application>> tuple2Mono = applicationPageService
                 .createApplication(testApplication)
                 .flatMap(application -> applicationSnapshotService
                         .createApplicationSnapshot(testDefaultAppId, testBranchName)
@@ -162,10 +161,8 @@ public class ApplicationSnapshotServiceTest {
 
         StepVerifier.create(tuple2Mono)
                 .assertNext(objects -> {
-                    ApplicationSnapshot applicationSnapshot = objects.getT1();
-                    Application application = objects.getT2();
-                    assertThat(applicationSnapshot.getData()).isNull();
-                    assertThat(applicationSnapshot.getApplicationId()).isEqualTo(application.getId());
+                    ApplicationSnapshotResponseDTO applicationSnapshot = objects.getT1();
+                    assertThat(applicationSnapshot.updatedAt()).isNotNull();
                 })
                 .verifyComplete();
     }
@@ -304,7 +301,7 @@ public class ApplicationSnapshotServiceTest {
         Application testApplication = new Application();
         testApplication.setName("Test app for snapshot");
         testApplication.setWorkspaceId(workspace.getId());
-        Mono<ApplicationSnapshot> applicationSnapshotMono = applicationPageService
+        Mono<ApplicationSnapshotResponseDTO> applicationSnapshotMono = applicationPageService
                 .createApplication(testApplication)
                 .flatMap(application1 -> {
                     return applicationSnapshotService.getWithoutDataByApplicationId(application1.getId(), null);
@@ -312,7 +309,7 @@ public class ApplicationSnapshotServiceTest {
 
         StepVerifier.create(applicationSnapshotMono)
                 .assertNext(applicationSnapshot -> {
-                    assertThat(applicationSnapshot.getId()).isNull();
+                    assertThat(applicationSnapshot.updatedAt()).isNull();
                 })
                 .verifyComplete();
     }
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 322ce89e6c..ff75a0e4bf 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
@@ -1623,8 +1623,8 @@ public class GitServiceCETest {
         StepVerifier.create(applicationMono)
                 .assertNext(gitPullDTO -> {
                     assertThat(gitPullDTO.getMergeStatus().getStatus()).isEqualTo("2 commits pulled");
-                    assertThat(gitPullDTO.getApplication()).isNotNull();
-                    assertThat(gitPullDTO.getApplication().getId()).isEqualTo(application.getId());
+                    assertThat(gitPullDTO.getArtifact()).isNotNull();
+                    assertThat(gitPullDTO.getArtifact().getId()).isEqualTo(application.getId());
                 })
                 .verifyComplete();
     }
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 80589d51c5..cea77630c5 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
@@ -11,7 +11,6 @@ import com.appsmith.external.models.DatasourceStorageDTO;
 import com.appsmith.external.models.Endpoint;
 import com.appsmith.external.models.JSValue;
 import com.appsmith.external.models.OAuth2;
-import com.appsmith.external.models.PEMCertificate;
 import com.appsmith.external.models.PluginType;
 import com.appsmith.external.models.Policy;
 import com.appsmith.external.models.Property;
@@ -1457,11 +1456,7 @@ public class ApplicationForkingServiceTests {
                                     new UploadedFile("caCertFile", "caCert file content"),
                                     new UploadedFile("keyFile", "key file content"),
                                     new UploadedFile("certFile", "cert file content"),
-                                    new UploadedFile("caCertFile", "caCert file content"),
-                                    true,
-                                    new PEMCertificate(
-                                            new UploadedFile("pemCertFile", "pem cert file content"),
-                                            "pem cert file password")),
+                                    new UploadedFile("caCertFile", "caCert file content")),
                             "default db"));
 
                     dc.setEndpoints(List.of(new Endpoint("host1", 1L), new Endpoint("host2", 2L)));
@@ -1689,11 +1684,7 @@ public class ApplicationForkingServiceTests {
                                     new UploadedFile("caCertFile", "caCert file content"),
                                     new UploadedFile("keyFile", "key file content"),
                                     new UploadedFile("certFile", "cert file content"),
-                                    new UploadedFile("caCertFile", "caCert file content"),
-                                    true,
-                                    new PEMCertificate(
-                                            new UploadedFile("pemCertFile", "pem cert file content"),
-                                            "pem cert file password")),
+                                    new UploadedFile("caCertFile", "caCert file content")),
                             "default db"));
 
                     dc.setEndpoints(List.of(new Endpoint("host1", 1L), new Endpoint("host2", 2L)));
diff --git a/app/server/build.sh b/app/server/build.sh
index 20ae1208dd..fb6a750697 100755
--- a/app/server/build.sh
+++ b/app/server/build.sh
@@ -34,6 +34,7 @@ if [[ -f .env ]]; then
   source .env
 fi
 
+node scripts/check-field-constants.mjs
 
 # Build the code. $@ accepts all the parameters from the input command line and uses it in the maven build command
 mvn clean package "$@"
diff --git a/app/server/scripts/check-field-constants.mjs b/app/server/scripts/check-field-constants.mjs
index 33877e873e..2d8a57031d 100644
--- a/app/server/scripts/check-field-constants.mjs
+++ b/app/server/scripts/check-field-constants.mjs
@@ -1,7 +1,13 @@
+/**
+ * This script checks if the field constants in the Java files are named and defined correctly.
+ */
+
 import {promises as fs} from "fs";
 import path from "path";
 
 async function findInnerClassDefinitions(directory) {
+  let isPass = true;
+
   try {
     const files = await fs.readdir(directory);
 
@@ -10,29 +16,37 @@ async function findInnerClassDefinitions(directory) {
       const stats = await fs.stat(filePath);
 
       if (stats.isDirectory()) {
-        await findInnerClassDefinitions(filePath);
-      } else if (path.extname(filePath) === '.java') {
-        await processJavaFile(filePath);
+        if (!await findInnerClassDefinitions(filePath)) {
+          isPass = false;
+        }
+      } else if (path.extname(filePath) === ".java") {
+        if (!await processJavaFile(filePath)) {
+          isPass = false;
+        }
       }
     }
   } catch (err) {
     console.error(err);
+    isPass = false;
   }
+
+  return isPass;
 }
 
 async function processJavaFile(filePath) {
+  let isPass = true;
+
   try {
-    const contents = await fs.readFile(filePath, 'utf8');
+    const contents = await fs.readFile(filePath, "utf8");
 
     const innerClassRegex = /^ {4}([\w ]+?)\s+class\s+Fields\s+(extends (\w+)\.Fields)?\s*{(.+?\n {4})?}$/gsm;
 
     for (const innerClassMatch of contents.matchAll(innerClassRegex)) {
       const classQualifiers = innerClassMatch[1]; // we don't care much about this
       const expectedParentClass = innerClassMatch[3];
-      console.log(filePath, classQualifiers, expectedParentClass);
 
       for (const match of innerClassMatch[0].matchAll(/\bpublic\s+static\s+final\s+String\s+(\w+)\s+=\s+(.+?);/gs)) {
-        const key = match[1]
+        const key = match[1];
         const valMatcherParts = [`^dotted\\(`];
         for (const [i, field] of key.split("_").entries()) {
           if (i > 0) {
@@ -41,12 +55,14 @@ async function processJavaFile(filePath) {
           valMatcherParts.push(`(\\w+\\.\\w+\\.)?${field}`);
         }
         valMatcherParts.push(`\\s*\\)$`);
-        const valMatcher = new RegExp(valMatcherParts.join(''));
+        const valMatcher = new RegExp(valMatcherParts.join(""));
         if (!valMatcher.test(match[2])) {
-          console.log("key is", key);
-          console.log("val is", match[2]);
-          console.log("pattern", valMatcher);
-          console.error(`Field ${key} in ${filePath} is not looking right.`);
+          console.log(filePath, classQualifiers, expectedParentClass);
+          console.log("\tkey is", key);
+          console.log("\tval is", match[2]);
+          console.log("\tpattern", valMatcher);
+          console.error(`\tField ${key} in ${filePath} is not looking right.`);
+          isPass = false;
         }
       }
     }
@@ -58,8 +74,23 @@ async function processJavaFile(filePath) {
 
   } catch (err) {
     console.error(err);
+    isPass = false;
   }
+
+  return isPass;
 }
 
-const directoryPath = '.';
-findInnerClassDefinitions(directoryPath);
+// Can't use `import.meta.dirname` because it's not available in Node.js 18.
+// And v18 is what is included in GitHub Actions today.
+// See <https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md#language-and-runtime>.
+const directoryPath = import.meta.resolve("..").replace("file://", "");
+
+findInnerClassDefinitions(directoryPath)
+  .then(isPass => {
+    if (isPass) {
+      console.log("All okay.");
+    } else {
+      console.error("Some field constants are not looking good.");
+      process.exitCode = 1;
+    }
+  });
diff --git a/deploy/aws_ami/first-time-setup.sh b/deploy/aws_ami/first-time-setup.sh
index aa7c58f818..1299e0915d 100755
--- a/deploy/aws_ami/first-time-setup.sh
+++ b/deploy/aws_ami/first-time-setup.sh
@@ -48,7 +48,7 @@ urlencode() {
     LC_COLLATE=C
 
     local length="${#1}"
-    for (( i = 0; i < length; i++ )); do
+    for (( i = 0; i < $length; i++ )); do
         local c="${1:i:1}"
         case $c in
             [a-zA-Z0-9.~_-]) printf "$c" ;;
diff --git a/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs b/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs
index df4d886fd2..410eeff8ba 100644
--- a/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs
+++ b/deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs
@@ -41,6 +41,7 @@ const parts = []
 
 parts.push(`
 {
+  debug
   admin 127.0.0.1:2019
   persist_config off
   acme_ca_root /etc/ssl/certs/ca-certificates.crt
@@ -167,7 +168,10 @@ if (CUSTOM_DOMAIN !== "") {
   `)
 }
 
-finalizeIndexHtml()
+if (!process.argv.includes("--no-finalize-index-html")) {
+  finalizeIndexHtml()
+}
+
 fs.mkdirSync(dirname(CaddyfilePath), { recursive: true })
 fs.writeFileSync(CaddyfilePath, parts.join("\n"))
 spawnSync("/opt/caddy/caddy", ["fmt", "--overwrite", CaddyfilePath])
@@ -179,7 +183,7 @@ function finalizeIndexHtml() {
     info = JSON.parse(fs.readFileSync("/opt/appsmith/info.json", "utf8"))
   } catch(e) {
     // info will be empty, that's okay.
-    console.error("Error reading info.json", e)
+    console.error("Error reading info.json", e.message)
   }
 
   const extraEnv = {
@@ -188,8 +192,8 @@ function finalizeIndexHtml() {
     APPSMITH_VERSION_RELEASE_DATE: info?.imageBuiltAt ?? "",
   }
 
-  const content = fs.readFileSync("/opt/appsmith/editor/index.html", "utf8").replace(
-    /\b__(APPSMITH_[A-Z0-9_]+)__\b/g,
+  const content = fs.readFileSync("/opt/appsmith/editor/index.html", "utf8").replaceAll(
+    /\{\{env\s+"(APPSMITH_[A-Z0-9_]+)"}}/g,
     (_, name) => (process.env[name] || extraEnv[name] || "")
   )
 
diff --git a/deploy/docker/fs/opt/appsmith/entrypoint.sh b/deploy/docker/fs/opt/appsmith/entrypoint.sh
index fa4baec6a6..9caab57e08 100644
--- a/deploy/docker/fs/opt/appsmith/entrypoint.sh
+++ b/deploy/docker/fs/opt/appsmith/entrypoint.sh
@@ -458,7 +458,12 @@ function setup_auto_heal(){
    fi
 }
 
+print_appsmith_info(){
+  tr '\n' ' ' < /opt/appsmith/info.json
+}
+
 # Main Section
+print_appsmith_info
 init_loading_pages
 init_env_file
 setup_proxy_variables