diff --git a/.github/config.json b/.github/config.json
index 7117d4ab6143..52e93c007bf8 100644
--- a/.github/config.json
+++ b/.github/config.json
@@ -1 +1 @@
-{"runners":[{"versioning":{"source":"milestones","type":"SemVer"},"prereleaseName":"alpha","issue":{"labels":{"Widgets Product":{"conditions":[{"label":"Button Widget","type":"hasLabel","value":true},{"label":"Chart Widget","type":"hasLabel","value":true},{"label":"Container Widget","type":"hasLabel","value":true},{"label":"Date Picker Widget","type":"hasLabel","value":true},{"label":"Select Widget","type":"hasLabel","value":true},{"label":"File Picker Widget","type":"hasLabel","value":true},{"label":"Form Widget","type":"hasLabel","value":true},{"label":"Image Widget","type":"hasLabel","value":true},{"label":"Input Widget","type":"hasLabel","value":true},{"label":"List Widget","type":"hasLabel","value":true},{"label":"MultiSelect Widget","type":"hasLabel","value":true},{"label":"Map Widget","type":"hasLabel","value":true},{"label":"Modal Widget","type":"hasLabel","value":true},{"label":"Radio Widget","type":"hasLabel","value":true},{"label":"Rich Text Editor Widget","type":"hasLabel","value":true},{"label":"Tab Widget","type":"hasLabel","value":true},{"label":"Table Widget","type":"hasLabel","value":true},{"label":"Text Widget","type":"hasLabel","value":true},{"label":"Video Widget","type":"hasLabel","value":true},{"label":"iFrame","type":"hasLabel","value":true},{"label":"Menu Button","type":"hasLabel","value":true},{"label":"Rating","type":"hasLabel","value":true},{"label":"Widget Validation","type":"hasLabel","value":true},{"label":"New Widget","type":"hasLabel","value":true},{"label":"Switch widget","type":"hasLabel","value":true},{"label":"Audio Widget","type":"hasLabel","value":true},{"label":"Icon Button Widget","type":"hasLabel","value":true},{"label":"Stat Box Widget","type":"hasLabel","value":true},{"label":"Voice Recorder Widget","type":"hasLabel","value":true},{"label":"Calendar Widget","type":"hasLabel","value":true},{"label":"Menu Button Widget","type":"hasLabel","value":true},{"label":"Divider Widget","type":"hasLabel","value":true},{"label":"Rating Widget","type":"hasLabel","value":true},{"label":"View Mode","type":"hasLabel","value":true},{"label":"Widget Property","type":"hasLabel","value":true},{"label":"Document Viewer Widget","type":"hasLabel","value":true},{"label":"Radio Group Widget","type":"hasLabel","value":true},{"label":"Currency Input Widget","type":"hasLabel","value":true},{"label":"TreeSelect","type":"hasLabel","value":true},{"label":"MultiTree Select Widget","type":"hasLabel","value":true},{"label":"Phone Input Widget","type":"hasLabel","value":true},{"label":"JSON Form","type":"hasLabel","value":true},{"label":"All Widgets","type":"hasLabel","value":true},{"label":"Button Group widget","type":"hasLabel","value":true},{"label":"Progress bar widget","type":"hasLabel","value":true},{"label":"Audio Recorder Widget","type":"hasLabel","value":true},{"label":"Camera Widget","type":"hasLabel","value":true},{"label":"Table Widget V2","type":"hasLabel","value":true},{"label":"Map Chart Widget","type":"hasLabel","value":true},{"label":"Code Scanner Widget","type":"hasLabel","value":true},{"label":"Widget keyboard accessibility","type":"hasLabel","value":true},{"label":"List Widget V2","type":"hasLabel","value":true},{"label":"Slider Widget","type":"hasLabel","value":true},{"label":"One-click Binding","type":"hasLabel","value":true},{"label":"Old widget version","type":"hasLabel","value":true},{"label":"Widget Discoverability","type":"hasLabel","value":true},{"label":"Switch Group Widget","type":"hasLabel","value":true},{"label":"Checkbox Group widget","type":"hasLabel","value":true},{"label":"Checkbox Widget","type":"hasLabel","value":true},{"label":"Table Inline Edit","type":"hasLabel","value":true},{"label":"Custom Widgets","type":"hasLabel","value":true}],"requires":1},"Javascript Product":{"conditions":[{"label":"JS Linting & Errors","type":"hasLabel","value":true},{"label":"Autocomplete","type":"hasLabel","value":true},{"label":"Evaluated Value","type":"hasLabel","value":true},{"label":"Slash Command","type":"hasLabel","value":true},{"label":"New JS Function","type":"hasLabel","value":true},{"label":"JS Usability","type":"hasLabel","value":true},{"label":"Framework Functions","type":"hasLabel","value":true},{"label":"JS Objects","type":"hasLabel","value":true},{"label":"JS Evaluation","type":"hasLabel","value":true},{"label":"Custom JS Libraries","type":"hasLabel","value":true},{"label":"Action Selector","type":"hasLabel","value":true},{"label":"Widget setter method","type":"hasLabel","value":true},{"label":"Entity Refactor","type":"hasLabel","value":true},{"label":"AST-frontend","type":"hasLabel","value":true},{"label":"Sniping Mode","type":"hasLabel","value":true},{"label":"AST-backend","type":"hasLabel","value":true}],"requires":1},"IDE Product":{"conditions":[{"label":"IDE Product","type":"hasLabel","value":true},{"label":"IDE Infra","type":"hasLabel","value":true},{"label":"IDE Navigation","type":"hasLabel","value":true},{"label":"IDE tabs","type":"hasLabel","value":true},{"label":"Omnibar","type":"hasLabel","value":true},{"label":"Entity Explorer","type":"hasLabel","value":true},{"label":"Page Management","type":"hasLabel","value":true},{"label":"Preview mode","type":"hasLabel","value":true}],"requires":1},"Accelerators Product":{"conditions":[{"label":"Generate Page","type":"hasLabel","value":true},{"label":"Building blocks","type":"hasLabel","value":true}],"requires":1},"Templates Product":{"conditions":[{"label":"Partial-import-export","type":"hasLabel","value":true},{"label":"Templates Product","type":"hasLabel","value":true}],"requires":1},"Design System Product":{"conditions":[{"label":"Design System Product","type":"hasLabel","value":true},{"label":"ADS Component Issue","type":"hasLabel","value":true},{"label":"Keyboard accessibility ","type":"hasLabel","value":true},{"label":"Toggle button","type":"hasLabel","value":true},{"label":"ADS Category Token","type":"hasLabel","value":true},{"label":"ADS Component Documentation","type":"hasLabel","value":true},{"label":"ADS Migration","type":"hasLabel","value":true},{"label":"ADS Deduplication ","type":"hasLabel","value":true},{"label":"ADS Revamp","type":"hasLabel","value":true},{"label":"ADS Deduplication","type":"hasLabel","value":true},{"label":"ADS Unit Test","type":"hasLabel","value":true},{"label":"ADS Components","type":"hasLabel","value":true},{"label":"ADS Grayscale","type":"hasLabel","value":true},{"label":"Design System","type":"hasLabel","value":true},{"label":"ADS Typography","type":"hasLabel","value":true},{"label":"ADS Visual Styles","type":"hasLabel","value":true},{"label":"ADS Component Design","type":"hasLabel","value":true},{"label":"Modal Component","type":"hasLabel","value":true},{"label":"ADS Spacing","type":"hasLabel","value":true},{"label":"ads unit test","type":"hasLabel","value":true},{"label":"ads revamp","type":"hasLabel","value":true},{"label":"ads deduplication","type":"hasLabel","value":true}],"requires":1},"RBAC Product":{"conditions":[{"label":"Invite users","type":"hasLabel","value":true},{"label":"RBAC Product","type":"hasLabel","value":true}],"requires":1},"Workspace Product":{"conditions":[{"label":"Home Page","type":"hasLabel","value":true},{"label":"Workspace Product","type":"hasLabel","value":true}],"requires":1},"Billing & Licensing Product":{"conditions":[{"label":"Customer Portal","type":"hasLabel","value":true},{"label":"Cloud Services","type":"hasLabel","value":true},{"label":"Billing","type":"hasLabel","value":true},{"label":"Self Serve","type":"hasLabel","value":true},{"label":"Enterprise Billing","type":"hasLabel","value":true},{"label":"Analytics Improvements","type":"hasLabel","value":true},{"label":"Self Serve 1.0","type":"hasLabel","value":true},{"label":"License","type":"hasLabel","value":true},{"label":"BE instance","type":"hasLabel","value":true},{"label":"Invite flow","type":"hasLabel","value":true},{"label":"CE Instance Usage","type":"hasLabel","value":true},{"label":"Feature Flagging","type":"hasLabel","value":true}],"requires":1},"Packages Product":{"conditions":[{"label":"Packages Product","type":"hasLabel","value":true}],"requires":1},"Environments Product":{"conditions":[{"label":"Environments Product","type":"hasLabel","value":true}],"requires":1},"UI Building Product":{"conditions":[{"label":"Property Pane","type":"hasLabel","value":true},{"label":"Copy Paste","type":"hasLabel","value":true},{"label":"Drag & Drop","type":"hasLabel","value":true},{"label":"Undo/Redo","type":"hasLabel","value":true},{"label":"Widgets Pane","type":"hasLabel","value":true},{"label":"UI Performance","type":"hasLabel","value":true},{"label":"Widget Grouping","type":"hasLabel","value":true},{"label":"Reflow & Resize","type":"hasLabel","value":true},{"label":"Canvas / Grid","type":"hasLabel","value":true},{"label":"Auto Height","type":"hasLabel","value":true},{"label":"Browser specific","type":"hasLabel","value":true},{"label":"Auto Layout","type":"hasLabel","value":true},{"label":"Fixed layout","type":"hasLabel","value":true},{"label":"App Navigation","type":"hasLabel","value":true}],"requires":1},"Onboarding Product":{"conditions":[{"label":"Welcome Screen","type":"hasLabel","value":true}],"requires":1},"Git Product":{"conditions":[{"label":"Git Product","type":"hasLabel","value":true},{"label":"Git Auto-commit","type":"hasLabel","value":true},{"label":"Auto-commit","type":"hasLabel","value":true},{"label":"Continuous Deployment","type":"hasLabel","value":true},{"label":"Default branch","type":"hasLabel","value":true},{"label":"Git status","type":"hasLabel","value":true},{"label":"Git performance","type":"hasLabel","value":true},{"label":"SDLC","type":"hasLabel","value":true},{"label":"Git IA","type":"hasLabel","value":true},{"label":"Branch management","type":"hasLabel","value":true}],"requires":1},"Embedding Apps Product":{"conditions":[{"label":"Embedding Apps Product","type":"hasLabel","value":true}],"requires":1},"Integrations Product":{"conditions":[{"label":"New Datasource","type":"hasLabel","value":true},{"label":"Firestore","type":"hasLabel","value":true},{"label":"Google Sheets","type":"hasLabel","value":true},{"label":"Mongo","type":"hasLabel","value":true},{"label":"Redshift","type":"hasLabel","value":true},{"label":"snowflake","type":"hasLabel","value":true},{"label":"S3","type":"hasLabel","value":true},{"label":"Redis","type":"hasLabel","value":true},{"label":"Postgres","type":"hasLabel","value":true},{"label":"GraphQL Plugin","type":"hasLabel","value":true},{"label":"ArangoDB","type":"hasLabel","value":true},{"label":"MsSQL","type":"hasLabel","value":true},{"label":"Elastic Search","type":"hasLabel","value":true},{"label":"OAuth","type":"hasLabel","value":true},{"label":"Airtable","type":"hasLabel","value":true},{"label":"CURL","type":"hasLabel","value":true},{"label":"DynamoDB","type":"hasLabel","value":true},{"label":"Zendesk","type":"hasLabel","value":true},{"label":"Hubspot","type":"hasLabel","value":true},{"label":"Query Forms","type":"hasLabel","value":true},{"label":"Twilio","type":"hasLabel","value":true},{"label":"MySQL","type":"hasLabel","value":true},{"label":"Connection pool","type":"hasLabel","value":true},{"label":"MariaDB","type":"hasLabel","value":true},{"label":"Integrations Pod General","type":"hasLabel","value":true},{"label":"SMTP plugin","type":"hasLabel","value":true},{"label":"Oracle SQL DB","type":"hasLabel","value":true},{"label":"Query filter","type":"hasLabel","value":true},{"label":"Activation - datasources","type":"hasLabel","value":true},{"label":"REST API","type":"hasLabel","value":true},{"label":"REST API","type":"hasLabel","value":true},{"label":"Datasources","type":"hasLabel","value":true},{"label":"REST API plugin","type":"hasLabel","value":true},{"label":"Prepared statements","type":"hasLabel","value":true},{"label":"Query Generation","type":"hasLabel","value":true},{"label":"Core Query Execution","type":"hasLabel","value":true},{"label":"Query Management","type":"hasLabel","value":true},{"label":"Query Settings","type":"hasLabel","value":true},{"label":"Query performance","type":"hasLabel","value":true},{"label":"Datatype issue","type":"hasLabel","value":true},{"label":"SmartSubstitution","type":"hasLabel","value":true},{"label":"Suggested Widgets","type":"hasLabel","value":true},{"label":"SAAS Plugins","type":"hasLabel","value":true},{"label":"Reconnect DS modal","type":"hasLabel","value":true},{"label":"OnPageLoad","type":"hasLabel","value":true},{"label":"File upload issues","type":"hasLabel","value":true},{"label":"AI","type":"hasLabel","value":true},{"label":"Appsmith AI","type":"hasLabel","value":true},{"label":"Database Schema","type":"hasLabel","value":true}],"requires":1},"Identity & Authentication Product":{"conditions":[{"label":"Login / Signup","type":"hasLabel","value":true},{"label":"SSO","type":"hasLabel","value":true},{"label":"SCIM","type":"hasLabel","value":true},{"label":"Email verification","type":"hasLabel","value":true}],"requires":1},"Artifact Platform Product":{"conditions":[{"label":"Fork App","type":"hasLabel","value":true},{"label":"Publish App","type":"hasLabel","value":true},{"label":"Secret Management","type":"hasLabel","value":true},{"label":"Import-Export-App","type":"hasLabel","value":true}],"requires":1},"DevOps Pod":{"conditions":[{"label":"Docker","type":"hasLabel","value":true},{"label":"Super Admin","type":"hasLabel","value":true},{"label":"Deployment","type":"hasLabel","value":true},{"label":"K8s","type":"hasLabel","value":true},{"label":"Email Config","type":"hasLabel","value":true},{"label":"Backup & Restore","type":"hasLabel","value":true},{"label":"AWS AMI","type":"hasLabel","value":true},{"label":"Observability","type":"hasLabel","value":true},{"label":"Heroku","type":"hasLabel","value":true},{"label":"New Deployment Mode","type":"hasLabel","value":true},{"label":"Supervisor","type":"hasLabel","value":true},{"label":"Deployment Certificates","type":"hasLabel","value":true},{"label":"Mock Data","type":"hasLabel","value":true},{"label":"AWS ECS","type":"hasLabel","value":true},{"label":"Ingress","type":"hasLabel","value":true},{"label":"Nginx","type":"hasLabel","value":true}],"requires":1},"Performance Pod":{"conditions":[{"label":"Performance","type":"hasLabel","value":true},{"label":"Performance infra","type":"hasLabel","value":true}],"requires":1},"Git Platform Pod":{"conditions":[{"label":"Environments Product","type":"hasLabel","value":true},{"label":"Git Product","type":"hasLabel","value":true},{"label":"Artifact Platform Product","type":"hasLabel","value":true}],"requires":1},"IDE Pod":{"conditions":[{"label":"Telemetry","type":"hasLabel","value":true},{"label":"i18n","type":"hasLabel","value":true},{"label":"IDE Product","type":"hasLabel","value":true},{"label":"App setting","type":"hasLabel","value":true},{"label":"Debugger Product","type":"hasLabel","value":true},{"label":"Embedding Apps Product","type":"hasLabel","value":true}],"requires":1},"Platform Administration Pod":{"conditions":[{"label":"Airgap","type":"hasLabel","value":true},{"label":"Enterprise Edition","type":"hasLabel","value":true},{"label":"Invite flow","type":"hasLabel","value":true},{"label":"User Profile","type":"hasLabel","value":true},{"label":"User Session ","type":"hasLabel","value":true},{"label":"User Session","type":"hasLabel","value":true},{"label":"Admin Settings Product","type":"hasLabel","value":true},{"label":"RBAC Product","type":"hasLabel","value":true},{"label":"Workspace Product","type":"hasLabel","value":true},{"label":"Branding Product","type":"hasLabel","value":true},{"label":"Audit Logs Product","type":"hasLabel","value":true},{"label":"Identity & Authentication Product","type":"hasLabel","value":true}],"requires":1},"DB Infrastructure Pod":{"conditions":[{"label":"Move to Postgres","type":"hasLabel","value":true}],"requires":1},"Widgets & Accelerators Pod":{"conditions":[{"label":"Accelerators Product","type":"hasLabel","value":true},{"label":"Templates Product","type":"hasLabel","value":true},{"label":"Widgets Product","type":"hasLabel","value":true},{"label":"App Theming Product","type":"hasLabel","value":true}],"requires":1},"Packages Pod":{"conditions":[{"label":"Module creator","type":"hasLabel","value":true},{"label":"Module consumer","type":"hasLabel","value":true},{"label":"Package versioning","type":"hasLabel","value":true},{"label":"Convert to module","type":"hasLabel","value":true},{"label":"Query module","type":"hasLabel","value":true},{"label":"JS module","type":"hasLabel","value":true},{"label":"UI module","type":"hasLabel","value":true},{"label":"Packages Pod","type":"hasLabel","value":true},{"label":"Packages Product","type":"hasLabel","value":true}],"requires":1},"Workflows Pod":{"conditions":[{"label":"Workflows Product","type":"hasLabel","value":true}],"requires":1},"Query & JS Pod":{"conditions":[{"label":"Javascript Product","type":"hasLabel","value":true},{"label":"Onboarding Product","type":"hasLabel","value":true},{"label":"Integrations Product","type":"hasLabel","value":true},{"label":"Reconfigure Datasource Modal","type":"hasLabel","value":true}],"requires":1},"QA Pod":{"conditions":[{"label":"QA","type":"hasLabel","value":true},{"label":"Automation Test","type":"hasLabel","value":true},{"label":"TestGap","type":"hasLabel","value":true},{"label":"Automation failures","type":"hasLabel","value":true},{"label":"Needs automation","type":"hasLabel","value":true}],"requires":1},"Anvil POD":{"conditions":[{"label":"Checkbox Component","type":"hasLabel","value":true},{"label":"WDS team","type":"hasLabel","value":true},{"label":"Anvil POD","type":"hasLabel","value":true},{"label":"WDS - all widgets","type":"hasLabel","value":true},{"label":"WDS - input widget","type":"hasLabel","value":true},{"label":"WDS - paragraph widget","type":"hasLabel","value":true},{"label":"WDS - statbox widget","type":"hasLabel","value":true},{"label":"WDS - modal widget","type":"hasLabel","value":true},{"label":"WDS - icon widget","type":"hasLabel","value":true},{"label":"WDS - checkbox widget","type":"hasLabel","value":true},{"label":"WDS - table widget","type":"hasLabel","value":true},{"label":"WDS - keyValue widget","type":"hasLabel","value":true},{"label":"WDS - switch group widget","type":"hasLabel","value":true},{"label":"WDS - theming","type":"hasLabel","value":true},{"label":"Anvil layout","type":"hasLabel","value":true},{"label":"Anvil - theming","type":"hasLabel","value":true},{"label":"Anvil - vertical alignment","type":"hasLabel","value":true},{"label":"Anvil - layout component","type":"hasLabel","value":true},{"label":"Anvil - drag & drop","type":"hasLabel","value":true},{"label":"Anvil - zones & sections","type":"hasLabel","value":true},{"label":"Anvil - copy paste experience","type":"hasLabel","value":true},{"label":"WDS  - phone widget","type":"hasLabel","value":true},{"label":"WDS - responsive widget","type":"hasLabel","value":true},{"label":"Anvil - responsive viewport","type":"hasLabel","value":true},{"label":"WDS  - widget styling","type":"hasLabel","value":true},{"label":"Anvil - spacing","type":"hasLabel","value":true},{"label":"Anvil - responsive canvas","type":"hasLabel","value":true},{"label":"WDS - inline button widget","type":"hasLabel","value":true},{"label":"Anvil team","type":"hasLabel","value":true}],"requires":1},"Activation Pod":{"conditions":[{"label":"Activation","type":"hasLabel","value":true}],"requires":1},"Stability Pod":{"conditions":[{"label":"Stability Issue","type":"hasLabel","value":true},{"label":"cypress-flaky-fix","type":"hasLabel","value":true},{"label":"Cypress flaky tests","type":"hasLabel","value":true}],"requires":1},"Documentation Pod":{"conditions":[{"label":"Documentation","type":"hasLabel","value":true}],"requires":1}}},"root":"."}],"labels":{"Tab Widget":{"color":"e2c76c","name":"Tab Widget","description":""},"Dont merge":{"color":"ADB39C","name":"Dont merge","description":""},"Epic":{"color":"3E4B9E","name":"Epic","description":"A zenhub epic that describes a project"},"Menu Button Widget":{"color":"235708","name":"Menu Button Widget","description":"Issues related to Menu Button widget"},"Checkbox Group widget":{"color":"bbeecd","name":"Checkbox Group widget","description":"Issues related to Checkbox Group Widget"},"Input Widget":{"color":"ae65d8","name":"Input Widget","description":""},"Security":{"color":"99139C","name":"Security","description":""},"QA":{"color":"","name":"QA","description":"Needs QA attention"},"Verified":{"color":"9bf416","name":"Verified","description":""},"Wont Fix":{"color":"ffffff","name":"Wont Fix","description":"This will not be worked on"},"MySQL":{"color":"c9ddc6","name":"MySQL","description":"Issues related to MySQL plugin"},"Development":{"color":"9F8A02","name":"Development","description":""},"Help Wanted":{"color":"008672","name":"Help Wanted","description":"Extra attention is needed"},"Home Page":{"color":"","name":"Home Page","description":"Issues related to the application home page"},"Rating Widget":{"color":"235708","name":"Rating Widget","description":"Issues related to the rating widget"},"Stat Box Widget":{"color":"f1c9ce","name":"Stat Box Widget","description":"Issues related to stat box"},"Enhancement":{"color":"a2eeef","name":"Enhancement","description":"New feature or request"},"Fork App":{"color":"af87c7","name":"Fork App","description":"Issues related to forking apps"},"Container Widget":{"color":"19AD0D","name":"Container Widget","description":"Container widget"},"Papercut":{"color":"B562F6","name":"Papercut","description":""},"Needs Design":{"color":"bfd4f2","name":"Needs Design","description":"needs design or changes to design"},"i18n":{"color":"1799b0","name":"i18n","description":"Represents issues that need to be tackled to handle internationalization"},"Rich Text Editor Widget":{"color":"f72cac","name":"Rich Text Editor Widget","description":""},"skip-changelog":{"color":"06086F","name":"skip-changelog","description":"Adding this label to a PR prevents it from being listed in the changelog"},"Low":{"color":"79e53b","name":"Low","description":"An issue that is neither critical nor breaks a user flow"},"potential-duplicate":{"color":"d3cb2e","name":"potential-duplicate","description":"This label marks issues that are potential duplicates of already open issues"},"Audio Widget":{"color":"447B9A","name":"Audio Widget","description":"Issues related to Audio Widget"},"Firestore":{"color":"8078b0","name":"Firestore","description":"Issues related to the firestore Integration"},"New Widget":{"color":"be4cf2","name":"New Widget","description":"A request for a new widget"},"Modal Widget":{"color":"03846f","name":"Modal Widget","description":""},"UX Improvement":{"color":"f4a089","name":"UX Improvement","description":""},"S3":{"color":"8078b0","name":"S3","description":"Issues related to the S3 plugin"},"Release Blocker":{"color":"5756bf","name":"Release Blocker","description":"This issue must be resolved before the release"},"safari":{"color":"51C6AA","name":"safari","description":"Bugs seen on safari browser"},"Example Apps":{"color":"1799b0","name":"Example Apps","description":"Example apps created for new signups"},"MultiSelect Widget":{"color":"AB62D4","name":"MultiSelect Widget","description":"Issues related to MultiSelect Widget"},"Calendar Widget":{"color":"8c6644","name":"Calendar Widget","description":""},"Website":{"color":"151720","name":"Website","description":"Related to www.appsmith.com website"},"Low effort":{"color":"8B59F0","name":"Low effort","description":"Something that'll take a few days to build"},"Checkbox Widget":{"color":"bbeecd","name":"Checkbox Widget","description":""},"Spam":{"color":"620faf","name":"Spam","description":""},"Voice Recorder Widget":{"color":"85bc87","name":"Voice Recorder Widget","description":""},"Select Widget":{"color":"0c669e","name":"Select Widget","description":"Select or dropdown widget"},"Bug":{"color":"8ba6fd","name":"Bug","description":"Something isn't right"},"Widget Validation":{"color":"6990BC","name":"Widget Validation","description":"Issues related to widget property validation"},"Generate Page":{"color":"2b4664","name":"Generate Page","description":"Issures related to page generation"},"File Picker Widget":{"color":"6ae4f2","name":"File Picker Widget","description":""},"snowflake":{"color":"8078b0","name":"snowflake","description":"Issues related to the snowflake Integration"},"Automation":{"color":"CCAF60","name":"Automation","description":""},"hotfix":{"color":"BA3F1D","name":"hotfix","description":""},"Import-Export-App":{"color":"48883f","name":"Import-Export-App","description":"Issues related to importing and exporting apps"},"High effort":{"color":"A7E87B","name":"High effort","description":"Something that'll take more than a month to build"},"Telemetry":{"color":"bc70f9","name":"Telemetry","description":"Issues related to instrumenting appsmith"},"Radio Widget":{"color":"91ef15","name":"Radio Widget","description":""},"Omnibar":{"color":"1bb96a","name":"Omnibar","description":"Issues related to the omnibar for navigation"},"Button Widget":{"color":"34efae","name":"Button Widget","description":""},"Switch widget":{"color":"33A8CE","name":"Switch widget","description":"The switch widget"},"Map Widget":{"color":"7eef7a","name":"Map Widget","description":""},"Task":{"color":"085630","name":"Task","description":"A simple Todo"},"Design System":{"color":"2958a4","name":"Design System","description":"Design system"},"opera":{"color":"C63F5B","name":"opera","description":"Any issues identified on the opera browser"},"Login / Signup":{"color":"","name":"Login / Signup","description":"Authentication flows"},"Image Widget":{"color":"8de8ad","name":"Image Widget","description":""},"firefox":{"color":"6d56e2","name":"firefox","description":""},"Property Pane":{"color":"b356ff","name":"Property Pane","description":"Issues related to the behaviour of the property pane"},"Deployment":{"color":"93491f","name":"Deployment","description":"Installation process of appsmith"},"Production":{"color":"b60205","name":"Production","description":""},"Dependencies":{"color":"0366d6","name":"Dependencies","description":"Pull requests that update a dependency file"},"Google Sheets":{"color":"8078b0","name":"Google Sheets","description":"Issues related to Google Sheets"},"Icon Button Widget":{"color":"D319CE","name":"Icon Button Widget","description":"Issues related to the icon button widget"},"Mongo":{"color":"8078b0","name":"Mongo","description":"Issues related to Mongo DB plugin"},"Documentation":{"color":"a8dff7","name":"Documentation","description":"Improvements or additions to documentation"},"TestGap":{"color":"","name":"TestGap","description":"Issues identified for test plan improvement"},"keyboard shortcut":{"color":"0688B6","name":"keyboard shortcut","description":""},"Reopen":{"color":"897548","name":"Reopen","description":""},"Redshift":{"color":"8078b0","name":"Redshift","description":"Issues related to the redshift integration"},"Date Picker Widget":{"color":"ef1ce1","name":"Date Picker Widget","description":""},"Entity Explorer":{"color":"1bb96a","name":"Entity Explorer","description":"Issues related to navigation using the entity explorer"},"JS Linting & Errors":{"color":"E56AA5","name":"JS Linting & Errors","description":"Issues related to JS Linting and errors"},"iFrame":{"color":"3CD1DB","name":"iFrame","description":"Issues related to iFrame"},"Stale":{"color":"ededed","name":"Stale","description":null},"Text Widget":{"color":"d130d1","name":"Text Widget","description":""},"Video Widget":{"color":"23dd4b","name":"Video Widget","description":""},"Datasources":{"color":"3d590f","name":"Datasources","description":"Issues related to configuring datasource on appsmith"},"error":{"color":"B66773","name":"error","description":"All issues connected to error messages"},"Form Widget":{"color":"09ed77","name":"Form Widget","description":""},"Needs Triaging":{"color":"e8b851","name":"Needs Triaging","description":"Needs attention from maintainers to triage"},"Autocomplete":{"color":"235708","name":"Autocomplete","description":"Issues related to the autocomplete"},"hacktoberfest":{"color":"0052cc","name":"hacktoberfest","description":"All issues that can be solved by the community during Hacktoberfest"},"Medium effort":{"color":"D31156","name":"Medium effort","description":"Something that'll take more than a week but less than a month to build"},"Release":{"color":"57e5e0","name":"Release","description":""},"High":{"color":"c94d14","name":"High","description":"This issue blocks a user from building or impacts a lot of users"},"UI Performance":{"color":"1799b0","name":"UI Performance","description":"Issues related to UI performance"},"Deploy Preview":{"color":"bfdadc","name":"Deploy Preview","description":"Issues found in Deploy Preview"},"Needs Tests":{"color":"8ee263","name":"Needs Tests","description":"Needs automated tests to assert a feature/bug fix"},"Refactor":{"color":"B96662","name":"Refactor","description":"needs refactoring of code"},"Divider Widget":{"color":"235708","name":"Divider Widget","description":"Issues related to the divider widget"},"Table Widget":{"color":"2eead1","name":"Table Widget","description":""},"Needs More Info":{"color":"e54c10","name":"Needs More Info","description":"Needs additional information"},"Good First Issue":{"color":"7057ff","name":"Good First Issue","description":"Good for newcomers"},"UI Improvement":{"color":"9aeef4","name":"UI Improvement","description":""},"Backend":{"color":"d4c5f9","name":"Backend","description":"This marks the issue or pull request to reference server code"},"Frontend":{"color":"87c7f2","name":"Frontend","description":"This label marks the issue or pull request to reference client code"},"Chart Widget":{"color":"616ecc","name":"Chart Widget","description":""},"List Widget":{"color":"8508A0","name":"List Widget","description":"Issues related to the list widget"},"Duplicate":{"color":"cfd3d7","name":"Duplicate","description":"This issue or pull request already exists"},"JS Snippets":{"color":"8d62d2","name":"JS Snippets","description":"issues related to JS Snippets"},"Copy Paste":{"name":"Copy Paste","description":"Issues related to copy paste","color":"b4f0a9"},"Drag & Drop":{"name":"Drag & Drop","description":"Issues related to the drag & drop experience","color":"92115a"},"Sniping Mode":{"name":"Sniping Mode","description":"Issues related to sniping mode","color":"48883f"},"Redis":{"name":"Redis","description":"Issues related to Redis","color":"8078b0"},"New Datasource":{"color":"60b14c","name":"New Datasource","description":"Requests for new datasources"},"Evaluated Value":{"name":"Evaluated Value","description":"Issues related to evaluated values","color":"39f6e7"},"Undo/Redo":{"name":"Undo/Redo","description":"Issues related to undo/redo","color":"f25880"},"App Navigation":{"name":"App Navigation","description":"Issues related to the topbar navigation and configuring it","color":"4773ab"},"Widgets Pane":{"name":"Widgets Pane","description":"Issues related to the discovery and organisation of widgets","color":"ad5d78"},"View Mode":{"color":"1799b0","name":"View Mode","description":"Issues related to the view mode"},"Content":{"name":"Content","description":"For content related topics i.e blogs, templates, videos","color":"a8dff7"},"Slash Command":{"name":"Slash Command","description":"Issues related to the slash command","color":"a0608e"},"Widget Property":{"name":"Widget Property","description":"Issues related to adding / modifying widget properties across widgets","color":"5e92cb"},"Windows":{"name":"Windows","description":"Issues related exclusively to Windows systems","color":"b4cb8a"},"Old App Issues":{"name":"Old App Issues","description":"Issues related to apps old apps a few weeks old and app issues in stale browser session","color":"87ab18"},"Document Viewer Widget":{"name":"Document Viewer Widget","description":"Issues related to Document Viewer Widget","color":"899d4b"},"Radio Group Widget":{"name":"Radio Group Widget","description":"Issues related to radio group widget","color":"b68495"},"Super Admin":{"name":"Super Admin","description":"Issues related to the super admin page","color":"aa95cf"},"Postgres":{"name":"Postgres","description":"Postgres related issues","color":"8078b0"},"New JS Function":{"name":"New JS Function","description":"Issues related to adding a JS Function","color":"8e8aa4"},"Cannot Reproduce Issue":{"color":"93c9cc","name":"Cannot Reproduce Issue","description":"Issues that cannot be reproduced"},"Widget Grouping":{"name":"Widget Grouping","description":"Issues related to Widget Grouping","color":"a49951"},"K8s":{"name":"K8s","description":"Kubernetes related issues","color":"5f318a"},"Docker":{"name":"Docker","description":"Issues related to docker","color":"89b808"},"Camera Widget":{"name":"Camera Widget","description":"Issues and enhancements related to camera widget","color":"e6038e"},"SAAS Plugins":{"name":"SAAS Plugins","description":"Issues related to SAAS Plugins","color":"80e18f"},"JS Promises":{"name":"JS Promises","description":"Issues related to promises","color":"d7771f"},"OnPageLoad":{"name":"OnPageLoad","description":"OnPageLoad issues on functions and queries","color":"2b4664"},"JS Usability":{"name":"JS Usability","description":"usability issues with JS editor and JS elsewhere","color":"a302b0"},"Currency Input Widget":{"name":"Currency Input Widget","description":"Issues related to currency input widget","color":"b2164f"},"TreeSelect":{"name":"TreeSelect","description":"Issues related to TreeSelect Widget","color":"a1633e"},"MultiTree Select Widget":{"name":"MultiTree Select Widget","description":"Issues related to MultiTree Select Widget","color":"a1633e"},"Welcome Screen":{"name":"Welcome Screen","description":"Issues related to the welcome screen","color":"48883f"},"Realtime Commenting":{"color":"a70b86","name":"Realtime Commenting","description":"In-app communication between teams"},"Phone Input Widget":{"name":"Phone Input Widget","description":"Issues related to the Phone Input widget","color":"a70b86"},"JSON Form":{"name":"JSON Form","description":"Issue / features related to the JSON form wiget","color":"46b209"},"All Widgets":{"name":"All Widgets","description":"Issues related to all widgets","color":"972b36"},"V1":{"name":"V1","description":"V1","color":"67ab2e"},"Reflow & Resize":{"name":"Reflow & Resize","description":"All issues related to reflow and resize experience","color":"748a13"},"SSO":{"name":"SSO","description":"Issues, requests and enhancements around Single sign-on.","color":""},"Multi User Realtime":{"name":"Multi User Realtime","description":"Issues related to multiple users using or editing an application","color":"e7b6ce"},"Ready for design":{"name":"Ready for design","description":"this issue is ready for design: it contains clear problem statements and other required information","color":"ebf442"},"Support":{"name":"Support","description":"Issues created by the A-force team to address user queries","color":"1740f3"},"Button Group widget":{"name":"Button Group widget","description":"Issue and enhancements related to the button group widget","color":"f17025"},"GraphQL Plugin":{"name":"GraphQL Plugin","description":"Issues related to GraphQL plugin","color":"8078b0"},"DevOps Pod":{"name":"DevOps Pod","description":"Issues related to devops","color":"d956c7"},"medium":{"name":"medium","description":"Issues that frustrate users due to poor UX","color":"23dfd9"},"ArangoDB":{"name":"ArangoDB","description":"Issues related to arangoDB","color":"8078b0"},"Code Refactoring":{"name":"Code Refactoring","description":"Issues related to code refactoring","color":"76310e"},"Progress bar widget":{"name":"Progress bar widget","description":"To track issues related to progress bar","color":"2d7abf"},"Audio Recorder Widget":{"name":"Audio Recorder Widget","description":"Issues related to Audio Recorder Widget","color":"9accef"},"Airtable":{"name":"Airtable","description":"Issues for Airtable","color":"60885f"},"Canvas / Grid":{"name":"Canvas / Grid","description":"Issues related to the canvas","color":"16b092"},"Email Config":{"name":"Email Config","description":"Issues related to configuring the email service","color":"2a21d1"},"CURL":{"name":"CURL","description":"Issues related to CURL impor","color":"60885f"},"Canvas Zooms":{"name":"Canvas Zooms","description":"Issues related to zooming the canvas","color":"e6038e"},"business":{"name":"business","description":"Features that will be a part of our business edition","color":"cd59eb"},"Action Pod":{"name":"Action Pod","description":"","color":"ee2e36"},"AutomationGap1":{"color":"a5e07c","name":"AutomationGap1","description":"Issues that needs automated tests"},"A-Force11":{"name":"A-Force11","description":"Issues raised by A-Force team","color":"d667b6"},"Business Edition":{"name":"Business Edition","description":"Features that will be a part of our business edition","color":"89bb6c"},"storeValue":{"name":"storeValue","description":"Issues related to the store value function","color":"5d3e66"},"DynamoDB":{"name":"DynamoDB","description":"Issues that are related to DynamoDB should have this label","color":"60885f"},"Backup & Restore":{"name":"Backup & Restore","description":"Issues related to backup and restore","color":"86874d"},"Billing":{"name":"Billing","description":"Billing infrastructure and flows for Business Edition and Trial users","color":"d2bc40"},"Datatype issue":{"name":"Datatype issue","description":"Issues that have risen because data types weren't handled","color":"cef66b"},"OAuth":{"name":"OAuth","description":"OAuth related bugs or features","color":"60885f"},"Table Widget V2":{"name":"Table Widget V2","description":"Issues related to Table Widget V2","color":"3a7192"},"IDE Navigation":{"name":"IDE Navigation","description":"Issues/feature requests related to IDE navigation, and context switching","color":"1bb96a"},"Query performance":{"name":"Query performance","description":"Issues that have to do with lack in performance of query execution","color":"cef66b"},"SAAS Manager App":{"name":"SAAS Manager App","description":"Issues with the SAAS manager app","color":"d427db"},"Twilio":{"name":"Twilio","description":"Issues related to Twilio integration","color":"23ba8d"},"Hubspot":{"name":"Hubspot","description":"Issues related to Hubspot integration","color":"60885f"},"Zendesk":{"name":"Zendesk","description":"Issues related to Zendesk integration","color":"60885f"},"Entity Refactor":{"name":"Entity Refactor","description":"Issues related to refactor logic","color":"705a2c"},"Map Chart Widget":{"name":"Map Chart Widget","description":"Issues related to Map Chart Widgets","color":"c8397f"},"Product Catchup":{"name":"Product Catchup","description":"Issues created in the product catchup","color":"29cd2c"},"Framework Functions":{"name":"Framework Functions","description":"Issues related to internal functions like showAlert(), navigateTo() etc...","color":"c25a09"},"Frontend Libraries Upgrade":{"name":"Frontend Libraries Upgrade","description":"Issues related to frontend libraries upgrade","color":"ede1fc"},"MsSQL":{"name":"MsSQL","description":"Issues related to MsSQL plugin","color":"8078b0"},"Elastic Search":{"name":"Elastic Search","description":"Issues related to the elastic search datasource","color":"8078b0"},"Core Query Execution":{"color":"cef66b","name":"Core Query Execution","description":"Issues related to the execution of all queries"},"Query Management":{"name":"Query Management","description":"Issues related to the CRUD of actions or queries","color":"cef66b"},"Query Settings":{"name":"Query Settings","description":"Issues related to the settings of all queries","color":"cef66b"},"Code Editor":{"name":"Code Editor","description":"Issues related to the code editor","color":"4ca16e"},"Query Forms":{"color":"12b253","name":"Query Forms","description":"Isuses related to the query forms"},"JS Objects":{"color":"22962c","name":"JS Objects","description":"Issues related to JS Objects"},"JS Evaluation":{"color":"22962c","name":"JS Evaluation","description":"Issues related to JS evaluation on the platform"},"SmartSubstitution":{"name":"SmartSubstitution","description":"Issues related to Smart substitution of mustache bindings in queries","color":"bae511"},"Query Generation":{"name":"Query Generation","description":"Issues related to query generation","color":"cef66b"},"Suggested Widgets":{"name":"Suggested Widgets","description":"Issues related to suggesting widgets based on query response","color":"6ac063"},"Code Scanner Widget":{"name":"Code Scanner Widget","description":"Issues related to code scanner widget","color":"9bc1a0"},"Clean URLs":{"name":"Clean URLs","description":"Issues related to clean URLs epic","color":"112623"},"Widget keyboard accessibility":{"name":"Widget keyboard accessibility","description":"All issues related to keyboard accessibility in widgets","color":"b626fd"},"Connection pool":{"name":"Connection pool","description":"issues to do with connection pooling of various plugins","color":"94fe36"},"List Widget V2":{"name":"List Widget V2","description":"Issues related to the list widget v2","color":"adaaf7"},"Auto Height":{"name":"Auto Height","description":"Issues related to dynamic height of widgets","color":"5149cf"},"cypress_failed_test":{"name":"cypress_failed_test","description":"Cypress failed tests","color":"4745d5"},"Needs validation":{"name":"Needs validation","description":"Needs problem validation before being picked up","color":"66673d"},"Slider Widget":{"name":"Slider Widget","description":"Issues raised for slider widgets.","color":"2eef5f"},"Multitenancy":{"name":"Multitenancy","description":"Support multitenancy within single appsmith instance","color":"8c49a9"},"Conversion Algorithm":{"name":"Conversion Algorithm","description":"All issue related to converting app from fixed to flex mode & vice versa","color":"d12d2e"},"Browser specific":{"name":"Browser specific","description":"All issue related to browser","color":"d12d2e"},"Performance infra":{"name":"Performance infra","description":"all issue related to the performance infra","color":"8a60f6"},"DSL Update":{"name":"DSL Update","description":"Issues related to storing and updating the DSL","color":"e16cf3"},"AST-frontend":{"name":"AST-frontend","description":"Issues related to maintaining AST logic","color":"2b4664"},"AST-backend":{"name":"AST-backend","description":"Backend issues related to AST parsing","color":"48883f"},"MariaDB":{"name":"MariaDB","description":"MariaDB datasource","color":"8428c3"},"ADS Component Issue":{"name":"ADS Component Issue","description":"Issues which are caused due to ADS components","color":"d89119"},"Regressed":{"color":"723fd0","name":"Regressed","description":"Scenarios that were working before but have now regressed"},"Needs RCA":{"name":"Needs RCA","description":"a critical or high priority issue that needs an RCA","color":"2cc68f"},"Custom JS Libraries":{"name":"Custom JS Libraries","description":"Issues related to adding custom JS library","color":"bacb6d"},"Integrations Pod General":{"name":"Integrations Pod General","description":"Issues related to the Integrations Pod that don't fit into other tags.","color":"287823"},"Performance Pod":{"name":"Performance Pod","description":"All things related to Appsmith performance","color":"b5a25d"},"Performance":{"name":"Performance","description":"Issues related to performance","color":"9a18d7"},"File upload issues":{"name":"File upload issues","description":"Issues related to uploading any type of files from within Appsmith","color":"2b4664"},"Action Selector":{"name":"Action Selector","description":"Issues related to action selector on the property pane","color":"2f9e20"},"Community Reported":{"name":"Community Reported","description":"issues reported by community members","color":"1402e5"},"JS Function execution":{"name":"JS Function execution","description":"JS function execution","color":"7c2de1"},"Self Serve":{"name":"Self Serve","description":"For all issues related to self-serve flow for business edition","color":"4dacfc"},"Self Serve 1.0":{"name":"Self Serve 1.0","description":"For all issues related to v1 of the self serve project","color":"ae839e"},"Customer Portal":{"name":"Customer Portal","description":"For all tasks/issues pertaining to customer.appsmith.com","color":"d2bc40"},"Cloud Services":{"name":"Cloud Services","description":"For all tasks/issues on Appsmith cloud-services relating to licensing, usage and billing","color":"d2bc40"},"One-click Binding":{"name":"One-click Binding","description":"Issues related to the One click binding epic","color":"f1661c"},"Airgap":{"name":"Airgap","description":"Tickets related to supporting air-gapped Appsmith instances","color":"1cb294"},"SMTP plugin":{"name":"SMTP plugin","description":"Issues related to SMTP plugin","color":"541457"},"AWS AMI":{"name":"AWS AMI","description":"Issues Related to AWS AMI","color":"b44680"},"Old widget version":{"name":"Old widget version","description":"Use this label to raise issue specific only to an older version of a widget","color":"ff3814"},"Enterprise Billing":{"name":"Enterprise Billing","description":"To track all tasks/issues related to licensing & billing for enterprise customers","color":"14c156"},"Oracle SQL DB":{"name":"Oracle SQL DB","description":"Issues related to the Oracle plugin","color":"cbabcb"},"Community Contributor":{"name":"Community Contributor","description":"Meant to track issues that are assigned to external contributors","color":"149ab6"},"widget vertical alignment":{"name":"widget vertical alignment","description":"All issue related widget vertical alignment on the auto layout canvas","color":"d12d2e"},"Observability":{"name":"Observability","description":"Issues related to observability on the Appsmith instance","color":"dff913"},"Checkbox Component":{"name":"Checkbox Component","description":"This labels deals with checkbox component in wds package","color":"75a401"},"Analytics Improvements":{"name":"Analytics Improvements","description":"For all tasks focused on improving our overall analytics and fixing any issues ","color":"29b8ed"},"WDS team":{"name":"WDS team","description":"","color":"8d675a"},"Enterprise Edition":{"name":"Enterprise Edition","description":"Features that will be supported in Enterprise Edition only","color":"984f5e"},"Query filter":{"name":"Query filter","description":"Issues related to query filtering, e.g., WHERE clause","color":"a15134"},"Keyboard accessibility ":{"name":"Keyboard accessibility ","description":"All issue related to ADS component keyboard accessibility","color":"2ba696"},"Toggle button":{"name":"Toggle button","description":"All issue related to ADS toggle button","color":"edc47f"},"SCIM":{"name":"SCIM","description":"Label to collate our SCIM issues","color":"48883f"},"ADS Category Token":{"name":"ADS Category Token","description":"All issues related appsmith design system category tokens","color":"920961"},"ADS Component Documentation":{"name":"ADS Component Documentation","description":"All issues Appsmith design system component documentation","color":"64c46a"},"ADS Migration":{"name":"ADS Migration","description":"All issues related to Appsmith design system migration","color":"b082d6"},"ADS Deduplication ":{"name":"ADS Deduplication ","description":"Replacing component with ADS components","color":"b082d6"},"ADS Revamp":{"name":"ADS Revamp","description":"All issues related to ads revamp. ","color":"b082d6"},"ADS Deduplication":{"name":"ADS Deduplication","description":"Replacing component with ADS components","color":"b082d6"},"ADS Grayscale":{"name":"ADS Grayscale","description":"Support grayscale color changes","color":"b03577"},"ADS Unit Test":{"name":"ADS Unit Test","description":"All issue related ads unit cases ","color":"b082d6"},"ADS Components":{"name":"ADS Components","description":"All issues related ADS components","color":"b082d6"},"Widget Discoverability":{"name":"Widget Discoverability","description":"Issues related to Widget Discoverability","color":"7b55ce"},"Widget setter method":{"name":"Widget setter method","description":"Issues with widget property setters","color":"8dce87"},"License":{"name":"License","description":"For all issues/tasks related to licensing of appsmith-ee edition","color":"90ee98"},"Platformization":{"name":"Platformization","description":"Issues or tasks related to platformization of Appsmith codebase","color":"4e972b"},"Activation - datasources":{"name":"Activation - datasources","description":"issues related to activation projects","color":"7c7ace"},"Partial-import-export":{"name":"Partial-import-export","description":"Label for granular reusability.","color":"717732"},"AI":{"name":"AI","description":"All tasks related to AI","color":"2b4664"},"ADS Typography":{"name":"ADS Typography","description":"All issue related typographical changes","color":"2dbe8d"},"Auto Layout":{"name":"Auto Layout","description":"Issues relates to auto layout","color":"92cf8c"},"Heroku":{"name":"Heroku","description":"Issues related to Heroku","color":"a81b69"},"ADS Visual Styles":{"name":"ADS Visual Styles","description":"All issues related to ADS visual styles","color":"d3da89"},"ADS Component Design":{"name":"ADS Component Design","description":"All issue related to component design","color":"5cc91e"},"Modal Component":{"name":"Modal Component","description":"All issue related to ads modal component","color":"ee63f3"},"App setting":{"name":"App setting","description":"Related to app settings panel within the app","color":"174f98"},"BE instance":{"name":"BE instance","description":"For all issues related to license, billing on BE instance","color":"ae8f98"},"Fixed layout":{"name":"Fixed layout","description":"issues related to fixed layout","color":"b66681"},"Anvil layout":{"name":"Anvil layout","description":"issues related to the new layout system anvil","color":"5e0904"},"New Deployment Mode":{"name":"New Deployment Mode","description":"Support a new mode of deployment","color":"108033"},"Custom widgets":{"name":"Custom widgets","description":"For all issues related to the custom widget project","color":"c9db9c"},"Homepage Experience V2":{"name":"Homepage Experience V2","description":"Label for reporting new tasks and bug fixes related to revamped homepage experience","color":"c55d54"},"Customer Success":{"name":"Customer Success","description":"Issues that the success team cares about","color":"6ccabd"},"Invite flow":{"name":"Invite flow","description":"Invite users flow and any associated actions","color":"881b35"},"Invite users":{"name":"Invite users","description":"Invite users flow and any associated actions","color":""},"Workflows Pod":{"name":"Workflows Pod","description":"Issues that the workflows team owns","color":"446925"},"DailyPromotionBlocker":{"name":"DailyPromotionBlocker","description":"DailyPromotion Blocker","color":"9b2280"},"JS Binding":{"name":"JS Binding","description":"All issues related to the JS Binding experience","color":"422fed"},"REST API":{"name":"REST API","description":"REST API plugin related issues","color":"e3ede5"},"Critical":{"color":"a1e3db","name":"Critical","description":"This issue breaks existing apps. Drop everything else to resolve"},"Module creator":{"name":"Module creator","description":"Issues related to the module creator side","color":"bb2c05"},"Module consumer":{"name":"Module consumer","description":"Issues related to the module consumer side","color":"83d3c5"},"Package versioning":{"name":"Package versioning","description":"ISsues related to how we manage versions for packages","color":"4c5218"},"Convert to module":{"name":"Convert to module","description":"Issues related to the module creation flow using conversion","color":"4c5218"},"Query module":{"name":"Query module","description":"Issues affecting query modules or its instances","color":"b11a7e"},"JS module":{"name":"JS module","description":"Issues affecting JS modules or its instances","color":"bf76f6"},"Secret Management":{"name":"Secret Management","description":"Issues related to secret management","color":"2b4664"},"REST API plugin":{"name":"REST API plugin","description":"REST API plugin related issues","color":"b5948a"},"UI module":{"name":"UI module","description":"Issues affecting UI modules or its instances","color":"d2acee"},"Preview mode":{"name":"Preview mode","description":"Issues related to app previews","color":"48883f"},"Git Auto-commit":{"name":"Git Auto-commit","description":"Issues related to autocommit","color":"717732"},"QA Pod":{"name":"QA Pod","description":"Issues under the QA Pod","color":"717732"},"Automation Test":{"name":"Automation Test","description":"","color":""},"Automation failures":{"name":"Automation failures","description":"","color":""},"Needs automation":{"name":"Needs automation","description":"Issues that needs automated tests","color":""},"Prepared statements":{"name":"Prepared statements","description":"Issues related to prepared statement flow","color":""},"Switch Group Widget":{"name":"Switch Group Widget","description":"Issues related to Switch group Widget","color":""},"Supervisor":{"name":"Supervisor","description":"Issues related to supervisor","color":"2c5813"},"Deployment Certificates":{"name":"Deployment Certificates","description":"Issues related to lets encrypt","color":"e148aa"},"Mock Data":{"name":"Mock Data","description":"Issues related to mock databases","color":"ebf251"},"AWS ECS":{"name":"AWS ECS","description":"Issues related to ECS Fargate","color":"e506ff"},"Publish App":{"name":"Publish App","description":"Issues related to app deployment","color":"2b4664"},"IDE Infra":{"name":"IDE Infra","description":"Issues related to the IDE infrastructure like saving changes","color":"1bb96a"},"User Profile":{"name":"User Profile","description":"Issues related to a user profile","color":"a60d34"},"Page Management":{"color":"1bb96a","name":"Page Management","description":"Issues related to configuring pages"},"Ingress":{"name":"Ingress","description":"Ingress Controller","color":"a86802"},"Nginx":{"name":"Nginx","description":"Issues related to Nginx","color":"e54195"},"Building blocks":{"name":"Building blocks","description":"Building blocks on cavas, on templates listing or drag and drop of building blocks.","color":"48883f"},"Table Inline Edit":{"name":"Table Inline Edit","description":"Issues related to inline editing","color":"60895a"},"User Session ":{"name":"User Session ","description":"For all issues/tasks related to user sessions","color":"65a3f5"},"WDS - all widgets":{"name":"WDS - all widgets","description":"all widget present in WDS","color":"2670ae"},"WDS - input widget":{"name":"WDS - input widget","description":"Issues related to input widget on WDS","color":"2670ae"},"WDS - paragraph widget":{"name":"WDS - paragraph widget","description":"issues related to paragraph widget on WDS","color":"2670ae"},"WDS - statbox widget":{"name":"WDS - statbox widget","description":"issues related to statbox widget on WDS","color":"2670ae"},"WDS - modal widget":{"name":"WDS - modal widget","description":"Issues related to modal widget on WDS","color":"2670ae"},"WDS - icon widget":{"name":"WDS - icon widget","description":"Issues related to icon widget on WDS","color":"2670ae"},"WDS - checkbox widget":{"name":"WDS - checkbox widget","description":"Issues related to checkbox widget on WDS","color":"2670ae"},"WDS - table widget":{"name":"WDS - table widget","description":"Issues related to table widget on WDS","color":"2670ae"},"WDS - keyValue widget":{"name":"WDS - keyValue widget","description":"Issues related to key-value widget on WDS","color":"2670ae"},"WDS - switch group widget":{"name":"WDS - switch group widget","description":"Issues related to switch group widget on WDS","color":"2670ae"},"WDS - theming":{"name":"WDS - theming","description":"Issues related to theming on the Anvil instance","color":"2670ae"},"Anvil POD":{"name":"Anvil POD","description":"Issue related to Anvil project","color":"5e0904"},"Anvil - theming":{"name":"Anvil - theming","description":"Issues related to theming on the Anvil instance","color":"c28de5"},"Anvil - vertical alignment":{"name":"Anvil - vertical alignment","description":"Issues related to vertical alignment on the Anvil layout","color":"c28de5"},"Anvil - layout component":{"name":"Anvil - layout component","description":"Issues related to layout component on the Anvil layout","color":"c28de5"},"Anvil - drag & drop":{"name":"Anvil - drag & drop","description":"Issues related to drag & drop experience on Anvil","color":"c28de5"},"Anvil - zones & sections":{"name":"Anvil - zones & sections","description":"Issues related to zones and sections on the Anvil layout","color":"c28de5"},"Anvil - copy paste experience":{"name":"Anvil - copy paste experience","description":"Issues related to copy paste experience on the Anvil layout","color":"c28de5"},"WDS  - phone widget":{"name":"WDS  - phone widget","description":"Issues related to phone widget on WDS","color":"c28de5"},"WDS - responsive widget":{"name":"WDS - responsive widget","description":"All issues related to widget responsiveness","color":"11ee05"},"Anvil - responsive viewport":{"color":"11ee05","name":"Anvil - responsive viewport","description":"Issues seen on different viewports like mobile"},"WDS  - widget styling":{"color":"11ee05","name":"WDS  - widget styling","description":"all about widget styling"},"Anvil - spacing":{"name":"Anvil - spacing","description":"Related to spacing between widgets in auto layout","color":"11ee05"},"Anvil - responsive canvas":{"name":"Anvil - responsive canvas","description":"All issues related to canvas responsiveness","color":"11ee05"},"WDS - inline button widget":{"name":"WDS - inline button widget","description":"Issues related to inline button widget on WDS","color":"7cef83"},"Activation Pod":{"name":"Activation Pod","description":"for Activation group","color":"d67d00"},"Activation":{"name":"Activation","description":"for Activation group","color":"d67d00"},"Tests":{"name":"Tests","description":"Test issues","color":"4fc7b6"},"Ballpark: XXS":{"name":"Ballpark: XXS","description":"~1xDev in 1/2xSprint","color":""},"Ballpark: XS":{"name":"Ballpark: XS","description":"~1xDev in 1xSprint","color":"53bf71"},"Ballpark: S":{"name":"Ballpark: S","description":"~2xDev in 1xSprint","color":"6e9e65"},"Ballpark: M":{"name":"Ballpark: M","description":"~1xPOD in 1xSprint","color":"2229e6"},"Ballpark: L":{"name":"Ballpark: L","description":"~1xPOD in 3xSprint or 2xPODs in 1xSprint","color":"49962f"},"Ballpark: XL":{"name":"Ballpark: XL","description":"~1xPOD in 1xQuarter or 2xPODs in 2xSprint","color":"b524c9"},"Ballpark: XXL":{"name":"Ballpark: XXL","description":"~2xPODs in 1xQuarter","color":"22092c"},"Auto-commit":{"name":"Auto-commit","description":"Issues related to auto-generated commits showing up on git ","color":"e25b89"},"Continuous Deployment":{"name":"Continuous Deployment","description":"Issues related to CD pipeline on git","color":"aea47c"},"Default branch":{"name":"Default branch","description":"Issues related to using a default branch on git","color":"195737"},"Git status":{"name":"Git status","description":"Issues related to information shown on git status modal or number of changes appearing in a branch","color":"c851b8"},"Git performance":{"name":"Git performance","description":"Issues related to perceived performance on any git operation","color":"189af6"},"Anvil team":{"name":"Anvil team","description":"issues related to the new layout system anvil","color":"798200"},"SDLC":{"name":"SDLC","description":"Issues related to software development lifecycle experiences","color":"bae511"},"Reconnect DS modal":{"name":"Reconnect DS modal","description":"Issues related to reconnect datasource modal post app import","color":"2e398b"},"Stability Pod":{"name":"Stability Pod","description":"For all issues/tasks to be prioritized under Stability pod","color":"86ddf6"},"Stability Issue":{"name":"Stability Issue","description":"Every issue handle by Stability Pod","color":"4d024a"},"Move to Postgres":{"name":"Move to Postgres","description":"Issues required to be solved for the move to Postgres as repository layer","color":"4e13ac"},"User Session":{"name":"User Session","description":"Issues related to user sessions","color":"8255e5"},"IDE tabs":{"name":"IDE tabs","description":"query and js tabs","color":"1bb96a"},"Inviting Contribution":{"name":"Inviting Contribution","description":"Issues that we would like contributions to","color":""},"cypress-flaky-fix":{"name":"cypress-flaky-fix","description":"This label is auto-added when a PR which only has Cypress fixes are merged to release","color":"722cbc"},"Cypress flaky tests":{"name":"Cypress flaky tests","description":"Test scripts that need to be fixed on Cypress by dev or SDET","color":"722cbc"},"Help enterprise":{"name":"Help enterprise","description":"Requested by Appsmith customers or prospects","color":"FF8C00"},"Learnability":{"name":"Learnability","description":"Issues affecting the product learnability, making the product harder for new users.","color":"800c2f"},"ADS Spacing":{"name":"ADS Spacing","description":"","color":"686ebb"},"ads unit test":{"name":"ads unit test","description":"All issue related ads unit cases","color":"686ebb"},"ads revamp":{"name":"ads revamp","description":"All issues related to ads revamp.","color":"686ebb"},"Javascript Product":{"color":"709a21","name":"Javascript Product","description":"Issues related to users writing javascript in appsmith"},"IDE Product":{"color":"1bb96a","name":"IDE Product","description":"Issues related to the IDE Product"},"IDE Pod":{"color":"1bb96a","name":"IDE Pod","description":"Issues that new developers face while exploring the IDE"},"Accelerators Product":{"name":"Accelerators Product","description":"Issues related to app building accelerators","color":"f3fce6"},"Templates Product":{"name":"Templates Product","description":"Issues related to Templates","color":"f3fce6"},"Design System Product":{"name":"Design System Product","description":"Appsmith design system related issues","color":"2b4664"},"ads deduplication":{"name":"ads deduplication","description":"Replacing component with ADS components","color":"708943"},"Admin Settings Product":{"color":"708943","name":"Admin Settings Product","description":"Issues in admin settings pages"},"Appsmith AI":{"name":"Appsmith AI","description":"All issues related to the Appsmith AI datasource","color":"708943"},"Query & JS Pod":{"color":"709a21","name":"Query & JS Pod","description":"Issues related to the query & JS Pod"},"RBAC Product":{"name":"RBAC Product","description":"Issues, requests and enhancements around RBAC.","color":""},"Workspace Product":{"name":"Workspace Product","description":"Issues related to workspaces","color":""},"CE Instance Usage":{"name":"CE Instance Usage","description":"For all issues relating to usage, licensing or billing on the CE instance","color":""},"Billing & Licensing Product":{"name":"Billing & Licensing Product","description":"Issues pertaining to licensing, billing and usage across self serve and enterprise customers","color":"446925"},"Platform Administration Pod":{"color":"446925","name":"Platform Administration Pod","description":"Issues related to platform administration & management"},"DB Infrastructure Pod":{"name":"DB Infrastructure Pod","description":"Pod to handle database infrastructure","color":"446925"},"Packages Product":{"name":"Packages Product","description":"Issues related to packages","color":"446925"},"Workflows Product":{"name":"Workflows Product","description":"Issues related to the workflows product","color":"446925"},"Debugger Product":{"color":"857f58","name":"Debugger Product","description":"Issues related to the debugger"},"Packages Pod":{"name":"Packages Pod","description":"issues that belong to the packages pod","color":"857f58"},"Environments Product":{"name":"Environments Product","description":"Issues related to datasource environments","color":"857f58"},"Custom Widgets":{"name":"Custom Widgets","description":"For all issues related to the custom widget project","color":"857f58"},"Branding Product":{"name":"Branding Product","description":"All issues under branding and whitelabelling appsmith ecosystem","color":"857f58"},"Widgets & Accelerators Pod":{"name":"Widgets & Accelerators Pod","description":"Issues related to widgets & Accelerators","color":"27496a"},"Widgets Product":{"name":"Widgets Product","description":"This label groups issues related to widgets","color":"f3fce6"},"App Theming Product":{"name":"App Theming Product","description":"Items that are related to the App level theming controls epic","color":"48883f"},"UI Building Product":{"color":"48883f","name":"UI Building Product","description":"Issues related to the UI Building experience"},"Onboarding Product":{"color":"48883f","name":"Onboarding Product","description":"Issues related to onboarding new developers"},"Database Schema":{"name":"Database Schema","description":"Issues related to database schema","color":"48883f"},"Git Product":{"color":"48883f","name":"Git Product","description":"Issues related to version control product"},"Git Platform Pod":{"name":"Git Platform Pod","description":"Issues related to the git & the app platform ","color":"48883f"},"Embedding Apps Product":{"name":"Embedding Apps Product","description":"Issues related to embedding","color":"48883f"},"Integrations Product":{"name":"Integrations Product","description":"Issues related to a specific integration","color":"b9f21c"},"Feature Flagging":{"name":"Feature Flagging","description":"Anything related feature flagging","color":"4574ae"},"Audit Logs Product":{"name":"Audit Logs Product","description":"Audit trails to ensure data security","color":"4574ae"},"Identity & Authentication Product":{"name":"Identity & Authentication Product","description":"Issues related to user identity & authentication","color":"4574ae"},"Email verification":{"name":"Email verification","description":"Email verification issues","color":"4574ae"},"Artifact Platform Product":{"name":"Artifact Platform Product","description":"Issues related to the application platform","color":"4574ae"},"Git IA":{"name":"Git IA","description":"Issues related to Git IA changes","color":"df8bd6"},"Documentation Pod":{"name":"Documentation Pod","description":"Issues related to user education","color":"8c8c02"},"Branch management":{"name":"Branch management","description":"Issues related to using a branch management on git","color":"ebe6af"},"Reconfigure Datasource Modal":{"name":"Reconfigure Datasource Modal","description":"Issues related to reconfigure DS modal that comes after importing applications","color":"5ac17b"}},"success":true}
\ No newline at end of file
+{"runners":[{"versioning":{"source":"milestones","type":"SemVer"},"prereleaseName":"alpha","issue":{"labels":{"Widgets Product":{"conditions":[{"label":"Button Widget","type":"hasLabel","value":true},{"label":"Chart Widget","type":"hasLabel","value":true},{"label":"Container Widget","type":"hasLabel","value":true},{"label":"Date Picker Widget","type":"hasLabel","value":true},{"label":"Select Widget","type":"hasLabel","value":true},{"label":"File Picker Widget","type":"hasLabel","value":true},{"label":"Form Widget","type":"hasLabel","value":true},{"label":"Image Widget","type":"hasLabel","value":true},{"label":"Input Widget","type":"hasLabel","value":true},{"label":"List Widget","type":"hasLabel","value":true},{"label":"MultiSelect Widget","type":"hasLabel","value":true},{"label":"Map Widget","type":"hasLabel","value":true},{"label":"Modal Widget","type":"hasLabel","value":true},{"label":"Radio Widget","type":"hasLabel","value":true},{"label":"Rich Text Editor Widget","type":"hasLabel","value":true},{"label":"Tab Widget","type":"hasLabel","value":true},{"label":"Table Widget","type":"hasLabel","value":true},{"label":"Text Widget","type":"hasLabel","value":true},{"label":"Video Widget","type":"hasLabel","value":true},{"label":"iFrame","type":"hasLabel","value":true},{"label":"Menu Button","type":"hasLabel","value":true},{"label":"Rating","type":"hasLabel","value":true},{"label":"Widget Validation","type":"hasLabel","value":true},{"label":"New Widget","type":"hasLabel","value":true},{"label":"Switch widget","type":"hasLabel","value":true},{"label":"Audio Widget","type":"hasLabel","value":true},{"label":"Icon Button Widget","type":"hasLabel","value":true},{"label":"Stat Box Widget","type":"hasLabel","value":true},{"label":"Voice Recorder Widget","type":"hasLabel","value":true},{"label":"Calendar Widget","type":"hasLabel","value":true},{"label":"Menu Button Widget","type":"hasLabel","value":true},{"label":"Divider Widget","type":"hasLabel","value":true},{"label":"Rating Widget","type":"hasLabel","value":true},{"label":"View Mode","type":"hasLabel","value":true},{"label":"Widget Property","type":"hasLabel","value":true},{"label":"Document Viewer Widget","type":"hasLabel","value":true},{"label":"Radio Group Widget","type":"hasLabel","value":true},{"label":"Currency Input Widget","type":"hasLabel","value":true},{"label":"TreeSelect","type":"hasLabel","value":true},{"label":"MultiTree Select Widget","type":"hasLabel","value":true},{"label":"Phone Input Widget","type":"hasLabel","value":true},{"label":"JSON Form","type":"hasLabel","value":true},{"label":"All Widgets","type":"hasLabel","value":true},{"label":"Button Group widget","type":"hasLabel","value":true},{"label":"Progress bar widget","type":"hasLabel","value":true},{"label":"Audio Recorder Widget","type":"hasLabel","value":true},{"label":"Camera Widget","type":"hasLabel","value":true},{"label":"Table Widget V2","type":"hasLabel","value":true},{"label":"Map Chart Widget","type":"hasLabel","value":true},{"label":"Code Scanner Widget","type":"hasLabel","value":true},{"label":"Widget keyboard accessibility","type":"hasLabel","value":true},{"label":"List Widget V2","type":"hasLabel","value":true},{"label":"Slider Widget","type":"hasLabel","value":true},{"label":"One-click Binding","type":"hasLabel","value":true},{"label":"Old widget version","type":"hasLabel","value":true},{"label":"Widget Discoverability","type":"hasLabel","value":true},{"label":"Switch Group Widget","type":"hasLabel","value":true},{"label":"Checkbox Group widget","type":"hasLabel","value":true},{"label":"Checkbox Widget","type":"hasLabel","value":true},{"label":"Table Inline Edit","type":"hasLabel","value":true},{"label":"Custom Widgets","type":"hasLabel","value":true}],"requires":1},"Javascript Product":{"conditions":[{"label":"JS Linting & Errors","type":"hasLabel","value":true},{"label":"Autocomplete","type":"hasLabel","value":true},{"label":"Evaluated Value","type":"hasLabel","value":true},{"label":"Slash Command","type":"hasLabel","value":true},{"label":"New JS Function","type":"hasLabel","value":true},{"label":"JS Usability","type":"hasLabel","value":true},{"label":"Framework Functions","type":"hasLabel","value":true},{"label":"JS Objects","type":"hasLabel","value":true},{"label":"JS Evaluation","type":"hasLabel","value":true},{"label":"Custom JS Libraries","type":"hasLabel","value":true},{"label":"Action Selector","type":"hasLabel","value":true},{"label":"Widget setter method","type":"hasLabel","value":true},{"label":"Entity Refactor","type":"hasLabel","value":true},{"label":"AST-frontend","type":"hasLabel","value":true},{"label":"Sniping Mode","type":"hasLabel","value":true},{"label":"AST-backend","type":"hasLabel","value":true}],"requires":1},"IDE Product":{"conditions":[{"label":"IDE Product","type":"hasLabel","value":true},{"label":"IDE Infra","type":"hasLabel","value":true},{"label":"IDE Navigation","type":"hasLabel","value":true},{"label":"IDE tabs","type":"hasLabel","value":true},{"label":"Omnibar","type":"hasLabel","value":true},{"label":"Entity Explorer","type":"hasLabel","value":true},{"label":"Page Management","type":"hasLabel","value":true},{"label":"Preview mode","type":"hasLabel","value":true}],"requires":1},"Accelerators Product":{"conditions":[{"label":"Generate Page","type":"hasLabel","value":true},{"label":"Building blocks","type":"hasLabel","value":true}],"requires":1},"Templates Product":{"conditions":[{"label":"Partial-import-export","type":"hasLabel","value":true},{"label":"Templates Product","type":"hasLabel","value":true}],"requires":1},"Design System Product":{"conditions":[{"label":"Design System Product","type":"hasLabel","value":true},{"label":"ADS Component Issue","type":"hasLabel","value":true},{"label":"Keyboard accessibility ","type":"hasLabel","value":true},{"label":"Toggle button","type":"hasLabel","value":true},{"label":"ADS Category Token","type":"hasLabel","value":true},{"label":"ADS Component Documentation","type":"hasLabel","value":true},{"label":"ADS Migration","type":"hasLabel","value":true},{"label":"ADS Deduplication ","type":"hasLabel","value":true},{"label":"ADS Revamp","type":"hasLabel","value":true},{"label":"ADS Deduplication","type":"hasLabel","value":true},{"label":"ADS Unit Test","type":"hasLabel","value":true},{"label":"ADS Components","type":"hasLabel","value":true},{"label":"ADS Grayscale","type":"hasLabel","value":true},{"label":"Design System","type":"hasLabel","value":true},{"label":"ADS Typography","type":"hasLabel","value":true},{"label":"ADS Visual Styles","type":"hasLabel","value":true},{"label":"ADS Component Design","type":"hasLabel","value":true},{"label":"Modal Component","type":"hasLabel","value":true},{"label":"ADS Spacing","type":"hasLabel","value":true},{"label":"ads unit test","type":"hasLabel","value":true},{"label":"ads revamp","type":"hasLabel","value":true},{"label":"ads deduplication","type":"hasLabel","value":true}],"requires":1},"RBAC Product":{"conditions":[{"label":"Invite users","type":"hasLabel","value":true},{"label":"RBAC Product","type":"hasLabel","value":true}],"requires":1},"Workspace Product":{"conditions":[{"label":"Home Page","type":"hasLabel","value":true},{"label":"Workspace Product","type":"hasLabel","value":true}],"requires":1},"Billing & Licensing Product":{"conditions":[{"label":"Customer Portal","type":"hasLabel","value":true},{"label":"Cloud Services","type":"hasLabel","value":true},{"label":"Billing","type":"hasLabel","value":true},{"label":"Self Serve","type":"hasLabel","value":true},{"label":"Enterprise Billing","type":"hasLabel","value":true},{"label":"Analytics Improvements","type":"hasLabel","value":true},{"label":"Self Serve 1.0","type":"hasLabel","value":true},{"label":"License","type":"hasLabel","value":true},{"label":"BE instance","type":"hasLabel","value":true},{"label":"Invite flow","type":"hasLabel","value":true},{"label":"CE Instance Usage","type":"hasLabel","value":true},{"label":"Feature Flagging","type":"hasLabel","value":true}],"requires":1},"Packages Product":{"conditions":[{"label":"Packages Product","type":"hasLabel","value":true}],"requires":1},"Environments Product":{"conditions":[{"label":"Environments Product","type":"hasLabel","value":true}],"requires":1},"UI Building Product":{"conditions":[{"label":"Property Pane","type":"hasLabel","value":true},{"label":"Copy Paste","type":"hasLabel","value":true},{"label":"Drag & Drop","type":"hasLabel","value":true},{"label":"Undo/Redo","type":"hasLabel","value":true},{"label":"Widgets Pane","type":"hasLabel","value":true},{"label":"UI Performance","type":"hasLabel","value":true},{"label":"Widget Grouping","type":"hasLabel","value":true},{"label":"Reflow & Resize","type":"hasLabel","value":true},{"label":"Canvas / Grid","type":"hasLabel","value":true},{"label":"Auto Height","type":"hasLabel","value":true},{"label":"Browser specific","type":"hasLabel","value":true},{"label":"Auto Layout","type":"hasLabel","value":true},{"label":"Fixed layout","type":"hasLabel","value":true},{"label":"App Navigation","type":"hasLabel","value":true}],"requires":1},"Onboarding Product":{"conditions":[{"label":"Welcome Screen","type":"hasLabel","value":true}],"requires":1},"Git Product":{"conditions":[{"label":"Git Product","type":"hasLabel","value":true},{"label":"Git Auto-commit","type":"hasLabel","value":true},{"label":"Auto-commit","type":"hasLabel","value":true},{"label":"Continuous Deployment","type":"hasLabel","value":true},{"label":"Default branch","type":"hasLabel","value":true},{"label":"Git status","type":"hasLabel","value":true},{"label":"Git performance","type":"hasLabel","value":true},{"label":"SDLC","type":"hasLabel","value":true},{"label":"Git IA","type":"hasLabel","value":true},{"label":"Branch management","type":"hasLabel","value":true}],"requires":1},"Embedding Apps Product":{"conditions":[{"label":"Embedding Apps Product","type":"hasLabel","value":true}],"requires":1},"Integrations Product":{"conditions":[{"label":"New Datasource","type":"hasLabel","value":true},{"label":"Firestore","type":"hasLabel","value":true},{"label":"Google Sheets","type":"hasLabel","value":true},{"label":"Mongo","type":"hasLabel","value":true},{"label":"Redshift","type":"hasLabel","value":true},{"label":"snowflake","type":"hasLabel","value":true},{"label":"S3","type":"hasLabel","value":true},{"label":"Redis","type":"hasLabel","value":true},{"label":"Postgres","type":"hasLabel","value":true},{"label":"GraphQL Plugin","type":"hasLabel","value":true},{"label":"ArangoDB","type":"hasLabel","value":true},{"label":"MsSQL","type":"hasLabel","value":true},{"label":"Elastic Search","type":"hasLabel","value":true},{"label":"OAuth","type":"hasLabel","value":true},{"label":"Airtable","type":"hasLabel","value":true},{"label":"CURL","type":"hasLabel","value":true},{"label":"DynamoDB","type":"hasLabel","value":true},{"label":"Zendesk","type":"hasLabel","value":true},{"label":"Hubspot","type":"hasLabel","value":true},{"label":"Query Forms","type":"hasLabel","value":true},{"label":"Twilio","type":"hasLabel","value":true},{"label":"MySQL","type":"hasLabel","value":true},{"label":"Connection pool","type":"hasLabel","value":true},{"label":"MariaDB","type":"hasLabel","value":true},{"label":"Integrations Pod General","type":"hasLabel","value":true},{"label":"SMTP plugin","type":"hasLabel","value":true},{"label":"Oracle SQL DB","type":"hasLabel","value":true},{"label":"Query filter","type":"hasLabel","value":true},{"label":"Activation - datasources","type":"hasLabel","value":true},{"label":"REST API","type":"hasLabel","value":true},{"label":"REST API","type":"hasLabel","value":true},{"label":"Datasources","type":"hasLabel","value":true},{"label":"REST API plugin","type":"hasLabel","value":true},{"label":"Prepared statements","type":"hasLabel","value":true},{"label":"Query Generation","type":"hasLabel","value":true},{"label":"Core Query Execution","type":"hasLabel","value":true},{"label":"Query Management","type":"hasLabel","value":true},{"label":"Query Settings","type":"hasLabel","value":true},{"label":"Query performance","type":"hasLabel","value":true},{"label":"Datatype issue","type":"hasLabel","value":true},{"label":"SmartSubstitution","type":"hasLabel","value":true},{"label":"Suggested Widgets","type":"hasLabel","value":true},{"label":"SAAS Plugins","type":"hasLabel","value":true},{"label":"Reconnect DS modal","type":"hasLabel","value":true},{"label":"OnPageLoad","type":"hasLabel","value":true},{"label":"File upload issues","type":"hasLabel","value":true},{"label":"AI","type":"hasLabel","value":true},{"label":"Appsmith AI","type":"hasLabel","value":true},{"label":"Database Schema","type":"hasLabel","value":true}],"requires":1},"Identity & Authentication Product":{"conditions":[{"label":"Login / Signup","type":"hasLabel","value":true},{"label":"SSO","type":"hasLabel","value":true},{"label":"SCIM","type":"hasLabel","value":true},{"label":"Email verification","type":"hasLabel","value":true}],"requires":1},"Artifact Platform Product":{"conditions":[{"label":"Fork App","type":"hasLabel","value":true},{"label":"Publish App","type":"hasLabel","value":true},{"label":"Secret Management","type":"hasLabel","value":true},{"label":"Import-Export-App","type":"hasLabel","value":true}],"requires":1},"DevOps Pod":{"conditions":[{"label":"Docker","type":"hasLabel","value":true},{"label":"Super Admin","type":"hasLabel","value":true},{"label":"Deployment","type":"hasLabel","value":true},{"label":"K8s","type":"hasLabel","value":true},{"label":"Email Config","type":"hasLabel","value":true},{"label":"Backup & Restore","type":"hasLabel","value":true},{"label":"AWS AMI","type":"hasLabel","value":true},{"label":"Observability","type":"hasLabel","value":true},{"label":"Heroku","type":"hasLabel","value":true},{"label":"New Deployment Mode","type":"hasLabel","value":true},{"label":"Supervisor","type":"hasLabel","value":true},{"label":"Deployment Certificates","type":"hasLabel","value":true},{"label":"Mock Data","type":"hasLabel","value":true},{"label":"AWS ECS","type":"hasLabel","value":true},{"label":"Ingress","type":"hasLabel","value":true},{"label":"Nginx","type":"hasLabel","value":true},{"label":"Setup Issues","type":"hasLabel","value":true}],"requires":1},"Performance Pod":{"conditions":[{"label":"Performance","type":"hasLabel","value":true},{"label":"Performance infra","type":"hasLabel","value":true}],"requires":1},"Git Platform Pod":{"conditions":[{"label":"Environments Product","type":"hasLabel","value":true},{"label":"Git Product","type":"hasLabel","value":true},{"label":"Artifact Platform Product","type":"hasLabel","value":true}],"requires":1},"IDE Pod":{"conditions":[{"label":"Telemetry","type":"hasLabel","value":true},{"label":"i18n","type":"hasLabel","value":true},{"label":"IDE Product","type":"hasLabel","value":true},{"label":"App setting","type":"hasLabel","value":true},{"label":"Debugger Product","type":"hasLabel","value":true},{"label":"Embedding Apps Product","type":"hasLabel","value":true}],"requires":1},"Platform Administration Pod":{"conditions":[{"label":"Airgap","type":"hasLabel","value":true},{"label":"Enterprise Edition","type":"hasLabel","value":true},{"label":"Invite flow","type":"hasLabel","value":true},{"label":"User Profile","type":"hasLabel","value":true},{"label":"User Session ","type":"hasLabel","value":true},{"label":"User Session","type":"hasLabel","value":true},{"label":"Admin Settings Product","type":"hasLabel","value":true},{"label":"RBAC Product","type":"hasLabel","value":true},{"label":"Workspace Product","type":"hasLabel","value":true},{"label":"Branding Product","type":"hasLabel","value":true},{"label":"Audit Logs Product","type":"hasLabel","value":true},{"label":"Identity & Authentication Product","type":"hasLabel","value":true}],"requires":1},"DB Infrastructure Pod":{"conditions":[{"label":"Move to Postgres","type":"hasLabel","value":true}],"requires":1},"Widgets & Accelerators Pod":{"conditions":[{"label":"Accelerators Product","type":"hasLabel","value":true},{"label":"Templates Product","type":"hasLabel","value":true},{"label":"Widgets Product","type":"hasLabel","value":true},{"label":"App Theming Product","type":"hasLabel","value":true}],"requires":1},"Packages Pod":{"conditions":[{"label":"Module creator","type":"hasLabel","value":true},{"label":"Module consumer","type":"hasLabel","value":true},{"label":"Package versioning","type":"hasLabel","value":true},{"label":"Convert to module","type":"hasLabel","value":true},{"label":"Query module","type":"hasLabel","value":true},{"label":"JS module","type":"hasLabel","value":true},{"label":"UI module","type":"hasLabel","value":true},{"label":"Packages Pod","type":"hasLabel","value":true},{"label":"Packages Product","type":"hasLabel","value":true}],"requires":1},"Workflows Pod":{"conditions":[{"label":"Workflows Product","type":"hasLabel","value":true}],"requires":1},"Query & JS Pod":{"conditions":[{"label":"Javascript Product","type":"hasLabel","value":true},{"label":"Onboarding Product","type":"hasLabel","value":true},{"label":"Integrations Product","type":"hasLabel","value":true},{"label":"Reconfigure Datasource Modal","type":"hasLabel","value":true}],"requires":1},"QA Pod":{"conditions":[{"label":"QA","type":"hasLabel","value":true},{"label":"Automation Test","type":"hasLabel","value":true},{"label":"TestGap","type":"hasLabel","value":true},{"label":"Automation failures","type":"hasLabel","value":true},{"label":"Needs automation","type":"hasLabel","value":true}],"requires":1},"Anvil POD":{"conditions":[{"label":"Checkbox Component","type":"hasLabel","value":true},{"label":"WDS team","type":"hasLabel","value":true},{"label":"Anvil POD","type":"hasLabel","value":true},{"label":"WDS - all widgets","type":"hasLabel","value":true},{"label":"WDS - input widget","type":"hasLabel","value":true},{"label":"WDS - paragraph widget","type":"hasLabel","value":true},{"label":"WDS - statbox widget","type":"hasLabel","value":true},{"label":"WDS - modal widget","type":"hasLabel","value":true},{"label":"WDS - icon widget","type":"hasLabel","value":true},{"label":"WDS - checkbox widget","type":"hasLabel","value":true},{"label":"WDS - table widget","type":"hasLabel","value":true},{"label":"WDS - keyValue widget","type":"hasLabel","value":true},{"label":"WDS - switch group widget","type":"hasLabel","value":true},{"label":"WDS - theming","type":"hasLabel","value":true},{"label":"Anvil layout","type":"hasLabel","value":true},{"label":"Anvil - theming","type":"hasLabel","value":true},{"label":"Anvil - vertical alignment","type":"hasLabel","value":true},{"label":"Anvil - layout component","type":"hasLabel","value":true},{"label":"Anvil - drag & drop","type":"hasLabel","value":true},{"label":"Anvil - zones & sections","type":"hasLabel","value":true},{"label":"Anvil - copy paste experience","type":"hasLabel","value":true},{"label":"WDS  - phone widget","type":"hasLabel","value":true},{"label":"WDS - responsive widget","type":"hasLabel","value":true},{"label":"Anvil - responsive viewport","type":"hasLabel","value":true},{"label":"WDS  - widget styling","type":"hasLabel","value":true},{"label":"Anvil - spacing","type":"hasLabel","value":true},{"label":"Anvil - responsive canvas","type":"hasLabel","value":true},{"label":"WDS - inline button widget","type":"hasLabel","value":true},{"label":"Anvil team","type":"hasLabel","value":true}],"requires":1},"Activation Pod":{"conditions":[{"label":"Activation","type":"hasLabel","value":true}],"requires":1},"Stability Pod":{"conditions":[{"label":"Stability Issue","type":"hasLabel","value":true},{"label":"cypress-flaky-fix","type":"hasLabel","value":true},{"label":"Cypress flaky tests","type":"hasLabel","value":true}],"requires":1},"Documentation Pod":{"conditions":[{"label":"Documentation","type":"hasLabel","value":true}],"requires":1}}},"root":"."}],"labels":{"Tab Widget":{"color":"e2c76c","name":"Tab Widget","description":""},"Dont merge":{"color":"ADB39C","name":"Dont merge","description":""},"Epic":{"color":"3E4B9E","name":"Epic","description":"A zenhub epic that describes a project"},"Menu Button Widget":{"color":"235708","name":"Menu Button Widget","description":"Issues related to Menu Button widget"},"Checkbox Group widget":{"color":"bbeecd","name":"Checkbox Group widget","description":"Issues related to Checkbox Group Widget"},"Input Widget":{"color":"ae65d8","name":"Input Widget","description":""},"Security":{"color":"99139C","name":"Security","description":""},"QA":{"color":"","name":"QA","description":"Needs QA attention"},"Verified":{"color":"9bf416","name":"Verified","description":""},"Wont Fix":{"color":"ffffff","name":"Wont Fix","description":"This will not be worked on"},"MySQL":{"color":"c9ddc6","name":"MySQL","description":"Issues related to MySQL plugin"},"Development":{"color":"9F8A02","name":"Development","description":""},"Help Wanted":{"color":"008672","name":"Help Wanted","description":"Extra attention is needed"},"Home Page":{"color":"","name":"Home Page","description":"Issues related to the application home page"},"Rating Widget":{"color":"235708","name":"Rating Widget","description":"Issues related to the rating widget"},"Stat Box Widget":{"color":"f1c9ce","name":"Stat Box Widget","description":"Issues related to stat box"},"Enhancement":{"color":"a2eeef","name":"Enhancement","description":"New feature or request"},"Fork App":{"color":"af87c7","name":"Fork App","description":"Issues related to forking apps"},"Container Widget":{"color":"19AD0D","name":"Container Widget","description":"Container widget"},"Papercut":{"color":"B562F6","name":"Papercut","description":""},"Needs Design":{"color":"bfd4f2","name":"Needs Design","description":"needs design or changes to design"},"i18n":{"color":"1799b0","name":"i18n","description":"Represents issues that need to be tackled to handle internationalization"},"Rich Text Editor Widget":{"color":"f72cac","name":"Rich Text Editor Widget","description":""},"skip-changelog":{"color":"06086F","name":"skip-changelog","description":"Adding this label to a PR prevents it from being listed in the changelog"},"Low":{"color":"79e53b","name":"Low","description":"An issue that is neither critical nor breaks a user flow"},"potential-duplicate":{"color":"d3cb2e","name":"potential-duplicate","description":"This label marks issues that are potential duplicates of already open issues"},"Audio Widget":{"color":"447B9A","name":"Audio Widget","description":"Issues related to Audio Widget"},"Firestore":{"color":"8078b0","name":"Firestore","description":"Issues related to the firestore Integration"},"New Widget":{"color":"be4cf2","name":"New Widget","description":"A request for a new widget"},"Modal Widget":{"color":"03846f","name":"Modal Widget","description":""},"UX Improvement":{"color":"f4a089","name":"UX Improvement","description":""},"S3":{"color":"8078b0","name":"S3","description":"Issues related to the S3 plugin"},"Release Blocker":{"color":"5756bf","name":"Release Blocker","description":"This issue must be resolved before the release"},"safari":{"color":"51C6AA","name":"safari","description":"Bugs seen on safari browser"},"Example Apps":{"color":"1799b0","name":"Example Apps","description":"Example apps created for new signups"},"MultiSelect Widget":{"color":"AB62D4","name":"MultiSelect Widget","description":"Issues related to MultiSelect Widget"},"Calendar Widget":{"color":"8c6644","name":"Calendar Widget","description":""},"Website":{"color":"151720","name":"Website","description":"Related to www.appsmith.com website"},"Low effort":{"color":"8B59F0","name":"Low effort","description":"Something that'll take a few days to build"},"Checkbox Widget":{"color":"bbeecd","name":"Checkbox Widget","description":""},"Spam":{"color":"620faf","name":"Spam","description":""},"Voice Recorder Widget":{"color":"85bc87","name":"Voice Recorder Widget","description":""},"Select Widget":{"color":"0c669e","name":"Select Widget","description":"Select or dropdown widget"},"Bug":{"color":"8ba6fd","name":"Bug","description":"Something isn't right"},"Widget Validation":{"color":"6990BC","name":"Widget Validation","description":"Issues related to widget property validation"},"Generate Page":{"color":"2b4664","name":"Generate Page","description":"Issures related to page generation"},"File Picker Widget":{"color":"6ae4f2","name":"File Picker Widget","description":""},"snowflake":{"color":"8078b0","name":"snowflake","description":"Issues related to the snowflake Integration"},"Automation":{"color":"CCAF60","name":"Automation","description":""},"hotfix":{"color":"BA3F1D","name":"hotfix","description":""},"Import-Export-App":{"color":"48883f","name":"Import-Export-App","description":"Issues related to importing and exporting apps"},"High effort":{"color":"A7E87B","name":"High effort","description":"Something that'll take more than a month to build"},"Telemetry":{"color":"bc70f9","name":"Telemetry","description":"Issues related to instrumenting appsmith"},"Radio Widget":{"color":"91ef15","name":"Radio Widget","description":""},"Omnibar":{"color":"1bb96a","name":"Omnibar","description":"Issues related to the omnibar for navigation"},"Button Widget":{"color":"34efae","name":"Button Widget","description":""},"Switch widget":{"color":"33A8CE","name":"Switch widget","description":"The switch widget"},"Map Widget":{"color":"7eef7a","name":"Map Widget","description":""},"Task":{"color":"085630","name":"Task","description":"A simple Todo"},"Design System":{"color":"2958a4","name":"Design System","description":"Design system"},"opera":{"color":"C63F5B","name":"opera","description":"Any issues identified on the opera browser"},"Login / Signup":{"color":"","name":"Login / Signup","description":"Authentication flows"},"Image Widget":{"color":"8de8ad","name":"Image Widget","description":""},"firefox":{"color":"6d56e2","name":"firefox","description":""},"Property Pane":{"color":"b356ff","name":"Property Pane","description":"Issues related to the behaviour of the property pane"},"Deployment":{"color":"93491f","name":"Deployment","description":"Installation process of appsmith"},"Production":{"color":"b60205","name":"Production","description":""},"Dependencies":{"color":"0366d6","name":"Dependencies","description":"Pull requests that update a dependency file"},"Google Sheets":{"color":"8078b0","name":"Google Sheets","description":"Issues related to Google Sheets"},"Icon Button Widget":{"color":"D319CE","name":"Icon Button Widget","description":"Issues related to the icon button widget"},"Mongo":{"color":"8078b0","name":"Mongo","description":"Issues related to Mongo DB plugin"},"Documentation":{"color":"a8dff7","name":"Documentation","description":"Improvements or additions to documentation"},"TestGap":{"color":"","name":"TestGap","description":"Issues identified for test plan improvement"},"keyboard shortcut":{"color":"0688B6","name":"keyboard shortcut","description":""},"Reopen":{"color":"897548","name":"Reopen","description":""},"Redshift":{"color":"8078b0","name":"Redshift","description":"Issues related to the redshift integration"},"Date Picker Widget":{"color":"ef1ce1","name":"Date Picker Widget","description":""},"Entity Explorer":{"color":"1bb96a","name":"Entity Explorer","description":"Issues related to navigation using the entity explorer"},"JS Linting & Errors":{"color":"E56AA5","name":"JS Linting & Errors","description":"Issues related to JS Linting and errors"},"iFrame":{"color":"3CD1DB","name":"iFrame","description":"Issues related to iFrame"},"Stale":{"color":"ededed","name":"Stale","description":null},"Text Widget":{"color":"d130d1","name":"Text Widget","description":""},"Video Widget":{"color":"23dd4b","name":"Video Widget","description":""},"Datasources":{"color":"3d590f","name":"Datasources","description":"Issues related to configuring datasource on appsmith"},"error":{"color":"B66773","name":"error","description":"All issues connected to error messages"},"Form Widget":{"color":"09ed77","name":"Form Widget","description":""},"Needs Triaging":{"color":"e8b851","name":"Needs Triaging","description":"Needs attention from maintainers to triage"},"Autocomplete":{"color":"235708","name":"Autocomplete","description":"Issues related to the autocomplete"},"hacktoberfest":{"color":"0052cc","name":"hacktoberfest","description":"All issues that can be solved by the community during Hacktoberfest"},"Medium effort":{"color":"D31156","name":"Medium effort","description":"Something that'll take more than a week but less than a month to build"},"Release":{"color":"57e5e0","name":"Release","description":""},"High":{"color":"c94d14","name":"High","description":"This issue blocks a user from building or impacts a lot of users"},"UI Performance":{"color":"1799b0","name":"UI Performance","description":"Issues related to UI performance"},"Deploy Preview":{"color":"bfdadc","name":"Deploy Preview","description":"Issues found in Deploy Preview"},"Needs Tests":{"color":"8ee263","name":"Needs Tests","description":"Needs automated tests to assert a feature/bug fix"},"Refactor":{"color":"B96662","name":"Refactor","description":"needs refactoring of code"},"Divider Widget":{"color":"235708","name":"Divider Widget","description":"Issues related to the divider widget"},"Table Widget":{"color":"2eead1","name":"Table Widget","description":""},"Needs More Info":{"color":"e54c10","name":"Needs More Info","description":"Needs additional information"},"Good First Issue":{"color":"7057ff","name":"Good First Issue","description":"Good for newcomers"},"UI Improvement":{"color":"9aeef4","name":"UI Improvement","description":""},"Backend":{"color":"d4c5f9","name":"Backend","description":"This marks the issue or pull request to reference server code"},"Frontend":{"color":"87c7f2","name":"Frontend","description":"This label marks the issue or pull request to reference client code"},"Chart Widget":{"color":"616ecc","name":"Chart Widget","description":""},"List Widget":{"color":"8508A0","name":"List Widget","description":"Issues related to the list widget"},"Duplicate":{"color":"cfd3d7","name":"Duplicate","description":"This issue or pull request already exists"},"JS Snippets":{"color":"8d62d2","name":"JS Snippets","description":"issues related to JS Snippets"},"Copy Paste":{"name":"Copy Paste","description":"Issues related to copy paste","color":"b4f0a9"},"Drag & Drop":{"name":"Drag & Drop","description":"Issues related to the drag & drop experience","color":"92115a"},"Sniping Mode":{"name":"Sniping Mode","description":"Issues related to sniping mode","color":"48883f"},"Redis":{"name":"Redis","description":"Issues related to Redis","color":"8078b0"},"New Datasource":{"color":"60b14c","name":"New Datasource","description":"Requests for new datasources"},"Evaluated Value":{"name":"Evaluated Value","description":"Issues related to evaluated values","color":"39f6e7"},"Undo/Redo":{"name":"Undo/Redo","description":"Issues related to undo/redo","color":"f25880"},"App Navigation":{"name":"App Navigation","description":"Issues related to the topbar navigation and configuring it","color":"4773ab"},"Widgets Pane":{"name":"Widgets Pane","description":"Issues related to the discovery and organisation of widgets","color":"ad5d78"},"View Mode":{"color":"1799b0","name":"View Mode","description":"Issues related to the view mode"},"Content":{"name":"Content","description":"For content related topics i.e blogs, templates, videos","color":"a8dff7"},"Slash Command":{"name":"Slash Command","description":"Issues related to the slash command","color":"a0608e"},"Widget Property":{"name":"Widget Property","description":"Issues related to adding / modifying widget properties across widgets","color":"5e92cb"},"Windows":{"name":"Windows","description":"Issues related exclusively to Windows systems","color":"b4cb8a"},"Old App Issues":{"name":"Old App Issues","description":"Issues related to apps old apps a few weeks old and app issues in stale browser session","color":"87ab18"},"Document Viewer Widget":{"name":"Document Viewer Widget","description":"Issues related to Document Viewer Widget","color":"899d4b"},"Radio Group Widget":{"name":"Radio Group Widget","description":"Issues related to radio group widget","color":"b68495"},"Super Admin":{"name":"Super Admin","description":"Issues related to the super admin page","color":"aa95cf"},"Postgres":{"name":"Postgres","description":"Postgres related issues","color":"8078b0"},"New JS Function":{"name":"New JS Function","description":"Issues related to adding a JS Function","color":"8e8aa4"},"Cannot Reproduce Issue":{"color":"93c9cc","name":"Cannot Reproduce Issue","description":"Issues that cannot be reproduced"},"Widget Grouping":{"name":"Widget Grouping","description":"Issues related to Widget Grouping","color":"a49951"},"K8s":{"name":"K8s","description":"Kubernetes related issues","color":"5f318a"},"Docker":{"name":"Docker","description":"Issues related to docker","color":"89b808"},"Camera Widget":{"name":"Camera Widget","description":"Issues and enhancements related to camera widget","color":"e6038e"},"SAAS Plugins":{"name":"SAAS Plugins","description":"Issues related to SAAS Plugins","color":"80e18f"},"JS Promises":{"name":"JS Promises","description":"Issues related to promises","color":"d7771f"},"OnPageLoad":{"name":"OnPageLoad","description":"OnPageLoad issues on functions and queries","color":"2b4664"},"JS Usability":{"name":"JS Usability","description":"usability issues with JS editor and JS elsewhere","color":"a302b0"},"Currency Input Widget":{"name":"Currency Input Widget","description":"Issues related to currency input widget","color":"b2164f"},"TreeSelect":{"name":"TreeSelect","description":"Issues related to TreeSelect Widget","color":"a1633e"},"MultiTree Select Widget":{"name":"MultiTree Select Widget","description":"Issues related to MultiTree Select Widget","color":"a1633e"},"Welcome Screen":{"name":"Welcome Screen","description":"Issues related to the welcome screen","color":"48883f"},"Realtime Commenting":{"color":"a70b86","name":"Realtime Commenting","description":"In-app communication between teams"},"Phone Input Widget":{"name":"Phone Input Widget","description":"Issues related to the Phone Input widget","color":"a70b86"},"JSON Form":{"name":"JSON Form","description":"Issue / features related to the JSON form wiget","color":"46b209"},"All Widgets":{"name":"All Widgets","description":"Issues related to all widgets","color":"972b36"},"V1":{"name":"V1","description":"V1","color":"67ab2e"},"Reflow & Resize":{"name":"Reflow & Resize","description":"All issues related to reflow and resize experience","color":"748a13"},"SSO":{"name":"SSO","description":"Issues, requests and enhancements around Single sign-on.","color":""},"Multi User Realtime":{"name":"Multi User Realtime","description":"Issues related to multiple users using or editing an application","color":"e7b6ce"},"Ready for design":{"name":"Ready for design","description":"this issue is ready for design: it contains clear problem statements and other required information","color":"ebf442"},"Support":{"name":"Support","description":"Issues created by the A-force team to address user queries","color":"1740f3"},"Button Group widget":{"name":"Button Group widget","description":"Issue and enhancements related to the button group widget","color":"f17025"},"GraphQL Plugin":{"name":"GraphQL Plugin","description":"Issues related to GraphQL plugin","color":"8078b0"},"DevOps Pod":{"name":"DevOps Pod","description":"Issues related to devops","color":"d956c7"},"medium":{"name":"medium","description":"Issues that frustrate users due to poor UX","color":"23dfd9"},"ArangoDB":{"name":"ArangoDB","description":"Issues related to arangoDB","color":"8078b0"},"Code Refactoring":{"name":"Code Refactoring","description":"Issues related to code refactoring","color":"76310e"},"Progress bar widget":{"name":"Progress bar widget","description":"To track issues related to progress bar","color":"2d7abf"},"Audio Recorder Widget":{"name":"Audio Recorder Widget","description":"Issues related to Audio Recorder Widget","color":"9accef"},"Airtable":{"name":"Airtable","description":"Issues for Airtable","color":"60885f"},"Canvas / Grid":{"name":"Canvas / Grid","description":"Issues related to the canvas","color":"16b092"},"Email Config":{"name":"Email Config","description":"Issues related to configuring the email service","color":"2a21d1"},"CURL":{"name":"CURL","description":"Issues related to CURL impor","color":"60885f"},"Canvas Zooms":{"name":"Canvas Zooms","description":"Issues related to zooming the canvas","color":"e6038e"},"business":{"name":"business","description":"Features that will be a part of our business edition","color":"cd59eb"},"Action Pod":{"name":"Action Pod","description":"","color":"ee2e36"},"AutomationGap1":{"color":"a5e07c","name":"AutomationGap1","description":"Issues that needs automated tests"},"A-Force11":{"name":"A-Force11","description":"Issues raised by A-Force team","color":"d667b6"},"Business Edition":{"name":"Business Edition","description":"Features that will be a part of our business edition","color":"89bb6c"},"storeValue":{"name":"storeValue","description":"Issues related to the store value function","color":"5d3e66"},"DynamoDB":{"name":"DynamoDB","description":"Issues that are related to DynamoDB should have this label","color":"60885f"},"Backup & Restore":{"name":"Backup & Restore","description":"Issues related to backup and restore","color":"86874d"},"Billing":{"name":"Billing","description":"Billing infrastructure and flows for Business Edition and Trial users","color":"d2bc40"},"Datatype issue":{"name":"Datatype issue","description":"Issues that have risen because data types weren't handled","color":"cef66b"},"OAuth":{"name":"OAuth","description":"OAuth related bugs or features","color":"60885f"},"Table Widget V2":{"name":"Table Widget V2","description":"Issues related to Table Widget V2","color":"3a7192"},"IDE Navigation":{"name":"IDE Navigation","description":"Issues/feature requests related to IDE navigation, and context switching","color":"1bb96a"},"Query performance":{"name":"Query performance","description":"Issues that have to do with lack in performance of query execution","color":"cef66b"},"SAAS Manager App":{"name":"SAAS Manager App","description":"Issues with the SAAS manager app","color":"d427db"},"Twilio":{"name":"Twilio","description":"Issues related to Twilio integration","color":"23ba8d"},"Hubspot":{"name":"Hubspot","description":"Issues related to Hubspot integration","color":"60885f"},"Zendesk":{"name":"Zendesk","description":"Issues related to Zendesk integration","color":"60885f"},"Entity Refactor":{"name":"Entity Refactor","description":"Issues related to refactor logic","color":"705a2c"},"Map Chart Widget":{"name":"Map Chart Widget","description":"Issues related to Map Chart Widgets","color":"c8397f"},"Product Catchup":{"name":"Product Catchup","description":"Issues created in the product catchup","color":"29cd2c"},"Framework Functions":{"name":"Framework Functions","description":"Issues related to internal functions like showAlert(), navigateTo() etc...","color":"c25a09"},"Frontend Libraries Upgrade":{"name":"Frontend Libraries Upgrade","description":"Issues related to frontend libraries upgrade","color":"ede1fc"},"MsSQL":{"name":"MsSQL","description":"Issues related to MsSQL plugin","color":"8078b0"},"Elastic Search":{"name":"Elastic Search","description":"Issues related to the elastic search datasource","color":"8078b0"},"Core Query Execution":{"color":"cef66b","name":"Core Query Execution","description":"Issues related to the execution of all queries"},"Query Management":{"name":"Query Management","description":"Issues related to the CRUD of actions or queries","color":"cef66b"},"Query Settings":{"name":"Query Settings","description":"Issues related to the settings of all queries","color":"cef66b"},"Code Editor":{"name":"Code Editor","description":"Issues related to the code editor","color":"4ca16e"},"Query Forms":{"color":"12b253","name":"Query Forms","description":"Isuses related to the query forms"},"JS Objects":{"color":"22962c","name":"JS Objects","description":"Issues related to JS Objects"},"JS Evaluation":{"color":"22962c","name":"JS Evaluation","description":"Issues related to JS evaluation on the platform"},"SmartSubstitution":{"name":"SmartSubstitution","description":"Issues related to Smart substitution of mustache bindings in queries","color":"bae511"},"Query Generation":{"name":"Query Generation","description":"Issues related to query generation","color":"cef66b"},"Suggested Widgets":{"name":"Suggested Widgets","description":"Issues related to suggesting widgets based on query response","color":"6ac063"},"Code Scanner Widget":{"name":"Code Scanner Widget","description":"Issues related to code scanner widget","color":"9bc1a0"},"Clean URLs":{"name":"Clean URLs","description":"Issues related to clean URLs epic","color":"112623"},"Widget keyboard accessibility":{"name":"Widget keyboard accessibility","description":"All issues related to keyboard accessibility in widgets","color":"b626fd"},"Connection pool":{"name":"Connection pool","description":"issues to do with connection pooling of various plugins","color":"94fe36"},"List Widget V2":{"name":"List Widget V2","description":"Issues related to the list widget v2","color":"adaaf7"},"Auto Height":{"name":"Auto Height","description":"Issues related to dynamic height of widgets","color":"5149cf"},"cypress_failed_test":{"name":"cypress_failed_test","description":"Cypress failed tests","color":"4745d5"},"Needs validation":{"name":"Needs validation","description":"Needs problem validation before being picked up","color":"66673d"},"Slider Widget":{"name":"Slider Widget","description":"Issues raised for slider widgets.","color":"2eef5f"},"Multitenancy":{"name":"Multitenancy","description":"Support multitenancy within single appsmith instance","color":"8c49a9"},"Conversion Algorithm":{"name":"Conversion Algorithm","description":"All issue related to converting app from fixed to flex mode & vice versa","color":"d12d2e"},"Browser specific":{"name":"Browser specific","description":"All issue related to browser","color":"d12d2e"},"Performance infra":{"name":"Performance infra","description":"all issue related to the performance infra","color":"8a60f6"},"DSL Update":{"name":"DSL Update","description":"Issues related to storing and updating the DSL","color":"e16cf3"},"AST-frontend":{"name":"AST-frontend","description":"Issues related to maintaining AST logic","color":"2b4664"},"AST-backend":{"name":"AST-backend","description":"Backend issues related to AST parsing","color":"48883f"},"MariaDB":{"name":"MariaDB","description":"MariaDB datasource","color":"8428c3"},"ADS Component Issue":{"name":"ADS Component Issue","description":"Issues which are caused due to ADS components","color":"d89119"},"Regressed":{"color":"723fd0","name":"Regressed","description":"Scenarios that were working before but have now regressed"},"Needs RCA":{"name":"Needs RCA","description":"a critical or high priority issue that needs an RCA","color":"2cc68f"},"Custom JS Libraries":{"name":"Custom JS Libraries","description":"Issues related to adding custom JS library","color":"bacb6d"},"Integrations Pod General":{"name":"Integrations Pod General","description":"Issues related to the Integrations Pod that don't fit into other tags.","color":"287823"},"Performance Pod":{"name":"Performance Pod","description":"All things related to Appsmith performance","color":"b5a25d"},"Performance":{"name":"Performance","description":"Issues related to performance","color":"9a18d7"},"File upload issues":{"name":"File upload issues","description":"Issues related to uploading any type of files from within Appsmith","color":"2b4664"},"Action Selector":{"name":"Action Selector","description":"Issues related to action selector on the property pane","color":"2f9e20"},"Community Reported":{"name":"Community Reported","description":"issues reported by community members","color":"1402e5"},"JS Function execution":{"name":"JS Function execution","description":"JS function execution","color":"7c2de1"},"Self Serve":{"name":"Self Serve","description":"For all issues related to self-serve flow for business edition","color":"4dacfc"},"Self Serve 1.0":{"name":"Self Serve 1.0","description":"For all issues related to v1 of the self serve project","color":"ae839e"},"Customer Portal":{"name":"Customer Portal","description":"For all tasks/issues pertaining to customer.appsmith.com","color":"d2bc40"},"Cloud Services":{"name":"Cloud Services","description":"For all tasks/issues on Appsmith cloud-services relating to licensing, usage and billing","color":"d2bc40"},"One-click Binding":{"name":"One-click Binding","description":"Issues related to the One click binding epic","color":"f1661c"},"Airgap":{"name":"Airgap","description":"Tickets related to supporting air-gapped Appsmith instances","color":"1cb294"},"SMTP plugin":{"name":"SMTP plugin","description":"Issues related to SMTP plugin","color":"541457"},"AWS AMI":{"name":"AWS AMI","description":"Issues Related to AWS AMI","color":"b44680"},"Old widget version":{"name":"Old widget version","description":"Use this label to raise issue specific only to an older version of a widget","color":"ff3814"},"Enterprise Billing":{"name":"Enterprise Billing","description":"To track all tasks/issues related to licensing & billing for enterprise customers","color":"14c156"},"Oracle SQL DB":{"name":"Oracle SQL DB","description":"Issues related to the Oracle plugin","color":"cbabcb"},"Community Contributor":{"name":"Community Contributor","description":"Meant to track issues that are assigned to external contributors","color":"149ab6"},"widget vertical alignment":{"name":"widget vertical alignment","description":"All issue related widget vertical alignment on the auto layout canvas","color":"d12d2e"},"Observability":{"name":"Observability","description":"Issues related to observability on the Appsmith instance","color":"dff913"},"Checkbox Component":{"name":"Checkbox Component","description":"This labels deals with checkbox component in wds package","color":"75a401"},"Analytics Improvements":{"name":"Analytics Improvements","description":"For all tasks focused on improving our overall analytics and fixing any issues ","color":"29b8ed"},"WDS team":{"name":"WDS team","description":"","color":"8d675a"},"Enterprise Edition":{"name":"Enterprise Edition","description":"Features that will be supported in Enterprise Edition only","color":"984f5e"},"Query filter":{"name":"Query filter","description":"Issues related to query filtering, e.g., WHERE clause","color":"a15134"},"Keyboard accessibility ":{"name":"Keyboard accessibility ","description":"All issue related to ADS component keyboard accessibility","color":"2ba696"},"Toggle button":{"name":"Toggle button","description":"All issue related to ADS toggle button","color":"edc47f"},"SCIM":{"name":"SCIM","description":"Label to collate our SCIM issues","color":"48883f"},"ADS Category Token":{"name":"ADS Category Token","description":"All issues related appsmith design system category tokens","color":"920961"},"ADS Component Documentation":{"name":"ADS Component Documentation","description":"All issues Appsmith design system component documentation","color":"64c46a"},"ADS Migration":{"name":"ADS Migration","description":"All issues related to Appsmith design system migration","color":"b082d6"},"ADS Deduplication ":{"name":"ADS Deduplication ","description":"Replacing component with ADS components","color":"b082d6"},"ADS Revamp":{"name":"ADS Revamp","description":"All issues related to ads revamp. ","color":"b082d6"},"ADS Deduplication":{"name":"ADS Deduplication","description":"Replacing component with ADS components","color":"b082d6"},"ADS Grayscale":{"name":"ADS Grayscale","description":"Support grayscale color changes","color":"b03577"},"ADS Unit Test":{"name":"ADS Unit Test","description":"All issue related ads unit cases ","color":"b082d6"},"ADS Components":{"name":"ADS Components","description":"All issues related ADS components","color":"b082d6"},"Widget Discoverability":{"name":"Widget Discoverability","description":"Issues related to Widget Discoverability","color":"7b55ce"},"Widget setter method":{"name":"Widget setter method","description":"Issues with widget property setters","color":"8dce87"},"License":{"name":"License","description":"For all issues/tasks related to licensing of appsmith-ee edition","color":"90ee98"},"Platformization":{"name":"Platformization","description":"Issues or tasks related to platformization of Appsmith codebase","color":"4e972b"},"Activation - datasources":{"name":"Activation - datasources","description":"issues related to activation projects","color":"7c7ace"},"Partial-import-export":{"name":"Partial-import-export","description":"Label for granular reusability.","color":"717732"},"AI":{"name":"AI","description":"All tasks related to AI","color":"2b4664"},"ADS Typography":{"name":"ADS Typography","description":"All issue related typographical changes","color":"2dbe8d"},"Auto Layout":{"name":"Auto Layout","description":"Issues relates to auto layout","color":"92cf8c"},"Heroku":{"name":"Heroku","description":"Issues related to Heroku","color":"a81b69"},"ADS Visual Styles":{"name":"ADS Visual Styles","description":"All issues related to ADS visual styles","color":"d3da89"},"ADS Component Design":{"name":"ADS Component Design","description":"All issue related to component design","color":"5cc91e"},"Modal Component":{"name":"Modal Component","description":"All issue related to ads modal component","color":"ee63f3"},"App setting":{"name":"App setting","description":"Related to app settings panel within the app","color":"174f98"},"BE instance":{"name":"BE instance","description":"For all issues related to license, billing on BE instance","color":"ae8f98"},"Fixed layout":{"name":"Fixed layout","description":"issues related to fixed layout","color":"b66681"},"Anvil layout":{"name":"Anvil layout","description":"issues related to the new layout system anvil","color":"5e0904"},"New Deployment Mode":{"name":"New Deployment Mode","description":"Support a new mode of deployment","color":"108033"},"Custom widgets":{"name":"Custom widgets","description":"For all issues related to the custom widget project","color":"c9db9c"},"Homepage Experience V2":{"name":"Homepage Experience V2","description":"Label for reporting new tasks and bug fixes related to revamped homepage experience","color":"c55d54"},"Customer Success":{"name":"Customer Success","description":"Issues that the success team cares about","color":"6ccabd"},"Invite flow":{"name":"Invite flow","description":"Invite users flow and any associated actions","color":"881b35"},"Invite users":{"name":"Invite users","description":"Invite users flow and any associated actions","color":""},"Workflows Pod":{"name":"Workflows Pod","description":"Issues that the workflows team owns","color":"446925"},"DailyPromotionBlocker":{"name":"DailyPromotionBlocker","description":"DailyPromotion Blocker","color":"9b2280"},"JS Binding":{"name":"JS Binding","description":"All issues related to the JS Binding experience","color":"422fed"},"REST API":{"name":"REST API","description":"REST API plugin related issues","color":"e3ede5"},"Critical":{"color":"a1e3db","name":"Critical","description":"This issue breaks existing apps. Drop everything else to resolve"},"Module creator":{"name":"Module creator","description":"Issues related to the module creator side","color":"bb2c05"},"Module consumer":{"name":"Module consumer","description":"Issues related to the module consumer side","color":"83d3c5"},"Package versioning":{"name":"Package versioning","description":"ISsues related to how we manage versions for packages","color":"4c5218"},"Convert to module":{"name":"Convert to module","description":"Issues related to the module creation flow using conversion","color":"4c5218"},"Query module":{"name":"Query module","description":"Issues affecting query modules or its instances","color":"b11a7e"},"JS module":{"name":"JS module","description":"Issues affecting JS modules or its instances","color":"bf76f6"},"Secret Management":{"name":"Secret Management","description":"Issues related to secret management","color":"2b4664"},"REST API plugin":{"name":"REST API plugin","description":"REST API plugin related issues","color":"b5948a"},"UI module":{"name":"UI module","description":"Issues affecting UI modules or its instances","color":"d2acee"},"Preview mode":{"name":"Preview mode","description":"Issues related to app previews","color":"48883f"},"Git Auto-commit":{"name":"Git Auto-commit","description":"Issues related to autocommit","color":"717732"},"QA Pod":{"name":"QA Pod","description":"Issues under the QA Pod","color":"717732"},"Automation Test":{"name":"Automation Test","description":"","color":""},"Automation failures":{"name":"Automation failures","description":"","color":""},"Needs automation":{"name":"Needs automation","description":"Issues that needs automated tests","color":""},"Prepared statements":{"name":"Prepared statements","description":"Issues related to prepared statement flow","color":""},"Switch Group Widget":{"name":"Switch Group Widget","description":"Issues related to Switch group Widget","color":""},"Supervisor":{"name":"Supervisor","description":"Issues related to supervisor","color":"2c5813"},"Deployment Certificates":{"name":"Deployment Certificates","description":"Issues related to lets encrypt","color":"e148aa"},"Mock Data":{"name":"Mock Data","description":"Issues related to mock databases","color":"ebf251"},"AWS ECS":{"name":"AWS ECS","description":"Issues related to ECS Fargate","color":"e506ff"},"Publish App":{"name":"Publish App","description":"Issues related to app deployment","color":"2b4664"},"IDE Infra":{"name":"IDE Infra","description":"Issues related to the IDE infrastructure like saving changes","color":"1bb96a"},"User Profile":{"name":"User Profile","description":"Issues related to a user profile","color":"a60d34"},"Page Management":{"color":"1bb96a","name":"Page Management","description":"Issues related to configuring pages"},"Ingress":{"name":"Ingress","description":"Ingress Controller","color":"a86802"},"Nginx":{"name":"Nginx","description":"Issues related to Nginx","color":"e54195"},"Building blocks":{"name":"Building blocks","description":"Building blocks on cavas, on templates listing or drag and drop of building blocks.","color":"48883f"},"Table Inline Edit":{"name":"Table Inline Edit","description":"Issues related to inline editing","color":"60895a"},"User Session ":{"name":"User Session ","description":"For all issues/tasks related to user sessions","color":"65a3f5"},"WDS - all widgets":{"name":"WDS - all widgets","description":"all widget present in WDS","color":"2670ae"},"WDS - input widget":{"name":"WDS - input widget","description":"Issues related to input widget on WDS","color":"2670ae"},"WDS - paragraph widget":{"name":"WDS - paragraph widget","description":"issues related to paragraph widget on WDS","color":"2670ae"},"WDS - statbox widget":{"name":"WDS - statbox widget","description":"issues related to statbox widget on WDS","color":"2670ae"},"WDS - modal widget":{"name":"WDS - modal widget","description":"Issues related to modal widget on WDS","color":"2670ae"},"WDS - icon widget":{"name":"WDS - icon widget","description":"Issues related to icon widget on WDS","color":"2670ae"},"WDS - checkbox widget":{"name":"WDS - checkbox widget","description":"Issues related to checkbox widget on WDS","color":"2670ae"},"WDS - table widget":{"name":"WDS - table widget","description":"Issues related to table widget on WDS","color":"2670ae"},"WDS - keyValue widget":{"name":"WDS - keyValue widget","description":"Issues related to key-value widget on WDS","color":"2670ae"},"WDS - switch group widget":{"name":"WDS - switch group widget","description":"Issues related to switch group widget on WDS","color":"2670ae"},"WDS - theming":{"name":"WDS - theming","description":"Issues related to theming on the Anvil instance","color":"2670ae"},"Anvil POD":{"name":"Anvil POD","description":"Issue related to Anvil project","color":"5e0904"},"Anvil - theming":{"name":"Anvil - theming","description":"Issues related to theming on the Anvil instance","color":"c28de5"},"Anvil - vertical alignment":{"name":"Anvil - vertical alignment","description":"Issues related to vertical alignment on the Anvil layout","color":"c28de5"},"Anvil - layout component":{"name":"Anvil - layout component","description":"Issues related to layout component on the Anvil layout","color":"c28de5"},"Anvil - drag & drop":{"name":"Anvil - drag & drop","description":"Issues related to drag & drop experience on Anvil","color":"c28de5"},"Anvil - zones & sections":{"name":"Anvil - zones & sections","description":"Issues related to zones and sections on the Anvil layout","color":"c28de5"},"Anvil - copy paste experience":{"name":"Anvil - copy paste experience","description":"Issues related to copy paste experience on the Anvil layout","color":"c28de5"},"WDS  - phone widget":{"name":"WDS  - phone widget","description":"Issues related to phone widget on WDS","color":"c28de5"},"WDS - responsive widget":{"name":"WDS - responsive widget","description":"All issues related to widget responsiveness","color":"11ee05"},"Anvil - responsive viewport":{"color":"11ee05","name":"Anvil - responsive viewport","description":"Issues seen on different viewports like mobile"},"WDS  - widget styling":{"color":"11ee05","name":"WDS  - widget styling","description":"all about widget styling"},"Anvil - spacing":{"name":"Anvil - spacing","description":"Related to spacing between widgets in auto layout","color":"11ee05"},"Anvil - responsive canvas":{"name":"Anvil - responsive canvas","description":"All issues related to canvas responsiveness","color":"11ee05"},"WDS - inline button widget":{"name":"WDS - inline button widget","description":"Issues related to inline button widget on WDS","color":"7cef83"},"Activation Pod":{"name":"Activation Pod","description":"for Activation group","color":"d67d00"},"Activation":{"name":"Activation","description":"for Activation group","color":"d67d00"},"Tests":{"name":"Tests","description":"Test issues","color":"4fc7b6"},"Ballpark: XXS":{"name":"Ballpark: XXS","description":"~1xDev in 1/2xSprint","color":""},"Ballpark: XS":{"name":"Ballpark: XS","description":"~1xDev in 1xSprint","color":"53bf71"},"Ballpark: S":{"name":"Ballpark: S","description":"~2xDev in 1xSprint","color":"6e9e65"},"Ballpark: M":{"name":"Ballpark: M","description":"~1xPOD in 1xSprint","color":"2229e6"},"Ballpark: L":{"name":"Ballpark: L","description":"~1xPOD in 3xSprint or 2xPODs in 1xSprint","color":"49962f"},"Ballpark: XL":{"name":"Ballpark: XL","description":"~1xPOD in 1xQuarter or 2xPODs in 2xSprint","color":"b524c9"},"Ballpark: XXL":{"name":"Ballpark: XXL","description":"~2xPODs in 1xQuarter","color":"22092c"},"Auto-commit":{"name":"Auto-commit","description":"Issues related to auto-generated commits showing up on git ","color":"e25b89"},"Continuous Deployment":{"name":"Continuous Deployment","description":"Issues related to CD pipeline on git","color":"aea47c"},"Default branch":{"name":"Default branch","description":"Issues related to using a default branch on git","color":"195737"},"Git status":{"name":"Git status","description":"Issues related to information shown on git status modal or number of changes appearing in a branch","color":"c851b8"},"Git performance":{"name":"Git performance","description":"Issues related to perceived performance on any git operation","color":"189af6"},"Anvil team":{"name":"Anvil team","description":"issues related to the new layout system anvil","color":"798200"},"SDLC":{"name":"SDLC","description":"Issues related to software development lifecycle experiences","color":"bae511"},"Reconnect DS modal":{"name":"Reconnect DS modal","description":"Issues related to reconnect datasource modal post app import","color":"2e398b"},"Stability Pod":{"name":"Stability Pod","description":"For all issues/tasks to be prioritized under Stability pod","color":"86ddf6"},"Stability Issue":{"name":"Stability Issue","description":"Every issue handle by Stability Pod","color":"4d024a"},"Move to Postgres":{"name":"Move to Postgres","description":"Issues required to be solved for the move to Postgres as repository layer","color":"4e13ac"},"User Session":{"name":"User Session","description":"Issues related to user sessions","color":"8255e5"},"IDE tabs":{"name":"IDE tabs","description":"query and js tabs","color":"1bb96a"},"Inviting Contribution":{"name":"Inviting Contribution","description":"Issues that we would like contributions to","color":""},"cypress-flaky-fix":{"name":"cypress-flaky-fix","description":"This label is auto-added when a PR which only has Cypress fixes are merged to release","color":"722cbc"},"Cypress flaky tests":{"name":"Cypress flaky tests","description":"Test scripts that need to be fixed on Cypress by dev or SDET","color":"722cbc"},"Help enterprise":{"name":"Help enterprise","description":"Requested by Appsmith customers or prospects","color":"FF8C00"},"Learnability":{"name":"Learnability","description":"Issues affecting the product learnability, making the product harder for new users.","color":"800c2f"},"ADS Spacing":{"name":"ADS Spacing","description":"","color":"686ebb"},"ads unit test":{"name":"ads unit test","description":"All issue related ads unit cases","color":"686ebb"},"ads revamp":{"name":"ads revamp","description":"All issues related to ads revamp.","color":"686ebb"},"Javascript Product":{"color":"709a21","name":"Javascript Product","description":"Issues related to users writing javascript in appsmith"},"IDE Product":{"color":"1bb96a","name":"IDE Product","description":"Issues related to the IDE Product"},"IDE Pod":{"color":"1bb96a","name":"IDE Pod","description":"Issues that new developers face while exploring the IDE"},"Accelerators Product":{"name":"Accelerators Product","description":"Issues related to app building accelerators","color":"f3fce6"},"Templates Product":{"name":"Templates Product","description":"Issues related to Templates","color":"f3fce6"},"Design System Product":{"name":"Design System Product","description":"Appsmith design system related issues","color":"2b4664"},"ads deduplication":{"name":"ads deduplication","description":"Replacing component with ADS components","color":"708943"},"Admin Settings Product":{"color":"708943","name":"Admin Settings Product","description":"Issues in admin settings pages"},"Appsmith AI":{"name":"Appsmith AI","description":"All issues related to the Appsmith AI datasource","color":"708943"},"Query & JS Pod":{"color":"709a21","name":"Query & JS Pod","description":"Issues related to the query & JS Pod"},"RBAC Product":{"name":"RBAC Product","description":"Issues, requests and enhancements around RBAC.","color":""},"Workspace Product":{"name":"Workspace Product","description":"Issues related to workspaces","color":""},"CE Instance Usage":{"name":"CE Instance Usage","description":"For all issues relating to usage, licensing or billing on the CE instance","color":""},"Billing & Licensing Product":{"name":"Billing & Licensing Product","description":"Issues pertaining to licensing, billing and usage across self serve and enterprise customers","color":"446925"},"Platform Administration Pod":{"color":"446925","name":"Platform Administration Pod","description":"Issues related to platform administration & management"},"DB Infrastructure Pod":{"name":"DB Infrastructure Pod","description":"Pod to handle database infrastructure","color":"446925"},"Packages Product":{"name":"Packages Product","description":"Issues related to packages","color":"446925"},"Workflows Product":{"name":"Workflows Product","description":"Issues related to the workflows product","color":"446925"},"Debugger Product":{"color":"857f58","name":"Debugger Product","description":"Issues related to the debugger"},"Packages Pod":{"name":"Packages Pod","description":"issues that belong to the packages pod","color":"857f58"},"Environments Product":{"name":"Environments Product","description":"Issues related to datasource environments","color":"857f58"},"Custom Widgets":{"name":"Custom Widgets","description":"For all issues related to the custom widget project","color":"857f58"},"Branding Product":{"name":"Branding Product","description":"All issues under branding and whitelabelling appsmith ecosystem","color":"857f58"},"Widgets & Accelerators Pod":{"name":"Widgets & Accelerators Pod","description":"Issues related to widgets & Accelerators","color":"27496a"},"Widgets Product":{"name":"Widgets Product","description":"This label groups issues related to widgets","color":"f3fce6"},"App Theming Product":{"name":"App Theming Product","description":"Items that are related to the App level theming controls epic","color":"48883f"},"UI Building Product":{"color":"48883f","name":"UI Building Product","description":"Issues related to the UI Building experience"},"Onboarding Product":{"color":"48883f","name":"Onboarding Product","description":"Issues related to onboarding new developers"},"Database Schema":{"name":"Database Schema","description":"Issues related to database schema","color":"48883f"},"Git Product":{"color":"48883f","name":"Git Product","description":"Issues related to version control product"},"Git Platform Pod":{"name":"Git Platform Pod","description":"Issues related to the git & the app platform ","color":"48883f"},"Embedding Apps Product":{"name":"Embedding Apps Product","description":"Issues related to embedding","color":"48883f"},"Integrations Product":{"name":"Integrations Product","description":"Issues related to a specific integration","color":"b9f21c"},"Feature Flagging":{"name":"Feature Flagging","description":"Anything related feature flagging","color":"4574ae"},"Audit Logs Product":{"name":"Audit Logs Product","description":"Audit trails to ensure data security","color":"4574ae"},"Identity & Authentication Product":{"name":"Identity & Authentication Product","description":"Issues related to user identity & authentication","color":"4574ae"},"Email verification":{"name":"Email verification","description":"Email verification issues","color":"4574ae"},"Artifact Platform Product":{"name":"Artifact Platform Product","description":"Issues related to the application platform","color":"4574ae"},"Git IA":{"name":"Git IA","description":"Issues related to Git IA changes","color":"df8bd6"},"Documentation Pod":{"name":"Documentation Pod","description":"Issues related to user education","color":"8c8c02"},"Branch management":{"name":"Branch management","description":"Issues related to using a branch management on git","color":"ebe6af"},"Reconfigure Datasource Modal":{"name":"Reconfigure Datasource Modal","description":"Issues related to reconfigure DS modal that comes after importing applications","color":"5ac17b"},"Setup Issues":{"name":"Setup Issues","description":"Issues related to setting up appsmith","color":"3fc837"}},"success":true}
\ No newline at end of file
diff --git a/.github/workflows/test-vulnerabilities-data.yml b/.github/workflows/test-vulnerabilities-data.yml
index 2ba1b8ced6f4..d071bd1568c9 100644
--- a/.github/workflows/test-vulnerabilities-data.yml
+++ b/.github/workflows/test-vulnerabilities-data.yml
@@ -61,4 +61,20 @@ jobs:
             "${{ github.event.pull_request.number }}" \
             "${{ github.event.pull_request.html_url }}" \
             "${{ github.run_id }}"
-            
\ No newline at end of file
+      
+      - name: Check for new vulnerabilities in Scout and Trivy files
+        if: always()
+        run: |
+          # Check if Scout vulnerabilities file is not empty
+          if [ -s "scout_new_vulnerabilities.csv" ]; then
+            echo "Scout vulnerabilities detected."
+            cat scout_new_vulnerabilities.csv
+            exit 1  # Fail the job if data exists
+          fi
+          
+          # Check if Trivy vulnerabilities file is not empty
+          if [ -s "trivy_new_vulnerabilities.csv" ]; then
+            echo "Trivy vulnerabilities detected."
+            cat trivy_new_vulnerabilities.csv
+            exit 1  # Fail the job if data exists
+          fi
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index a9d4b233719d..be72a28da060 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,18 +17,10 @@ RUN <<END
     exit 1
   fi
 
-  if ! [ -f server/mongo/server.jar && -f server/pg/server.jar ]; then
+  if ! [ -f server/mongo/server.jar -a -f server/pg/server.jar ]; then
     echo "Missing one or both server.jar files in the right place. Are you using the build script?" >&2
     exit 1
   fi
-
-  mkdir -p ./editor ./rts
-
-  # Ensure all *.sh scripts are executable.
-  find . -name node_modules -prune -or -type f -name '*.sh' -print -exec chmod +x '{}' ';'
-
-  # Ensure all custom command-scripts have executable permission
-  chmod +x /opt/bin/*
 END
 
 # Add client UI - Application Layer
@@ -39,13 +31,28 @@ COPY ./app/client/packages/rts/dist rts/
 
 ENV PATH /opt/bin:/opt/appsmith/utils/node_modules/.bin:/opt/java/bin:/opt/node/bin:$PATH
 
-RUN cd ./utils && npm install --only=prod && npm install --only=prod -g . && cd - \
-  && chmod +x /opt/bin/* *.sh /watchtower-hooks/*.sh \
+RUN <<END
+  set -o errexit
+
+  cd ./utils
+  npm install --only=prod
+  npm install --only=prod -g .
+  rm -rf utils/node_modules/resolve/test
+  cd -
+
+  # Make all `*.sh` files executable, excluding `node_modules`.
+  find . \( -name node_modules -prune \) -o \( -type f -name '*.sh' \) -exec chmod +x '{}' +
+
+  # Ensure all custom command-scripts have executable permission
+  chmod +x /opt/bin/* /watchtower-hooks/*.sh
+
   # Disable setuid/setgid bits for the files inside container.
-  && find / \( -path /proc -prune \) -o \( \( -perm -2000 -o -perm -4000 \) -print -exec chmod -s '{}' + \) || true \
-  && mkdir -p /.mongodb/mongosh /appsmith-stacks \
-  && chmod ugo+w /etc /appsmith-stacks \
-  && chmod -R ugo+w /var/run /.mongodb /etc/ssl /usr/local/share
+  find / \( -path /proc -prune \) -o \( \( -perm -2000 -o -perm -4000 \) -exec chmod -s '{}' + \) || true
+
+  mkdir -p /.mongodb/mongosh /appsmith-stacks
+  chmod ugo+w /etc /appsmith-stacks
+  chmod -R ugo+w /var/run /.mongodb /etc/ssl /usr/local/share
+END
 
 LABEL com.centurylinklabs.watchtower.lifecycle.pre-check=/watchtower-hooks/pre-check.sh
 LABEL com.centurylinklabs.watchtower.lifecycle.pre-update=/watchtower-hooks/pre-update.sh
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/Promises_1_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Binding/Promises_1_Spec.ts
index 7e97e10dc94e..e988d2ba54d8 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Binding/Promises_1_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/Promises_1_Spec.ts
@@ -172,7 +172,7 @@ return WhatTrumpThinks.run().then((res) => { showAlert("Today's Trump quote for
     );
     agHelper.ValidateToastMessage(
       "will be executed automatically on page load",
-    ); //Validating 'Run API on Page Load' is set once api response is mapped
+    ); //Validating 'Run the API on Page Load' is set once api response is mapped
     EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
     propPane.EnterJSContext(
       "onClick",
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug14987_spec.js b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug14987_spec.js
index 1c5addd15349..ace0a7d92fed 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug14987_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug14987_spec.js
@@ -31,7 +31,7 @@ describe(
       cy.xpath(queryLocators.querySettingsTab).click();
 
       cy.get(".label-icon-wrapper")
-        .contains("Run query on page load")
+        .contains("Run the query on page load")
         .parent()
         .then(($el) => {
           cy.window().then((win) => {
@@ -45,7 +45,7 @@ describe(
         });
 
       cy.get(".label-icon-wrapper")
-        .contains("Request confirmation before running query")
+        .contains("Request confirmation before running this query")
         .parent()
         .then(($el) => {
           cy.window().then((win) => {
diff --git a/app/client/cypress/locators/OneClickBindingLocator.ts b/app/client/cypress/locators/OneClickBindingLocator.ts
index 1d291b4e0478..0902374a4d46 100644
--- a/app/client/cypress/locators/OneClickBindingLocator.ts
+++ b/app/client/cypress/locators/OneClickBindingLocator.ts
@@ -1,33 +1,33 @@
 export default {
-  connectData: '[data-testId="t--one-click-binding-connect-data"]',
+  connectData: '[data-testid="t--one-click-binding-connect-data"]',
   datasourceDropdownSelector:
-    "[data-testId='t--one-click-binding-datasource-selector']",
+    "[data-testid='t--one-click-binding-datasource-selector']",
   datasourceDropdownOptionSelector: (query: string) =>
-    `[data-testId="t--one-click-binding-datasource-trigger"]:contains(${query})`,
+    `[data-testid="t--one-click-binding-datasource-trigger"]:contains(${query})`,
   dropdownOptionSelector: (query: string) =>
-    `[data-testId="t--one-click-binding-datasource-trigger"]:contains(${query})`,
+    `[data-testid="t--one-click-binding-datasource-trigger"]:contains(${query})`,
   datasourceQueryBindHeaderSelector:
-    "[data-testId='t--one-click-binding-datasource-selector--bind-to-query']",
+    "[data-testid='t--one-click-binding-datasource-selector--bind-to-query']",
   datasourceGenerateAQuerySelector:
-    "[data-testId='t--one-click-binding-datasource-selector--generate-a-query']",
+    "[data-testid='t--one-click-binding-datasource-selector--generate-a-query']",
   datasourceOtherActionsSelector:
-    "[data-testId='t--one-click-binding-datasource-selector--other-actions']",
+    "[data-testid='t--one-click-binding-datasource-selector--other-actions']",
   datasourceQuerySelector: (query?: string) =>
-    `[data-testId='t--one-click-binding-datasource-selector--query']${
+    `[data-testid='t--one-click-binding-datasource-selector--query']${
       query ? `:contains(${query})` : ""
     }`,
   datasourceSelector: (datasource?: string) =>
-    `[data-testId="t--one-click-binding-datasource-selector--datasource"]${
+    `[data-testid="t--one-click-binding-datasource-selector--datasource"]${
       datasource ? `:contains(${datasource})` : ""
     }`,
   otherActionSelector: (action?: string) =>
-    `[data-testId='t--one-click-binding-datasource-selector--other-action']${
+    `[data-testid='t--one-click-binding-datasource-selector--other-action']${
       action ? `:contains(${action})` : ""
     }`,
   tableOrSpreadsheetDropdown:
     '[data-testid="t--one-click-binding-table-selector"] .rc-select-selector',
   tableOrSpreadsheetDropdownOption: (table?: string) =>
-    `//div[@data-testId='t--one-click-binding-table-selector--table']//div[text()='${table}']`,
+    `//div[@data-testid='t--one-click-binding-table-selector--table']//div[text()='${table}']`,
   tableOrSpreadsheetSelectedOption: (table?: string) =>
     `[data-testid="t--one-click-binding-table-selector"] .rc-select-selection-item${
       table ? `:contains(${table})` : ""
@@ -35,24 +35,24 @@ export default {
   validTableRowData:
     '.t--widget-tablewidgetv2 [role="rowgroup"] [role="button"]',
   tableError: (error: string) =>
-    `[data-testId="t--one-click-binding-table-selector--error"]:contains(${error})`,
-  dateInput: `[data-testId="datepicker-container"] input`,
+    `[data-testid="t--one-click-binding-table-selector--error"]:contains(${error})`,
+  dateInput: `[data-testid="datepicker-container"] input`,
   dayViewFromDate: ".DayPicker-Day",
-  loadMore: "[data-testId='t--one-click-binding-datasource--load-more']",
-  datasourceSearch: `[data-testId="t--one-click-binding-datasource--search"]`,
+  loadMore: "[data-testid='t--one-click-binding-datasource--load-more']",
+  datasourceSearch: `[data-testid="t--one-click-binding-datasource--search"]`,
   searchableColumn:
-    '[data-testId="t--one-click-binding-column-searchableColumn"]',
-  formType: '[data-testId="t--one-click-binding-column-formType"]',
-  defaultValues: '[data-testId="t--one-click-binding-column-defaultValues"]',
-  dataIdentifier: '[data-testId="t--one-click-binding-column-dataIdentifier"]',
-  label: '[data-testId="t--one-click-binding-column-label"]',
-  value: '[data-testId="t--one-click-binding-column-value"]',
+    '[data-testid="t--one-click-binding-column-searchableColumn"]',
+  formType: '[data-testid="t--one-click-binding-column-formType"]',
+  defaultValues: '[data-testid="t--one-click-binding-column-defaultValues"]',
+  dataIdentifier: '[data-testid="t--one-click-binding-column-dataIdentifier"]',
+  label: '[data-testid="t--one-click-binding-column-label"]',
+  value: '[data-testid="t--one-click-binding-column-value"]',
   columnDropdownOption: (column: string, value?: string) =>
-    `[data-testId='t--one-click-binding-column-${column}--column']${
+    `[data-testid='t--one-click-binding-column-${column}--column']${
       value ? `:contains(${value})` : ""
     }`,
   columnSelectedOption: (column: string, value?: string) =>
-    `[data-testId="t--one-click-binding-column-${column}"] .rc-select-selection-item${
+    `[data-testid="t--one-click-binding-column-${column}"] .rc-select-selection-item${
       value ? `:contains(${value})` : ""
     }`,
   columnSelectorModalTrigger: '[data-testid="t--edit-fields-button"]',
diff --git a/app/client/cypress/support/Pages/DataSources.ts b/app/client/cypress/support/Pages/DataSources.ts
index 4e035fa5db1b..b56ad7792f35 100644
--- a/app/client/cypress/support/Pages/DataSources.ts
+++ b/app/client/cypress/support/Pages/DataSources.ts
@@ -202,7 +202,7 @@ export class DataSources {
   _mandatoryMark = "//span[text()='*']";
   _deleteDSHostPort = ".t--delete-field";
   _dsTabSchema = "[data-testid='t--tab-SCHEMA_TAB']";
-  private _pageSelectionMenu = "[data-testId='t--page-selection']";
+  private _pageSelectionMenu = "[data-testid='t--page-selection']";
 
   private _pageSelectMenuItem = ".ads-v2-menu__menu-item";
 
@@ -295,7 +295,7 @@ export class DataSources {
   _imgFireStoreLogo = "//img[contains(@src, 'firestore.svg')]";
   _dsVirtuosoElement = `div .t--schema-virtuoso-container`;
   private _dsVirtuosoList = `[data-test-id="virtuoso-item-list"]`;
-  private _dsSchemaContainer = `[data-testId="datasource-schema-container"]`;
+  private _dsSchemaContainer = `[data-testid="datasource-schema-container"]`;
   private _dsVirtuosoElementTable = (targetTableName: string) =>
     `${this._dsSchemaEntityItem}[data-testid='t--entity-item-${targetTableName}']`;
   private _dsPageTabListItem = (buttonText: string) =>
diff --git a/app/client/cypress/support/Pages/PropertyPane.ts b/app/client/cypress/support/Pages/PropertyPane.ts
index 41d5daa99d37..5a15ee560a0d 100644
--- a/app/client/cypress/support/Pages/PropertyPane.ts
+++ b/app/client/cypress/support/Pages/PropertyPane.ts
@@ -92,7 +92,7 @@ export class PropertyPane {
     "div.tab-view span:contains('" + type + "')";
 
   _dropdownSelectType = ".t--open-dropdown-Select-type";
-  _selectorViewLabel = '[data-testId="selector-view-label"]';
+  _selectorViewLabel = '[data-testid="selector-view-label"]';
   _textView = ".text-view";
   _selectorView = ".selector-view";
   _dropdownOptions =
diff --git a/app/client/src/IDE/Components/ToolbarSettingsPopover.tsx b/app/client/src/IDE/Components/ToolbarSettingsPopover.tsx
index 859839018f80..9777ba6093fc 100644
--- a/app/client/src/IDE/Components/ToolbarSettingsPopover.tsx
+++ b/app/client/src/IDE/Components/ToolbarSettingsPopover.tsx
@@ -43,7 +43,7 @@ export const ToolbarSettingsPopover = (props: Props) => {
     <Popover onOpenChange={handleOpenChange} open={isOpen}>
       <PopoverTrigger>
         <ToggleButton
-          data-testId={props.dataTestId}
+          data-testid={props.dataTestId}
           disabled={props.disabled}
           icon="settings-2-line"
           isSelected={isOpen}
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Section/index.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Section/index.tsx
index d47fd7f0616f..6f81e543e6f3 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Section/index.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Section/index.tsx
@@ -21,7 +21,7 @@ const Section: React.FC<SectionProps> = ({
     <div
       className={classNames}
       data-fullwidth={isFullWidth.toString()}
-      data-withoutPadding={withoutPadding.toString()}
+      data-withoutpadding={withoutPadding.toString()}
       {...props}
     >
       {children}
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Section/styles.module.css b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Section/styles.module.css
index ac73ba3c3bc3..8f1d81293b01 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Section/styles.module.css
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Section/styles.module.css
@@ -6,22 +6,22 @@
   max-width: 800px;
   justify-content: center;
 
-  &[data-withoutPadding="true"] {
+  &[data-withoutpadding="true"] {
     padding: 0;
   }
 
   /* We do not want padding above the first section */
-  &[data-withoutPadding="false"]:first-child {
+  &[data-withoutpadding="false"]:first-child {
     padding-bottom: var(--ads-v2-spaces-6);
   }
 
   /* All other sections expect first will have padding top and bottom */
-  &[data-withoutPadding="false"]:not(:first-child) {
+  &[data-withoutpadding="false"]:not(:first-child) {
     padding-block: var(--ads-v2-spaces-6);
   }
 
   /* We will also render a border below sections expect for the last section */
-  &[data-withoutPadding="false"]:not(:last-child) {
+  &[data-withoutpadding="false"]:not(:last-child) {
     border-bottom: 1px solid var(--ads-v2-color-border);
   }
 
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Zone/styles.module.css b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Zone/styles.module.css
index b63260f2d7d1..0af35a6d69c7 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Zone/styles.module.css
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/ActionForm/Zone/styles.module.css
@@ -51,35 +51,7 @@
       }
     }
   }
-  /* PaginationControl hardcoded width is removed */
-  & :global(.t--form-control-PAGINATION) {
-    & > div {
-      grid-gap: 1rem !important;
-      grid-template-columns: repeat(auto-fill, minmax(260px, 1fr)) !important;
-
-      & > div {
-        width: unset !important;
-        margin-right: 0 !important;
-      }
-    }
-  }
-  /* SortingControl hardcoded width is removed */
-  & :global(.t--form-control-SORTING) {
-    & :global(.sorting-dropdown-container) {
-      width: unset;
 
-      & > div {
-        width: 100%;
-        flex: 1;
-      }
-    }
-  }
-  /* WhereClauseControl hardcoded width is removed */
-  & :global(.t--form-control-WHERE_CLAUSE) {
-    & > div {
-      padding-right: 0 !important;
-    }
-  }
   /* DynamicInputTextControl min height and width removed */
   & :global(.uqi-dynamic-input-text) {
     width: unset !important;
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/components/StoreAsDatasource.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/components/StoreAsDatasource.tsx
index b605ca26eb38..f85ef45ca3b3 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/components/StoreAsDatasource.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/CommonEditorForm/components/StoreAsDatasource.tsx
@@ -11,9 +11,11 @@ import { getCurrentBasePageId } from "selectors/editorSelectors";
 import {
   createMessage,
   EDIT_DATASOURCE,
+  EDIT_DATASOURCE_TOOLTIP,
   SAVE_DATASOURCE,
+  SAVE_DATASOURCE_TOOLTIP,
 } from "ee/constants/messages";
-import { Button } from "@appsmith/ads";
+import { Button, Tooltip } from "@appsmith/ads";
 
 interface storeDataSourceProps {
   datasourceId?: string;
@@ -58,19 +60,26 @@ function StoreAsDatasource(props: storeDataSourceProps) {
   };
 
   return (
-    <Button
-      className="t--store-as-datasource"
-      data-testid="t--store-as-datasource"
-      isDisabled={!props.enable}
-      kind="secondary"
-      onClick={saveOrEditDatasource}
-      size="md"
-      startIcon={props.shouldSave ? "database-2-line" : "pencil-line"}
+    <Tooltip
+      content={
+        props.shouldSave
+          ? createMessage(SAVE_DATASOURCE_TOOLTIP)
+          : createMessage(EDIT_DATASOURCE_TOOLTIP)
+      }
     >
-      {props.shouldSave
-        ? createMessage(SAVE_DATASOURCE)
-        : createMessage(EDIT_DATASOURCE)}
-    </Button>
+      <Button
+        className="t--store-as-datasource"
+        data-testid="t--store-as-datasource"
+        isDisabled={!props.enable}
+        kind="secondary"
+        onClick={saveOrEditDatasource}
+        size="md"
+      >
+        {props.shouldSave
+          ? createMessage(SAVE_DATASOURCE)
+          : createMessage(EDIT_DATASOURCE)}
+      </Button>
+    </Tooltip>
   );
 }
 
diff --git a/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/FormRender.tsx b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/FormRender.tsx
index 1274424a8927..faaa00bb1cb1 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/FormRender.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionForm/components/UQIEditor/FormRender.tsx
@@ -170,7 +170,7 @@ const FormRender = (props: Props) => {
     if (section.hasOwnProperty("controlType")) {
       // If component is type section, render it's children
       if (Object.hasOwn(section, "children")) {
-        return rederNodeWithChildren(section, formName);
+        return renderNodeWithChildren(section, formName);
       }
 
       try {
@@ -201,7 +201,7 @@ const FormRender = (props: Props) => {
   };
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const rederNodeWithChildren = (section: any, formName: string) => {
+  const renderNodeWithChildren = (section: any, formName: string) => {
     if (!Object.hasOwn(section, "children")) return;
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/PluginActionResponse.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/PluginActionResponse.tsx
index 88524b915eb2..45244f48010c 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionResponse/PluginActionResponse.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/PluginActionResponse.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from "react";
+import React, { useCallback, useEffect } from "react";
 import { IDEBottomView, ViewHideBehaviour } from "IDE";
 import { ActionExecutionResizerHeight } from "./constants";
 import EntityBottomTabs from "components/editorComponents/EntityBottomTabs";
@@ -8,17 +8,66 @@ import { getPluginActionDebuggerState } from "../../store";
 import { DEBUGGER_TAB_KEYS } from "components/editorComponents/Debugger/constants";
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import { usePluginActionResponseTabs } from "./hooks";
+import { usePluginActionContext } from "../../PluginActionContext";
+import { doesPluginRequireDatasource } from "ee/entities/Engine/actionHelpers";
+import useShowSchema from "./hooks/useShowSchema";
+import { actionResponseDisplayDataFormats } from "pages/Editor/utils";
 
 function PluginActionResponse() {
   const dispatch = useDispatch();
+  const { actionResponse, plugin } = usePluginActionContext();
 
   const tabs = usePluginActionResponseTabs();
+  const pluginRequireDatasource = doesPluginRequireDatasource(plugin);
+
+  const showSchema = useShowSchema(plugin?.id || "") && pluginRequireDatasource;
 
   // TODO combine API and Query Debugger state
   const { open, responseTabHeight, selectedTab } = useSelector(
     getPluginActionDebuggerState,
   );
 
+  const { responseDisplayFormat } =
+    actionResponseDisplayDataFormats(actionResponse);
+
+  // These useEffects are used to open the response tab by default for page load queries
+  // as for page load queries, query response is available and can be shown in response tab
+  useEffect(
+    function openResponseTabForPageLoadQueries() {
+      // actionResponse and responseDisplayFormat is present only when query has response available
+      if (
+        !!responseDisplayFormat?.title &&
+        actionResponse?.isExecutionSuccess
+      ) {
+        dispatch(
+          setPluginActionEditorDebuggerState({
+            open: true,
+            selectedTab: DEBUGGER_TAB_KEYS.RESPONSE_TAB,
+          }),
+        );
+      }
+    },
+    [
+      responseDisplayFormat?.title,
+      actionResponse?.isExecutionSuccess,
+      dispatch,
+    ],
+  );
+
+  useEffect(
+    function openSchemaTabWhenNoTabIsSelected() {
+      if (showSchema && !selectedTab) {
+        dispatch(
+          setPluginActionEditorDebuggerState({
+            open: true,
+            selectedTab: DEBUGGER_TAB_KEYS.SCHEMA_TAB,
+          }),
+        );
+      }
+    },
+    [showSchema, selectedTab, dispatch],
+  );
+
   const toggleHide = useCallback(
     () => dispatch(setPluginActionEditorDebuggerState({ open: !open })),
     [dispatch, open],
diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/BindDataButton.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/BindDataButton.tsx
index 56271b6f31db..76cf88936ffb 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/BindDataButton.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/BindDataButton.tsx
@@ -385,7 +385,7 @@ function BindDataButton(props: BindDataButtonProps) {
       </MenuTrigger>
       <MenuContent
         align={"end"}
-        data-testId={"t--widget-selection"}
+        data-testid={"t--widget-selection"}
         height={pages.length <= 4 ? "fit-content" : "186px"}
         side={"top"}
         width="235px"
diff --git a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/Schema.tsx b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/Schema.tsx
index e9eb2fcde3da..7305c7a13927 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionResponse/components/Schema.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionResponse/components/Schema.tsx
@@ -12,17 +12,22 @@ import {
   getIsFetchingDatasourceStructure,
   getPluginImages,
   getPluginIdFromDatasourceId,
+  getPluginDatasourceComponentFromId,
 } from "ee/selectors/entitiesSelector";
 import DatasourceField from "pages/Editor/DatasourceInfo/DatasourceField";
 import { find } from "lodash";
 import type { AppState } from "ee/reducers";
 import RenderInterimDataState from "pages/Editor/DatasourceInfo/RenderInterimDataState";
 import { getPluginActionDebuggerState } from "../../../store";
-import { refreshDatasourceStructure } from "actions/datasourceActions";
+import {
+  fetchDatasourceStructure,
+  refreshDatasourceStructure,
+} from "actions/datasourceActions";
 import history from "utils/history";
 import { datasourcesEditorIdURL } from "ee/RouteBuilder";
 import { EntityIcon } from "pages/Editor/Explorer/ExplorerIcons";
 import { getAssetUrl } from "ee/utils/airgapHelpers";
+import { DatasourceComponentTypes } from "api/PluginApi";
 
 interface Props {
   datasourceId: string;
@@ -65,9 +70,30 @@ const Schema = (props: Props) => {
     getIsFetchingDatasourceStructure(state, props.datasourceId),
   );
 
+  const pluginDatasourceForm = useSelector((state) =>
+    getPluginDatasourceComponentFromId(state, pluginId || ""),
+  );
+
   useEffect(() => {
     setSelectedTable(undefined);
   }, [props.datasourceId]);
+
+  useEffect(() => {
+    if (
+      props.datasourceId &&
+      datasourceStructure === undefined &&
+      pluginDatasourceForm !== DatasourceComponentTypes.RestAPIDatasourceForm
+    ) {
+      dispatch(
+        fetchDatasourceStructure(
+          props.datasourceId,
+          true,
+          DatasourceStructureContext.QUERY_EDITOR,
+        ),
+      );
+    }
+  }, [props.datasourceId, datasourceStructure, dispatch, pluginDatasourceForm]);
+
   useEffect(() => {
     if (!selectedTable && datasourceStructure?.tables?.length && !isLoading) {
       setSelectedTable(datasourceStructure.tables[0].name);
@@ -108,7 +134,7 @@ const Schema = (props: Props) => {
       overflow="hidden"
     >
       <Flex
-        data-testId="datasource-schema-container"
+        data-testid="datasource-schema-container"
         flex="1"
         flexDirection="column"
         gap="spaces-3"
diff --git a/app/client/src/PluginActionEditor/components/PluginActionSettings/SettingsPopover.tsx b/app/client/src/PluginActionEditor/components/PluginActionSettings/SettingsPopover.tsx
index f5a3f0395d81..0239936dabad 100644
--- a/app/client/src/PluginActionEditor/components/PluginActionSettings/SettingsPopover.tsx
+++ b/app/client/src/PluginActionEditor/components/PluginActionSettings/SettingsPopover.tsx
@@ -4,9 +4,9 @@ import ActionSettings from "pages/Editor/ActionSettings";
 import { usePluginActionContext } from "../../PluginActionContext";
 import styled from "styled-components";
 import {
-  API_EDITOR_TAB_TITLES,
   createMessage,
-  LEARN_MORE,
+  API_EDITOR_TAB_TITLES,
+  MORE_ON_QUERY_SETTINGS,
 } from "ee/constants/messages";
 import { useDispatch, useSelector } from "react-redux";
 import {
@@ -92,7 +92,7 @@ const PluginActionSettingsPopover = (props: SettingsProps) => {
             kind="secondary"
             onClick={handleLearnMoreClick}
           >
-            {createMessage(LEARN_MORE)}
+            {createMessage(MORE_ON_QUERY_SETTINGS)}
           </LearnMoreLink>
         )}
       </SettingsWrapper>
diff --git a/app/client/src/UITelemetry/generateTraces.ts b/app/client/src/UITelemetry/generateTraces.ts
index 0519ba7ceda6..ec1941e09e4f 100644
--- a/app/client/src/UITelemetry/generateTraces.ts
+++ b/app/client/src/UITelemetry/generateTraces.ts
@@ -14,10 +14,9 @@ import {
   osName,
   osVersion,
 } from "react-device-detect";
-import { APP_MODE } from "entities/App";
-import { matchBuilderPath, matchViewerPath } from "constants/routes";
 import nanoid from "nanoid";
 import memoizeOne from "memoize-one";
+import { getApplicationParamsFromUrl } from "ee/utils/serviceWorkerUtils";
 
 const GENERATOR_TRACE = "generator-tracer";
 
@@ -26,25 +25,36 @@ export type SpanAttributes = Attributes;
 
 const OTLP_SESSION_ID = nanoid();
 
-const getAppMode = memoizeOne((pathname: string) => {
-  const isEditorUrl = matchBuilderPath(pathname);
-  const isViewerUrl = matchViewerPath(pathname);
-
-  const appMode = isEditorUrl
-    ? APP_MODE.EDIT
-    : isViewerUrl
-      ? APP_MODE.PUBLISHED
-      : "";
-
-  return appMode;
-});
+const getAppParams = memoizeOne(
+  (origin: string, pathname: string, search: string) => {
+    const applicationParams = getApplicationParamsFromUrl({
+      origin,
+      pathname,
+      search,
+    });
+
+    const {
+      applicationSlug,
+      appMode = "",
+      basePageId: pageId,
+      branchName,
+    } = applicationParams || {};
+
+    return {
+      appMode,
+      pageId,
+      branchName,
+      applicationSlug,
+    };
+  },
+);
 
 export const getCommonTelemetryAttributes = () => {
-  const pathname = window.location.pathname;
-  const appMode = getAppMode(pathname);
+  const { origin, pathname, search } = window.location;
+  const appParams = getAppParams(origin, pathname, search);
 
   return {
-    appMode,
+    ...appParams,
     deviceType,
     browserName,
     browserVersion,
diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts
index 7d06b877e81b..cf5f33719e5c 100644
--- a/app/client/src/ce/constants/messages.ts
+++ b/app/client/src/ce/constants/messages.ts
@@ -366,7 +366,9 @@ export const DATASOURCE_UPDATE = (dsName: string) =>
 export const DATASOURCE_VALID = (dsName: string) =>
   `${dsName} datasource is valid`;
 export const EDIT_DATASOURCE = () => "Edit";
-export const SAVE_DATASOURCE = () => "Save";
+export const SAVE_DATASOURCE = () => "Save URL";
+export const EDIT_DATASOURCE_TOOLTIP = () => "Edit datasource";
+export const SAVE_DATASOURCE_TOOLTIP = () => "Save URL as a datasource";
 export const SAVE_DATASOURCE_MESSAGE = () =>
   "Save the URL as a datasource to access authentication settings";
 export const EDIT_DATASOURCE_MESSAGE = () =>
@@ -645,6 +647,7 @@ export const NO_JS_FUNCTION_TO_RUN = (JSObjectName: string) =>
   `${JSObjectName} has no function`;
 export const NO_JS_FUNCTION_RETURN_VALUE = (JSFunctionName: string) =>
   `${JSFunctionName} did not return any data. Did you add a return statement?`;
+export const MORE_ON_QUERY_SETTINGS = () => "More on query settings";
 
 export const REMOVE_CONFIRM_BEFORE_CALLING_HEADING = () =>
   `Remove 'Confirm before calling' `;
@@ -2517,5 +2520,5 @@ export const PREPARED_STATEMENT_WARNING = {
 
 export const JS_EDITOR_SETTINGS = {
   TITLE: () => "Settings",
-  ON_LOAD_TITLE: () => "Choose functions to run on page load",
+  ON_LOAD_TITLE: () => "Choose the functions to run on page load",
 };
diff --git a/app/client/src/ce/sagas/userSagas.tsx b/app/client/src/ce/sagas/userSagas.tsx
index 76fdb329ccb0..42f5cfa8379e 100644
--- a/app/client/src/ce/sagas/userSagas.tsx
+++ b/app/client/src/ce/sagas/userSagas.tsx
@@ -43,7 +43,6 @@ import {
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import { INVITE_USERS_TO_WORKSPACE_FORM } from "ee/constants/forms";
 import type { User } from "constants/userConstants";
-import { ANONYMOUS_USERNAME } from "constants/userConstants";
 import {
   flushErrorsAndRedirect,
   safeCrashAppRequest,
@@ -190,9 +189,15 @@ export function* getCurrentUserSaga(action?: {
   }
 }
 
-function* intializeSmartLook(currentUser: User) {
-  if (!currentUser.isAnonymous && currentUser.username !== ANONYMOUS_USERNAME) {
-    yield AnalyticsUtil.identifyUser(currentUser);
+function* initTrackers(currentUser: User) {
+  const initializeSentry = initializeAnalyticsAndTrackers(currentUser);
+
+  const sentryInitialized: boolean = yield initializeSentry;
+
+  if (sentryInitialized) {
+    yield put(segmentInitSuccess());
+  } else {
+    yield put(segmentInitUncertain());
   }
 }
 
@@ -202,20 +207,7 @@ export function* runUserSideEffectsSaga() {
   const isAirgappedInstance = isAirgapped();
 
   if (enableTelemetry) {
-    // parallelize sentry and smart look initialization
-
-    yield fork(intializeSmartLook, currentUser);
-    const initializeSentry = initializeAnalyticsAndTrackers();
-
-    if (initializeSentry instanceof Promise) {
-      const sentryInialized: boolean = yield initializeSentry;
-
-      if (sentryInialized) {
-        yield put(segmentInitSuccess());
-      } else {
-        yield put(segmentInitUncertain());
-      }
-    }
+    yield fork(initTrackers, currentUser);
   }
 
   const isFFFetched: boolean = yield select(getFeatureFlagsFetched);
diff --git a/app/client/src/ce/utils/serviceWorkerUtils.test.ts b/app/client/src/ce/utils/serviceWorkerUtils.test.ts
index 87c07a50c60f..5a71363c89e1 100644
--- a/app/client/src/ce/utils/serviceWorkerUtils.test.ts
+++ b/app/client/src/ce/utils/serviceWorkerUtils.test.ts
@@ -212,6 +212,7 @@ describe("serviceWorkerUtils", () => {
       const expectedParams: TApplicationParams = {
         origin: "https://app.appsmith.com",
         basePageId,
+        applicationSlug: "my-app",
         baseApplicationId: undefined,
         branchName: "main",
         appMode: APP_MODE.EDIT,
@@ -227,6 +228,7 @@ describe("serviceWorkerUtils", () => {
       const expectedParams: TApplicationParams = {
         origin: "https://app.appsmith.com",
         basePageId,
+        applicationSlug: "my-app",
         baseApplicationId: undefined,
         branchName: "main",
         appMode: APP_MODE.PUBLISHED,
@@ -307,6 +309,7 @@ describe("serviceWorkerUtils", () => {
       );
       const expectedParams: TApplicationParams = {
         origin: "https://app.appsmith.com",
+        applicationSlug: "my-app",
         basePageId,
         baseApplicationId: undefined,
         branchName: "",
diff --git a/app/client/src/ce/utils/serviceWorkerUtils.ts b/app/client/src/ce/utils/serviceWorkerUtils.ts
index 1d359270188b..7d729e72826d 100644
--- a/app/client/src/ce/utils/serviceWorkerUtils.ts
+++ b/app/client/src/ce/utils/serviceWorkerUtils.ts
@@ -14,6 +14,7 @@ import {
 interface TMatchResult {
   basePageId?: string;
   baseApplicationId?: string;
+  applicationSlug?: string;
 }
 
 export interface TApplicationParams {
@@ -22,6 +23,7 @@ export interface TApplicationParams {
   baseApplicationId?: string;
   branchName: string;
   appMode: APP_MODE;
+  applicationSlug?: string;
 }
 
 type TApplicationParamsOrNull = TApplicationParams | null;
@@ -57,33 +59,36 @@ export const getSearchQuery = (search = "", key: string) => {
 };
 
 export const getApplicationParamsFromUrl = (
-  url: URL,
+  urlParams: Pick<URL, "origin" | "pathname" | "search">,
 ): TApplicationParamsOrNull => {
+  const { origin, pathname, search } = urlParams;
   // Get the branch name from the query string
-  const branchName = getSearchQuery(url.search, "branch");
+  const branchName = getSearchQuery(search, "branch");
 
-  const matchedBuilder: Match<TMatchResult> = matchBuilderPath(url.pathname, {
+  const matchedBuilder: Match<TMatchResult> = matchBuilderPath(pathname, {
     end: false,
   });
-  const matchedViewer: Match<TMatchResult> = matchViewerPath(url.pathname);
+  const matchedViewer: Match<TMatchResult> = matchViewerPath(pathname);
 
   if (matchedBuilder) {
     return {
-      origin: url.origin,
+      origin,
       basePageId: matchedBuilder.params.basePageId,
       baseApplicationId: matchedBuilder.params.baseApplicationId,
       branchName,
       appMode: APP_MODE.EDIT,
+      applicationSlug: matchedBuilder.params.applicationSlug,
     };
   }
 
   if (matchedViewer) {
     return {
-      origin: url.origin,
+      origin,
       basePageId: matchedViewer.params.basePageId,
       baseApplicationId: matchedViewer.params.baseApplicationId,
       branchName,
       appMode: APP_MODE.PUBLISHED,
+      applicationSlug: matchedViewer.params.applicationSlug,
     };
   }
 
diff --git a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts
index 5fde2d76c5bf..05b046f51f09 100644
--- a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts
+++ b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts
@@ -10038,12 +10038,12 @@ export const defaultAppState = {
             id: 1,
             children: [
               {
-                label: "Run query on page load",
+                label: "Run the query on page load",
                 configProperty: "executeOnLoad",
                 controlType: "SWITCH",
               },
               {
-                label: "Request confirmation before running query",
+                label: "Request confirmation before running this query",
                 configProperty: "confirmBeforeExecute",
                 controlType: "SWITCH",
                 tooltipText:
@@ -10074,12 +10074,12 @@ export const defaultAppState = {
             id: 1,
             children: [
               {
-                label: "Run query on page load",
+                label: "Run the query on page load",
                 configProperty: "executeOnLoad",
                 controlType: "SWITCH",
               },
               {
-                label: "Request confirmation before running query",
+                label: "Request confirmation before running this query",
                 configProperty: "confirmBeforeExecute",
                 controlType: "SWITCH",
                 tooltipText:
@@ -10110,12 +10110,12 @@ export const defaultAppState = {
             id: 1,
             children: [
               {
-                label: "Run API on page load",
+                label: "Run the API on page load",
                 configProperty: "executeOnLoad",
                 controlType: "SWITCH",
               },
               {
-                label: "Request confirmation before running API",
+                label: "Request confirmation before running this API",
                 configProperty: "confirmBeforeExecute",
                 controlType: "SWITCH",
                 tooltipText:
@@ -10176,12 +10176,12 @@ export const defaultAppState = {
             id: 1,
             children: [
               {
-                label: "Run API on page load",
+                label: "Run the API on page load",
                 configProperty: "executeOnLoad",
                 controlType: "SWITCH",
               },
               {
-                label: "Request confirmation before running API",
+                label: "Request confirmation before running this API",
                 configProperty: "confirmBeforeExecute",
                 controlType: "SWITCH",
                 tooltipText:
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/DropdownOption.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/DropdownOption.tsx
index 740af870f62a..bbc1833d6adb 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/DropdownOption.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/DropdownOption.tsx
@@ -59,7 +59,7 @@ export function LoadMoreOptions(props: LoadmoreProps) {
     return (
       <MenuItem>
         <div
-          data-testId="t--one-click-binding-datasource--load-more"
+          data-testid="t--one-click-binding-datasource--load-more"
           onMouseDown={(e) => {
             e?.stopPropagation();
           }}
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/index.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/index.tsx
index 5d4e95b9a30d..ced58132eca4 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/index.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/index.tsx
@@ -100,7 +100,7 @@ function DatasourceDropdown() {
   const onChange = useCallback((value: string) => setSearchText(value), []);
 
   return (
-    <SelectWrapper data-testId="t--one-click-binding-datasource-selector">
+    <SelectWrapper data-testid="t--one-click-binding-datasource-selector">
       <Menu
         onOpenChange={(open: boolean) => {
           setOpen(open);
@@ -110,7 +110,7 @@ function DatasourceDropdown() {
       >
         <MenuTrigger>
           <StyledDropdownTrigger
-            data-testId="t--one-click-binding-datasource-trigger"
+            data-testid="t--one-click-binding-datasource-trigger"
             isDisabled={disabled}
             isValid={!error}
           >
@@ -131,7 +131,7 @@ function DatasourceDropdown() {
             <StyledInputContainer>
               <SearchInput
                 autoFocus
-                data-testId="t--one-click-binding-datasource--search"
+                data-testid="t--one-click-binding-datasource--search"
                 onChange={onChange}
                 size="md"
                 // @ts-expect-error Fix this the next time the file is edited
@@ -141,7 +141,7 @@ function DatasourceDropdown() {
             </StyledInputContainer>
 
             {!!connectToOptions.length && (
-              <StyledMenuGroupName data-testId="t--one-click-binding-datasource-selector--bind-to-query">
+              <StyledMenuGroupName data-testid="t--one-click-binding-datasource-selector--bind-to-query">
                 <Text kind="heading-xs">{constants?.connectToText}</Text>
               </StyledMenuGroupName>
             )}
@@ -156,7 +156,7 @@ function DatasourceDropdown() {
               .map((option) => {
                 return (
                   <MenuItem
-                    data-testId="t--one-click-binding-datasource-selector--query"
+                    data-testid="t--one-click-binding-datasource-selector--query"
                     key={option?.id}
                     onSelect={() => {
                       option?.onSelect(option?.value, option);
@@ -202,7 +202,7 @@ function DatasourceDropdown() {
               .map((option) => {
                 return (
                   <MenuItem
-                    data-testId="t--one-click-binding-datasource-selector--datasource"
+                    data-testid="t--one-click-binding-datasource-selector--datasource"
                     key={option.id}
                     onSelect={() => {
                       option?.onSelect?.(option.value || "", option);
@@ -248,7 +248,7 @@ function DatasourceDropdown() {
             {otherOptions.map((option: DropdownOptionType) => {
               return (
                 <MenuItem
-                  data-testId="t--one-click-binding-datasource-selector--other-action"
+                  data-testid="t--one-click-binding-datasource-selector--other-action"
                   key={option.id}
                   onSelect={() => {
                     option.onSelect?.(option.value || "", option);
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/TableOrSpreadsheetDropdown/index.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/TableOrSpreadsheetDropdown/index.tsx
index ad169cdb28c7..801e23a135f4 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/TableOrSpreadsheetDropdown/index.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/TableOrSpreadsheetDropdown/index.tsx
@@ -58,7 +58,7 @@ function TableOrSpreadsheetDropdown() {
           {options.map((option) => {
             return (
               <Option
-                data-testId="t--one-click-binding-table-selector--table"
+                data-testid="t--one-click-binding-table-selector--table"
                 key={option.id}
                 value={option.value}
               >
@@ -67,7 +67,7 @@ function TableOrSpreadsheetDropdown() {
             );
           })}
         </Select>
-        <ErrorMessage data-testId="t--one-click-binding-table-selector--error">
+        <ErrorMessage data-testid="t--one-click-binding-table-selector--error">
           {error}
         </ErrorMessage>
       </SelectWrapper>
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/ConnectData/index.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/ConnectData/index.tsx
index 31ed5b56a492..ebcddb1f23c4 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/ConnectData/index.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/ConnectData/index.tsx
@@ -9,7 +9,7 @@ export function ConnectData({ btnText }: { btnText: string }) {
   if (show) {
     return (
       <StyledButton
-        data-testId="t--one-click-binding-connect-data"
+        data-testid="t--one-click-binding-connect-data"
         isDisabled={disabled}
         isLoading={isLoading}
         onClick={onClick}
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/SheetsDropdown/index.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/SheetsDropdown/index.tsx
index d1e3396a77e5..33a69370638f 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/SheetsDropdown/index.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/DatasourceSpecificControls/GoogleSheetControls/SheetsDropdown/index.tsx
@@ -26,7 +26,7 @@ export default memo(function SheetsDropdown() {
           <Label>{label}</Label>
         </Tooltip>
         <Select
-          data-testId="t--sheetName-dropdown"
+          data-testid="t--sheetName-dropdown"
           dropdownStyle={{
             minWidth: "350px",
             maxHeight: "300px",
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/index.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/index.tsx
index 51b4b7f85336..d1162ac51deb 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/index.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/ColumnDropdown/index.tsx
@@ -33,7 +33,7 @@ function ColumnDropdown(props: Props) {
         <Label>{props.label}</Label>
         <Select
           allowClear
-          data-testId={`t--one-click-binding-column-${props.id}`}
+          data-testid={`t--one-click-binding-column-${props.id}`}
           dropdownStyle={{
             minWidth: "350px",
             maxHeight: "300px",
@@ -56,7 +56,7 @@ function ColumnDropdown(props: Props) {
           {options.map((option) => {
             return (
               <Option
-                data-testId={`t--one-click-binding-column-${props.id}--column`}
+                data-testid={`t--one-click-binding-column-${props.id}--column`}
                 key={option.id}
                 value={option.value}
               >
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/useDropdown.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/useDropdown.tsx
index e5143135f270..9226031a5f83 100644
--- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/useDropdown.tsx
+++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/WidgetSpecificControls/OtherFields/Field/Dropdown/useDropdown.tsx
@@ -176,7 +176,7 @@ export function useDropdown(props: OneClickDropdownFieldProps) {
     if (options && options.length > 0) {
       return (options as DropdownOptionType[])?.map((option) => (
         <Option
-          data-testId={`t--one-click-binding-column-${props.id}--column`}
+          data-testid={`t--one-click-binding-column-${props.id}--column`}
           key={option.id}
           value={option.value}
         >
@@ -186,7 +186,7 @@ export function useDropdown(props: OneClickDropdownFieldProps) {
     } else {
       return (
         <Option
-          data-testId="t--one-click-binding-no-connectable-widget"
+          data-testid="t--one-click-binding-no-connectable-widget"
           disabled
         >
           {createMessage(NO_CONNECTABLE_WIDGET_FOUND)}
diff --git a/app/client/src/components/formControls/PaginationControl.tsx b/app/client/src/components/formControls/PaginationControl.tsx
index d66a04a82c51..532f71877feb 100644
--- a/app/client/src/components/formControls/PaginationControl.tsx
+++ b/app/client/src/components/formControls/PaginationControl.tsx
@@ -10,7 +10,6 @@ import { PaginationSubComponent } from "components/formControls/utils";
 
 export const StyledFormLabel = styled(FormLabel)`
   margin-top: 5px;
-  /* font-weight: 400; */
   font-size: 12px;
   color: var(--ads-v2-color-fg-muted);
   line-height: 12px;
@@ -19,14 +18,13 @@ export const StyledFormLabel = styled(FormLabel)`
 export const FormControlContainer = styled.div`
   display: flex;
   flex-direction: column;
-  width: 270px;
-  margin-right: 1rem;
 `;
 
 const PaginationContainer = styled.div`
   display: grid;
-  grid-gap: 5px 5px;
-  grid-template-columns: repeat(auto-fill, 270px);
+  column-gap: var(--ads-v2-spaces-4);
+  row-gap: var(--ads-v2-spaces-2);
+  grid-template-columns: repeat(auto-fill, minmax(260px, 1fr));
 `;
 
 // using query dynamic input text for both so user can dynamically change these values.
@@ -36,9 +34,6 @@ const valueFieldConfig: any = {
   key: "value",
   controlType: "QUERY_DYNAMIC_INPUT_TEXT",
   placeholderText: "value",
-  customStyles: {
-    // width: "280px",
-  },
 };
 
 // TODO: Fix this the next time the file is edited
@@ -91,7 +86,6 @@ export function Pagination(props: {
   );
 
   const defaultStyles = {
-    // width: "280px",
     ...customStyles,
   };
 
@@ -115,7 +109,6 @@ export function Pagination(props: {
         />
         <StyledFormLabel>Limits the number of rows returned.</StyledFormLabel>
       </FormControlContainer>
-
       {/*  form control for Offset field */}
       <FormControlContainer>
         <FormControl
diff --git a/app/client/src/components/formControls/SortingControl.tsx b/app/client/src/components/formControls/SortingControl.tsx
index 9f8454edde98..93e718ac3d88 100644
--- a/app/client/src/components/formControls/SortingControl.tsx
+++ b/app/client/src/components/formControls/SortingControl.tsx
@@ -54,13 +54,13 @@ const orderFieldConfig: any = {
 
 const SortingContainer = styled.div`
   display: flex;
-  gap: 5px;
+  gap: var(--ads-v2-spaces-4);
   flex-direction: column;
 `;
 
 const SortingDropdownContainer = styled.div`
   display: flex;
-  gap: 5px;
+  gap: var(--ads-v2-spaces-4);
 `;
 
 const SortingFields = styled.div<{ isBreakpointSmall: boolean }>`
@@ -69,7 +69,9 @@ const SortingFields = styled.div<{ isBreakpointSmall: boolean }>`
     isBreakpointSmall ? "1fr" : "1fr 180px"};
   grid-template-rows: ${({ isBreakpointSmall }) =>
     isBreakpointSmall ? "1fr 1fr" : "1fr"};
-  gap: 5px;
+  column-gap: var(--ads-v2-spaces-4);
+  row-gap: var(--ads-v2-spaces-2);
+  width: 100%;
 `;
 
 const ButtonWrapper = styled.div`
@@ -159,9 +161,6 @@ function SortingComponent(props: SortingComponentProps) {
                 <FormControl
                   config={{
                     ...columnFieldConfig,
-                    customStyles: {
-                      width: "100%",
-                    },
                     configProperty: columnPath,
                     nestedFormControl: true,
                   }}
diff --git a/app/client/src/components/formControls/WhereClauseControl.tsx b/app/client/src/components/formControls/WhereClauseControl.tsx
index b220801ea7d2..3ac3f2fce376 100644
--- a/app/client/src/components/formControls/WhereClauseControl.tsx
+++ b/app/client/src/components/formControls/WhereClauseControl.tsx
@@ -90,7 +90,7 @@ const CenteredIconButton = styled(Button)<{
 `;
 
 // We are setting a background color for the last two nested levels
-const handleSecondaryBoxBackgroudColor = (
+const handleSecondaryBoxBackgroundColor = (
   currentNestingLevel: number,
   nestedLevels: number,
 ) => {
@@ -113,11 +113,12 @@ const SecondaryBox = styled.div<{
   display: flex;
   flex-direction: column;
   position: relative;
-  border-radius: var(--ads-v2-border-radius);
   border: solid 1px var(--ads-v2-color-border);
+  border-radius: var(--ads-v2-border-radius);
   border-width: ${(props) => (props?.showBorder ? "1px" : "0px")};
   padding: ${(props) =>
-    props?.showBorder ? "0px 12px 12px 8px" : "4px 12px 12px 0px"};
+    props?.showBorder ? "0px 12px 12px 8px" : "4px 0px 12px 0px"};
+
   width: 100%;
   // Setting a max width to not have it really elongate on very large screens
   max-width: 2000px;
@@ -125,11 +126,10 @@ const SecondaryBox = styled.div<{
   ${(props) =>
     props.size === "small" &&
     `
-    ${handleSecondaryBoxBackgroudColor(
+    ${handleSecondaryBoxBackgroundColor(
       props.currentNestingLevel,
       props.nestedLevels,
     )}
-    padding-bottom: 12px;
   `}
 `;
 
@@ -139,14 +139,13 @@ const ConditionWrapper = styled.div<{ size: string }>`
   flex-direction: row;
   align-items: center;
   width: 100%;
-  gap: 5px;
+  gap: var(--ads-v2-spaces-4);
   margin-top: var(--ads-v2-spaces-3);
   margin-bottom: 5px;
 
   ${(props) =>
     props.size === "small" &&
     `
-    // margin-top: 0px;
     gap: 0px;
     flex-direction: column;
     align-items: start;
@@ -163,8 +162,8 @@ const ConditionBox = styled.div<{ size?: string }>`
   // The 4 elements(3 input fields and a close button) are horizontally aligned
   // by default
   grid-template-columns: auto 100px auto max-content;
-  grid-column-gap: 5px;
-  grid-row-gap: 5px;
+  column-gap: var(--ads-v2-spaces-4);
+  row-gap: var(--ads-v2-spaces-2);
   width: 100%;
 
   ${(props) =>
@@ -178,7 +177,7 @@ const ConditionBox = styled.div<{ size?: string }>`
     // are verticall aligned one below the other.
     grid-template-columns: repeat(2, max-content);
     grid-template-rows: repeat(3, max-content);
-    grid-column-gap: 5px;
+    column-gap: var(--ads-v2-spaces-4);
     // The three input fields will be in the first column
     & :not(:nth-child(4)) {
       grid-column-start: 1;
@@ -196,7 +195,7 @@ const ConditionBox = styled.div<{ size?: string }>`
 const ActionBox = styled.div<{ marginLeft: string; size: string }>`
   display: flex;
   flex-direction: row;
-  gap: 5px;
+  row-gap: var(--ads-v2-spaces-2);
   background-color: inherit;
   margin-left: ${(props) => props.marginLeft};
 
@@ -210,16 +209,15 @@ const ActionBox = styled.div<{ marginLeft: string; size: string }>`
 const GroupConditionBox = styled.div<{ size: string }>`
   display: flex;
   flex-direction: row;
-  gap: 5px;
+  gap: var(--ads-v2-spaces-4);
   width: 100%;
 
   ${(props) =>
     props.size === "small" &&
     `
-  gap: 5px;
-  margin: 5px 0px;
-  flex-direction: row;
-  min-width: max-content;
+    margin: 5px 0px;
+    flex-direction: row;
+    min-width: max-content;
   `}
 `;
 
@@ -308,9 +306,8 @@ function ConditionBlock(props: any) {
   // Smallest width of the component below which the individual input fields don't
   // decrease in width anymore so we decide to shift to small space layout at this point
   const size = useResponsiveBreakpoints(targetRef, [{ small: 505 }]);
-  // TODO: Fix this the next time the file is edited
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const formValues: any = useSelector((state) =>
+
+  const formValues = useSelector((state) =>
     getFormValues(props.formName)(state),
   );
 
@@ -413,6 +410,7 @@ function ConditionBlock(props: any) {
                   <CenteredIconButton
                     alignSelf={"start"}
                     data-testid={`t--where-clause-delete-[${index}]`}
+                    isIconButton
                     kind="tertiary"
                     onClick={(e: React.MouseEvent) => {
                       e.stopPropagation();
diff --git a/app/client/src/constants/AppsmithActionConstants/formConfig/ApiSettingsConfig.ts b/app/client/src/constants/AppsmithActionConstants/formConfig/ApiSettingsConfig.ts
index ff9b35587edf..103aff745a68 100644
--- a/app/client/src/constants/AppsmithActionConstants/formConfig/ApiSettingsConfig.ts
+++ b/app/client/src/constants/AppsmithActionConstants/formConfig/ApiSettingsConfig.ts
@@ -13,12 +13,12 @@ export default [
     id: 1,
     children: [
       {
-        label: "Run API on page load",
+        label: "Run the API on page load",
         configProperty: "executeOnLoad",
         controlType: "SWITCH",
       },
       {
-        label: "Request confirmation before running API",
+        label: "Request confirmation before running this API",
         configProperty: "confirmBeforeExecute",
         controlType: "SWITCH",
         tooltipText:
diff --git a/app/client/src/constants/AppsmithActionConstants/formConfig/GoogleSheetsSettingsConfig.ts b/app/client/src/constants/AppsmithActionConstants/formConfig/GoogleSheetsSettingsConfig.ts
index 2c9cfe669617..7ad33fde15e2 100644
--- a/app/client/src/constants/AppsmithActionConstants/formConfig/GoogleSheetsSettingsConfig.ts
+++ b/app/client/src/constants/AppsmithActionConstants/formConfig/GoogleSheetsSettingsConfig.ts
@@ -4,12 +4,12 @@ export default [
     id: 1,
     children: [
       {
-        label: "Run API on page load",
+        label: "Run the API on page load",
         configProperty: "executeOnLoad",
         controlType: "SWITCH",
       },
       {
-        label: "Request confirmation before running API",
+        label: "Request confirmation before running this API",
         configProperty: "confirmBeforeExecute",
         controlType: "SWITCH",
         tooltipText:
diff --git a/app/client/src/constants/AppsmithActionConstants/formConfig/QuerySettingsConfig.ts b/app/client/src/constants/AppsmithActionConstants/formConfig/QuerySettingsConfig.ts
index ed8227e6ceb6..d5a4f038f08a 100644
--- a/app/client/src/constants/AppsmithActionConstants/formConfig/QuerySettingsConfig.ts
+++ b/app/client/src/constants/AppsmithActionConstants/formConfig/QuerySettingsConfig.ts
@@ -4,12 +4,12 @@ export default [
     id: 1,
     children: [
       {
-        label: "Run query on page load",
+        label: "Run the query on page load",
         configProperty: "executeOnLoad",
         controlType: "SWITCH",
       },
       {
-        label: "Request confirmation before running query",
+        label: "Request confirmation before running this query",
         configProperty: "confirmBeforeExecute",
         controlType: "SWITCH",
         tooltipText:
diff --git a/app/client/src/constants/PropertyControlConstants.tsx b/app/client/src/constants/PropertyControlConstants.tsx
index 0d52e03366dc..a0e25666b543 100644
--- a/app/client/src/constants/PropertyControlConstants.tsx
+++ b/app/client/src/constants/PropertyControlConstants.tsx
@@ -17,19 +17,73 @@ const ControlTypes = getPropertyControlTypes();
 export type ControlType = (typeof ControlTypes)[keyof typeof ControlTypes];
 
 export interface PropertyPaneSectionConfig {
+  /**
+   * Title displayed at the top of a collapsible section in the property pane.
+   */
   sectionName: string;
+  /**
+   * Unique identifier for the section. Used for:
+   * - Managing section collapse/expand state in Redux
+   * - Navigation and search functionality in the property pane
+   * - React rendering optimization (as key)
+   *
+   * If not provided, it will be auto-generated during widget initialization.
+   */
   id?: string;
+  /**
+   * Array of properties that should go inside the section.
+   */
   children: PropertyPaneConfig[];
-  collapsible?: boolean; // Indicates whether the section could be collapsed or not
-  childrenId?: string; // A unique id generated by combining the ids of all the children
+  /**
+   * If false, the section will not be collapsible.
+   */
+  collapsible?: boolean;
+  /**
+   * A unique id generated by combining the ids of all the children.
+   * Mainly used in memoization to prevent unnecessary re-renders of property sections ( PropertySection.tsx )
+   */
+  childrenId?: string;
+  /**
+   * Callback function to determine if the section should be hidden.
+   *
+   * @param props - Current widget properties
+   * @param propertyPath - Path to the widget property
+   * @returns - True if the section should be hidden, false otherwise
+   */
   // TODO: Fix this the next time the file is edited
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   hidden?: (props: any, propertyPath: string) => boolean;
+  /**
+   * when true, the section will be open by default.
+   * Note: Seems like this is not used anywhere.
+   */
   isDefaultOpen?: boolean;
   propertySectionPath?: string;
-  tag?: string; // Used to show a tag right after the section name (only in the search results)
-
+  /**
+   * Used to show a tag right after the section name (usedonly in the search results)
+   */
+  tag?: string;
+  /**
+   * Indicates whether this section contains properties that need to be generated dynamically at runtime.
+   * Used in conjunction with generateDynamicProperties.
+   *
+   * Common use cases:
+   * - Dynamic event handlers ( CustomWidget's )
+   * - Properties that depend on user configuration
+   * - Properties that need to be generated based on widget state
+   */
   hasDynamicProperties?: boolean;
+  /**
+   * Function to generate property controls dynamically at runtime.
+   * Called when hasDynamicProperties is true.
+   *
+   * @param widget - Current widget properties
+   * @returns Array of dynamically generated property controls
+   *
+   * @example
+   * Used in CustomWidget and ExternalWidget to dynamically generate event handler properties
+   * based on available events.
+   */
   generateDynamicProperties?: (
     widget: WidgetProps,
   ) => PropertyPaneControlConfig[];
@@ -56,26 +110,64 @@ export interface PanelConfig {
 }
 
 export interface PropertyPaneControlConfig {
-  // unique id to identify the property. It is added automatically with generateReactKey()
+  /**
+   * Unique identifier for the control. Used for internal tracking and debugging.
+   * It added by `addPropertyConfigIds` function in `WidgetProvider/factory/helpers.ts`.
+   */
   id?: string;
-  // label is used to display the name of the property
+  /**
+   * Label shown above the control.
+   */
   label: string;
-  // unique name of the property
+  /**
+   * Human-readable slugified name of the property. Used to identify the property in the widget properties.
+   */
   propertyName: string;
-  // Serves in the tooltip
+  /**
+   * Used to provide more context about the property. Appears as tooltip when we hover over the label of the property.
+   * Note: This is different from `helperText` which appears below the property input.
+   */
   helpText?: string;
-  // Dynamic text serves below the property pane inputs
+  /**
+   * Dynamic text that appears below the property input.
+   */
   helperText?: ((props: unknown) => React.ReactNode) | React.ReactNode;
-  // used to tell if the property is a JS convertible property.
-  // If true, It will show the little JS icon button next to the property name
+  /**
+   * If true, transform the property input into plain input where js can be written..
+   */
   isJSConvertible?: boolean;
+  /**
+   * Used in special cases where we want to custom control instead regular text input control.
+   * For example: `COMPUTE_VALUE` control is used in table widget provides access to currentRow in controls in the table columns.
+   */
   customJSControl?: string;
+  /**
+   * Type of the property control.
+   * Full list of supported controls can be found in `app/client/src/components/propertyControls/index.ts`.
+   */
   controlType: ControlType;
+  /** @deprecated. Not used anywhere. */
   validationMessage?: string;
+  /**
+   * path that is used to get evaluated value for the property.
+   */
   dataTreePath?: string;
-  // used to define children property configs when the current property is a section
+  /**
+   * There is no requirement to define children for a control. This is just done to suffice types
+   * in places where controlConfig and sectionConfig are not differentiated.
+   */
   children?: PropertyPaneConfig[];
   panelConfig?: PanelConfig;
+  /**
+   * Callback function to update related widget properties.
+   *
+   * @param propertyName - Path to the widget property
+   * @param propertyValue - New value of the property
+   * @param props - Current widget properties
+   * @returns - Array of property updates
+   *
+   * @example Used in tabs widget to update the label of the tab.
+   */
   updateRelatedWidgetProperties?: (
     propertyName: string,
     // TODO: Fix this the next time the file is edited
@@ -85,7 +177,15 @@ export interface PropertyPaneControlConfig {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     props: any,
   ) => UpdateWidgetPropertyPayload[];
-  // Function that is called when the property is updated, it is mainly used to update other properties
+  /**
+   * Function that is called when the property is updated, it is mainly used to update other properties
+   *
+   * @param props - Current widget properties
+   * @param propertyName - Path to the widget property
+   * @param propertyValue - New value of the property
+   *
+   * @returns - Array of property updates
+   */
   updateHook?: (
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -95,24 +195,70 @@ export interface PropertyPaneControlConfig {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     propertyValue: any,
   ) => Array<PropertyUpdates> | undefined;
+  /**
+   * callback function to determine if the property should be hidden.
+
+   * @param props - Current widget properties
+   * @param propertyPath - Path to the widget property
+   * @returns - True if the property should be hidden, false otherwise
+   */
   // TODO: Fix this the next time the file is edited
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   hidden?: (props: any, propertyPath: string) => boolean;
+  /**
+   * If true, the property is hidden.
+   * Note: hidden and invisible do the same thing but differently. hidden uses a callback to determine if the property should be hidden.
+   * invisible is a boolean flag to hide the property.
+   */
   invisible?: boolean;
   isBindProperty: boolean;
+  /**
+   * If true, it means the property triggers a widget action.
+   *
+   * @example
+   * OnClick property in Button widget is a trigger property that can trigger an action.
+   */
   isTriggerProperty: boolean;
+  /**
+   * Validation configuration for the property
+   */
   validation?: ValidationConfig;
-  useValidationMessage?: boolean;
+  /**
+   * Callback function to provide additional autocomplete data for the autocomplete list.
+   *
+   * @param props - Current widget properties
+   * @returns - Additional autocomplete data
+   */
   // TODO: Fix this the next time the file is edited
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   additionalAutoComplete?: (props: any) => AdditionalDynamicDataTree;
   evaluationSubstitutionType?: EvaluationSubstitutionType;
-  // all the properties that current property  is dependent on. All the properties passed here comes into widgetProperties
+  /**
+   * All properties that current property is dependent on.
+   * All of these properties becomes available in `widgetProperties` in the property control..
+   */
   dependencies?: string[];
+  /**
+   * It is same as `dependencies` but these dependencies are not statically defined in the widget.
+   * The callback is called  during rendering of the property control to get the latest dependencies.
+   *
+   * @example
+   * Used in CustomWidget to dynamically get the dependencies based on the current state of the widget.
+   */
   dynamicDependencies?: (widget: WidgetProps) => string[];
-  evaluatedDependencies?: string[]; // dependencies to be picked from the __evaluated__ object
+  /**
+   * Dependencies to be picked from the __evaluated__ object
+   */
+  evaluatedDependencies?: string[];
   expected?: CodeEditorExpected;
-  // Used to get value of the property from stylesheet config. Used in app theming v1 ( Not needed in anvil )
+  /**
+   * Used to get value of the property from stylesheet config. Used in app theming v1 ( Not needed in anvil )
+   *
+   * @param props - Current widget properties
+   * @param propertyPath - Path to the widget property
+   * @param stylesheet - Stylesheet config
+   * @returns - Value of the property
+   */
   getStylesheetValue?: (
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -120,6 +266,10 @@ export interface PropertyPaneControlConfig {
     propertyPath: string,
     stylesheet?: Stylesheet,
   ) => Stylesheet[string];
+  /**
+   * Options for certain controls like Dropdown Control
+   * Note: This should be moved to controlConfig instead of being a top level property.
+   */
   // TODO(abhinav): To fix this, rename the options property of the controls which use this
   // Alternatively, create a new structure
   // TODO: Fix this the next time the file is edited
@@ -127,47 +277,92 @@ export interface PropertyPaneControlConfig {
   options?: any;
   // The following should ideally be used internally
   postUpdateAction?: ReduxActionType;
-  onBlur?: () => void;
-  onFocus?: () => void;
+  /**
+   * If true, the property is a panel property ( that is nested property pane )
+   */
   isPanelProperty?: boolean;
-  // Numeric Input Control
-  min?: number;
   // Switch mode ( JS -> Text )
   shouldSwitchToNormalMode?: (
     isDynamic: boolean,
     isToggleDisabled: boolean,
     triggerFlag?: boolean,
   ) => boolean;
-
   /**
    * `controlConfig` is a generic record that can be used to pass additional configuration
    * options to the property control. The specific structure and contents of this record
    * will depend on the control type and its individual requirements.
    */
   controlConfig?: Record<string, unknown>;
+  /**
+   * The default value of the property.
+   */
   defaultValue?: unknown;
-  /** used to mark a property as reusable so that it can be reused in next dropping widget */
+  /**
+   * If the property is marked reusable, on the next drop it will use the value of the last dropped widget.
+   */
   isReusable?: boolean;
 }
 
 interface ValidationConfigParams {
-  min?: number; // min allowed for a number
-  max?: number; // max allowed for a number
-  natural?: boolean; // is a positive integer
-  default?: unknown; // default for any type
-  unique?: boolean | string[]; // unique in an array (string if a particular path is unique)
-  required?: boolean; // required type
-  // required is now used to check if value is an empty string.
-  requiredKey?: boolean; //required key
-  regex?: RegExp; // validator regex for text type
+  /**
+   * Minimum allowed value for a number.
+   */
+  min?: number;
+  /**
+   * Maximum allowed value for a number.
+   */
+  max?: number;
+  /**
+   * If true, the value must be a positive integer.
+   */
+  natural?: boolean;
+  /**
+   * Default value for any type.
+   */
+  default?: unknown;
+  /**
+   * If true or an array of strings, the value must be unique in an array.
+   * If an array of strings is provided, it specifies particular paths that must be unique.
+   */
+  unique?: boolean | string[];
+  /**
+   * If true, the value is required.
+   * Now used to check if the value is an empty string.
+   */
+  required?: boolean;
+  /**
+   * If true, the key is required.
+   */
+  requiredKey?: boolean;
+  /**
+   * Validator regex for text type.
+   */
+  regex?: RegExp;
+  /**
+   * Allowed keys in an object type.
+   */
   allowedKeys?: Array<{
-    // Allowed keys in an object type
     name: string;
     type: ValidationTypes;
     params?: ValidationConfigParams;
   }>;
-  allowedValues?: unknown[]; // Allowed values in a string and array type
-  children?: ValidationConfig; // Children configurations in an ARRAY or OBJECT_ARRAY type
+  /**
+   * Allowed values in a string and array type.
+   */
+  allowedValues?: unknown[];
+  /**
+   * Children configurations in an ARRAY or OBJECT_ARRAY type.
+   */
+  children?: ValidationConfig;
+  /**
+   * Validation function for FUNCTION type.
+   *
+   * @param value - The value to validate
+   * @param props - Current widget properties
+   * @param _ - Additional parameter (unused)
+   * @param moment - Moment.js instance
+   * @returns - Validation response
+   */
   fn?: (
     value: unknown,
     // TODO: Fix this the next time the file is edited
@@ -179,18 +374,51 @@ interface ValidationConfigParams {
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     moment?: any,
-  ) => ValidationResponse; // Function in a FUNCTION type
-  fnString?: string; // AUTO GENERATED, SHOULD NOT BE SET BY WIDGET DEVELOPER
-  expected?: CodeEditorExpected; // FUNCTION type expected type and example
-  strict?: boolean; //for strict string validation of TEXT type
-  ignoreCase?: boolean; //to ignore the case of key
-  type?: ValidationTypes; // Used for ValidationType.ARRAY_OF_TYPE_OR_TYPE to define sub type
-  types?: ValidationConfig[]; // Used for ValidationType.UNION to define sub type
-  params?: ValidationConfigParams; // Used for ValidationType.ARRAY_OF_TYPE_OR_TYPE to define sub type params
-  passThroughOnZero?: boolean; // Used for ValidationType.NUMBER to allow 0 to be passed through. Deafults value is true
-  limitLineBreaks?: boolean; // Used for ValidationType.TEXT to limit line breaks in a large json object.
-  defaultValue?: unknown; // used for ValidationType.UNION when none the union type validation is success
-  defaultErrorMessage?: string; // used for ValidationType.UNION when none the union type validation is success
+  ) => ValidationResponse;
+  /**
+   * AUTO GENERATED, SHOULD NOT BE SET BY WIDGET DEVELOPER
+   */
+  fnString?: string;
+  /**
+   * FUNCTION type expected type and example.
+   */
+  expected?: CodeEditorExpected;
+  /**
+   * If true, enables strict string validation of TEXT type.
+   */
+  strict?: boolean;
+  /**
+   * If true, ignores the case of keys.
+   */
+  ignoreCase?: boolean;
+  /**
+   * Used for ValidationType.ARRAY_OF_TYPE_OR_TYPE to define sub type.
+   */
+  type?: ValidationTypes;
+  /**
+   * Used for ValidationType.UNION to define sub types.
+   */
+  types?: ValidationConfig[];
+  /**
+   * Used for ValidationType.ARRAY_OF_TYPE_OR_TYPE to define sub type params.
+   */
+  params?: ValidationConfigParams;
+  /**
+   * Used for ValidationType.NUMBER to allow 0 to be passed through. Default value is true.
+   */
+  passThroughOnZero?: boolean;
+  /**
+   * Used for ValidationType.TEXT to limit line breaks in a large JSON object.
+   */
+  limitLineBreaks?: boolean;
+  /**
+   * Used for ValidationType.UNION when none of the union type validations succeed.
+   */
+  defaultValue?: unknown;
+  /**
+   * Used for ValidationType.UNION when none of the union type validations succeed.
+   */
+  defaultErrorMessage?: string;
 }
 
 export interface ValidationConfig {
diff --git a/app/client/src/layoutSystems/anvil/layoutComponents/components/LayoutColumn.tsx b/app/client/src/layoutSystems/anvil/layoutComponents/components/LayoutColumn.tsx
index 6721a8c022a3..efe835478809 100644
--- a/app/client/src/layoutSystems/anvil/layoutComponents/components/LayoutColumn.tsx
+++ b/app/client/src/layoutSystems/anvil/layoutComponents/components/LayoutColumn.tsx
@@ -1,3 +1,5 @@
+import React from "react";
+import { deriveAlignedColumnHighlights } from "../../utils/layouts/highlights/alignedColumnHighlights";
 import BaseLayoutComponent from "../BaseLayoutComponent";
 import {
   type DeriveHighlightsFn,
@@ -5,12 +7,12 @@ import {
   type LayoutProps,
 } from "layoutSystems/anvil/utils/anvilTypes";
 import type { FlexLayoutProps } from "./FlexLayout";
-import { deriveColumnHighlights } from "layoutSystems/anvil/utils/layouts/highlights/columnHighlights";
+import { MainCanvasWrapper } from "./MainCanvasWrapper";
 
 class LayoutColumn extends BaseLayoutComponent {
   static type: LayoutComponentTypes = LayoutComponentTypes.LAYOUT_COLUMN;
 
-  static deriveHighlights: DeriveHighlightsFn = deriveColumnHighlights;
+  static deriveHighlights: DeriveHighlightsFn = deriveAlignedColumnHighlights;
 
   static getChildTemplate(props: LayoutProps): LayoutProps | null {
     if (props.childTemplate || props.childTemplate === null)
@@ -19,7 +21,7 @@ class LayoutColumn extends BaseLayoutComponent {
     return {
       insertChild: true,
       layoutId: "",
-      layoutType: LayoutComponentTypes.WIDGET_ROW,
+      layoutType: LayoutComponentTypes.ALIGNED_WIDGET_ROW,
       layout: [],
     };
   }
@@ -27,10 +29,19 @@ class LayoutColumn extends BaseLayoutComponent {
   getFlexLayoutProps(): Omit<FlexLayoutProps, "children"> {
     return {
       ...super.getFlexLayoutProps(),
-      alignSelf: "stretch",
+      height: "100%",
+      gap: "spacing-4",
       direction: "column",
     };
   }
+
+  renderViewMode(): JSX.Element {
+    return (
+      <MainCanvasWrapper {...this.getFlexLayoutProps()}>
+        {super.renderChildren()}
+      </MainCanvasWrapper>
+    );
+  }
 }
 
 export default LayoutColumn;
diff --git a/app/client/src/layoutSystems/anvil/layoutComponents/components/MainCanvasWrapper.tsx b/app/client/src/layoutSystems/anvil/layoutComponents/components/MainCanvasWrapper.tsx
new file mode 100644
index 000000000000..c4a2c7b74d69
--- /dev/null
+++ b/app/client/src/layoutSystems/anvil/layoutComponents/components/MainCanvasWrapper.tsx
@@ -0,0 +1,14 @@
+import React from "react";
+import { FlexLayout, type FlexLayoutProps } from "./FlexLayout";
+
+export const MainCanvasWrapper = (props: FlexLayoutProps) => {
+  const { search } = window.location;
+  const queryParams = new URLSearchParams(search);
+  const isEmbed = queryParams.get("embed") === "true";
+
+  return (
+    <FlexLayout {...props} padding={isEmbed ? "spacing-0" : "spacing-4"}>
+      {props.children}
+    </FlexLayout>
+  );
+};
diff --git a/app/client/src/layoutSystems/anvil/utils/AnvilDSLTransformer.ts b/app/client/src/layoutSystems/anvil/utils/AnvilDSLTransformer.ts
index c15c7393b827..b9131c7d83be 100644
--- a/app/client/src/layoutSystems/anvil/utils/AnvilDSLTransformer.ts
+++ b/app/client/src/layoutSystems/anvil/utils/AnvilDSLTransformer.ts
@@ -18,14 +18,8 @@ export function anvilDSLTransformer(dsl: DSLWidget) {
     _dsl.layout = [
       {
         layoutId: generateReactKey(),
-        layoutType: LayoutComponentTypes.ALIGNED_LAYOUT_COLUMN,
+        layoutType: LayoutComponentTypes.LAYOUT_COLUMN,
         layout: [],
-        layoutStyle: {
-          border: "none",
-          height: "100%",
-          padding: "spacing-4",
-          gap: "spacing-4",
-        },
         isDropTarget: true,
         isPermanent: true,
         childTemplate: {
diff --git a/app/client/src/pages/Editor/DataSourceEditor/NewActionButton.tsx b/app/client/src/pages/Editor/DataSourceEditor/NewActionButton.tsx
index d59d1fdd260e..7bf6677d6414 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/NewActionButton.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/NewActionButton.tsx
@@ -155,7 +155,7 @@ function NewActionButton(props: NewActionButtonProps) {
       </MenuTrigger>
       <MenuContent
         align={"end"}
-        data-testId={"t--page-selection"}
+        data-testid={"t--page-selection"}
         height={pages.length <= 4 ? "fit-content" : "186px"}
         side={"bottom"}
       >
diff --git a/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx b/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx
index 9685a2d26388..6464e0a52675 100644
--- a/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx
+++ b/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx
@@ -246,7 +246,7 @@ const DatasourceViewModeSchema = (props: Props) => {
 
   return (
     <ViewModeSchemaContainer>
-      <DataWrapperContainer data-testId="datasource-schema-container">
+      <DataWrapperContainer data-testid="datasource-schema-container">
         <StructureContainer>
           {props.datasource && (
             <DatasourceStructureHeader
diff --git a/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx b/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx
index 72ca15f920e2..00a8479eef43 100644
--- a/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx
+++ b/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx
@@ -399,7 +399,7 @@ function GoogleSheetSchema(props: Props) {
   return (
     <ViewModeSchemaContainer>
       <DataWrapperContainer>
-        <StructureContainer data-testId="datasource-schema-container">
+        <StructureContainer data-testid="datasource-schema-container">
           {datasource && (
             <DatasourceStructureHeader
               datasource={datasource}
diff --git a/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx b/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx
index 5eef3792795d..bfa4c46ca1db 100644
--- a/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx
+++ b/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx
@@ -94,7 +94,7 @@ export function ExplorerMenuContent({
       </div>
       <SearchInput
         autoFocus
-        data-testId="t--search-file-operation"
+        data-testid="t--search-file-operation"
         onChange={onChange}
         placeholder="Search datasources"
         value={query}
diff --git a/app/client/src/pages/Editor/FormConfig.tsx b/app/client/src/pages/Editor/FormConfig.tsx
index f9de6a8cf704..b71ebbe81a4f 100644
--- a/app/client/src/pages/Editor/FormConfig.tsx
+++ b/app/client/src/pages/Editor/FormConfig.tsx
@@ -204,10 +204,7 @@ function renderFormConfigTop(props: {
   return (
     <div className="form-config-top" key={props.config.label}>
       {!nestedFormControl && // if the form control is a nested form control hide its label
-        (label?.length > 0 ||
-          encrypted ||
-          tooltipText ||
-          shouldRenderSubtitle) && (
+        (label?.length > 0 || encrypted || shouldRenderSubtitle) && (
           <>
             <FlexWrapper>
               <FormLabel
diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyControlsGenerator.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyControlsGenerator.tsx
index fa7450d33a2e..4b0452cb9b4f 100644
--- a/app/client/src/pages/Editor/PropertyPane/PropertyControlsGenerator.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/PropertyControlsGenerator.tsx
@@ -130,7 +130,7 @@ function PropertyControlsGenerator(props: PropertyControlsGeneratorProps) {
   ) : (
     <>
       {generatePropertyControl(
-        searchResults as readonly PropertyPaneConfig[],
+        searchResults,
         props,
         isSearchResult,
         enhancements,
diff --git a/app/client/src/pages/Editor/SaaSEditor/__data__/FinalState.json b/app/client/src/pages/Editor/SaaSEditor/__data__/FinalState.json
index 78a76bde1110..4b5715857c53 100644
--- a/app/client/src/pages/Editor/SaaSEditor/__data__/FinalState.json
+++ b/app/client/src/pages/Editor/SaaSEditor/__data__/FinalState.json
@@ -2543,12 +2543,12 @@
             "id": 1,
             "children": [
               {
-                "label": "Run query on page load",
+                "label": "Run the query on page load",
                 "configProperty": "executeOnLoad",
                 "controlType": "SWITCH"
               },
               {
-                "label": "Request confirmation before running query",
+                "label": "Request confirmation before running this query",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "SWITCH",
                 "tooltipText": "Ask confirmation from the user each time before refreshing data"
@@ -2576,12 +2576,12 @@
             "id": 1,
             "children": [
               {
-                "label": "Run query on page load",
+                "label": "Run the query on page load",
                 "configProperty": "executeOnLoad",
                 "controlType": "SWITCH"
               },
               {
-                "label": "Request confirmation before running query",
+                "label": "Request confirmation before running this query",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "SWITCH",
                 "tooltipText": "Ask confirmation from the user each time before refreshing data"
@@ -2609,12 +2609,12 @@
             "id": 1,
             "children": [
               {
-                "label": "Run API on page load",
+                "label": "Run the API on page load",
                 "configProperty": "executeOnLoad",
                 "controlType": "CHECKBOX"
               },
               {
-                "label": "Request confirmation before running API",
+                "label": "Request confirmation before running this API",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "CHECKBOX",
                 "tooltipText": "Ask confirmation from the user each time before refreshing data"
@@ -2648,12 +2648,12 @@
             "id": 1,
             "children": [
               {
-                "label": "Run query on page load",
+                "label": "Run the query on page load",
                 "configProperty": "executeOnLoad",
                 "controlType": "SWITCH"
               },
               {
-                "label": "Request confirmation before running query",
+                "label": "Request confirmation before running this query",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "SWITCH",
                 "tooltipText": "Ask confirmation from the user each time before refreshing data"
@@ -2674,12 +2674,12 @@
             "id": 1,
             "children": [
               {
-                "label": "Run query on page load",
+                "label": "Run the query on page load",
                 "configProperty": "executeOnLoad",
                 "controlType": "SWITCH"
               },
               {
-                "label": "Request confirmation before running query",
+                "label": "Request confirmation before running this query",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "SWITCH",
                 "tooltipText": "Ask confirmation from the user each time before refreshing data"
@@ -2707,12 +2707,12 @@
             "id": 1,
             "children": [
               {
-                "label": "Run query on page load",
+                "label": "Run the query on page load",
                 "configProperty": "executeOnLoad",
                 "controlType": "SWITCH"
               },
               {
-                "label": "Request confirmation before running query",
+                "label": "Request confirmation before running this query",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "SWITCH",
                 "tooltipText": "Ask confirmation from the user each time before refreshing data"
@@ -2740,12 +2740,12 @@
             "id": 1,
             "children": [
               {
-                "label": "Run query on page load",
+                "label": "Run the query on page load",
                 "configProperty": "executeOnLoad",
                 "controlType": "SWITCH"
               },
               {
-                "label": "Request confirmation before running query",
+                "label": "Request confirmation before running this query",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "SWITCH",
                 "tooltipText": "Ask confirmation from the user each time before refreshing data"
diff --git a/app/client/src/pages/Editor/SaaSEditor/__data__/InitialState.json b/app/client/src/pages/Editor/SaaSEditor/__data__/InitialState.json
index ea28eddbcb1f..0af22fb1d686 100644
--- a/app/client/src/pages/Editor/SaaSEditor/__data__/InitialState.json
+++ b/app/client/src/pages/Editor/SaaSEditor/__data__/InitialState.json
@@ -2542,12 +2542,12 @@
             "id": 1,
             "children": [
               {
-                "label": "Run query on page load",
+                "label": "Run the query on page load",
                 "configProperty": "executeOnLoad",
                 "controlType": "SWITCH"
               },
               {
-                "label": "Request confirmation before running query",
+                "label": "Request confirmation before running this query",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "SWITCH",
                 "tooltipText": "Ask confirmation from the user each time before refreshing data"
@@ -2575,12 +2575,12 @@
             "id": 1,
             "children": [
               {
-                "label": "Run query on page load",
+                "label": "Run the query on page load",
                 "configProperty": "executeOnLoad",
                 "controlType": "SWITCH"
               },
               {
-                "label": "Request confirmation before running query",
+                "label": "Request confirmation before running this query",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "SWITCH",
                 "tooltipText": "Ask confirmation from the user each time before refreshing data"
@@ -2608,12 +2608,12 @@
             "id": 1,
             "children": [
               {
-                "label": "Run API on page load",
+                "label": "Run the API on page load",
                 "configProperty": "executeOnLoad",
                 "controlType": "CHECKBOX"
               },
               {
-                "label": "Request confirmation before running API",
+                "label": "Request confirmation before running this API",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "CHECKBOX",
                 "tooltipText": "Ask confirmation from the user each time before refreshing data"
@@ -2647,12 +2647,12 @@
             "id": 1,
             "children": [
               {
-                "label": "Run query on page load",
+                "label": "Run the query on page load",
                 "configProperty": "executeOnLoad",
                 "controlType": "SWITCH"
               },
               {
-                "label": "Request confirmation before running query",
+                "label": "Request confirmation before running this query",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "SWITCH",
                 "tooltipText": "Ask confirmation from the user each time before refreshing data"
@@ -2673,12 +2673,12 @@
             "id": 1,
             "children": [
               {
-                "label": "Run query on page load",
+                "label": "Run the query on page load",
                 "configProperty": "executeOnLoad",
                 "controlType": "SWITCH"
               },
               {
-                "label": "Request confirmation before running query",
+                "label": "Request confirmation before running this query",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "SWITCH",
                 "tooltipText": "Ask confirmation from the user each time before refreshing data"
@@ -2706,12 +2706,12 @@
             "id": 1,
             "children": [
               {
-                "label": "Run query on page load",
+                "label": "Run the query on page load",
                 "configProperty": "executeOnLoad",
                 "controlType": "SWITCH"
               },
               {
-                "label": "Request confirmation before running query",
+                "label": "Request confirmation before running this query",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "SWITCH",
                 "tooltipText": "Ask confirmation from the user each time before refreshing data"
@@ -2739,12 +2739,12 @@
             "id": 1,
             "children": [
               {
-                "label": "Run query on page load",
+                "label": "Run the query on page load",
                 "configProperty": "executeOnLoad",
                 "controlType": "SWITCH"
               },
               {
-                "label": "Request confirmation before running query",
+                "label": "Request confirmation before running this query",
                 "configProperty": "confirmBeforeExecute",
                 "controlType": "SWITCH",
                 "tooltipText": "Ask confirmation from the user each time before refreshing data"
diff --git a/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx b/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx
index e63669a88fa6..774294428d35 100644
--- a/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx
+++ b/app/client/src/pages/Editor/gitSync/ReconnectDatasourceModal.tsx
@@ -613,7 +613,7 @@ function ReconnectDatasourceModal() {
   return (
     <Modal open={isModalOpen}>
       <ModalContentWrapper
-        data-testId="reconnect-datasource-modal"
+        data-testid="reconnect-datasource-modal"
         onClick={handleClose}
         onEscapeKeyDown={onClose}
         onInteractOutside={handleClose}
diff --git a/app/client/src/pages/Editor/gitSync/components/StatusLoader.tsx b/app/client/src/pages/Editor/gitSync/components/StatusLoader.tsx
index 281e39c8666f..74c08b109844 100644
--- a/app/client/src/pages/Editor/gitSync/components/StatusLoader.tsx
+++ b/app/client/src/pages/Editor/gitSync/components/StatusLoader.tsx
@@ -12,7 +12,7 @@ const LoaderWrapper = styled.div`
 
 function StatusLoader({ loaderMsg }: { loaderMsg: string }) {
   return (
-    <LoaderWrapper data-testId="t--git-merge-loader">
+    <LoaderWrapper data-testid="t--git-merge-loader">
       <SpinnerLoader size="md" />
       <Text kind={"body-m"} style={{ marginLeft: 8 }}>
         {loaderMsg}
diff --git a/app/client/src/pages/common/SearchBar/ApplicationSearchItem.tsx b/app/client/src/pages/common/SearchBar/ApplicationSearchItem.tsx
index 2a7d6e96856a..5db5e6dbb305 100644
--- a/app/client/src/pages/common/SearchBar/ApplicationSearchItem.tsx
+++ b/app/client/src/pages/common/SearchBar/ApplicationSearchItem.tsx
@@ -36,7 +36,7 @@ const ApplicationSearchItem = (props: Props) => {
       </Text>
       {applicationsList.map((application: ApplicationPayload) => (
         <SearchListItem
-          data-testId={application.name}
+          data-testid={application.name}
           key={application.id}
           onClick={() => navigateToApplication(application.id)}
         >
diff --git a/app/client/src/pages/common/SearchBar/WorkspaceSearchItems.tsx b/app/client/src/pages/common/SearchBar/WorkspaceSearchItems.tsx
index a5444198d8bf..74eeee3dd2f4 100644
--- a/app/client/src/pages/common/SearchBar/WorkspaceSearchItems.tsx
+++ b/app/client/src/pages/common/SearchBar/WorkspaceSearchItems.tsx
@@ -33,7 +33,7 @@ const WorkspaceSearchItems = (props: Props) => {
       </Text>
       {workspacesList.map((workspace: Workspace) => (
         <SearchListItem
-          data-testId={workspace.name}
+          data-testid={workspace.name}
           key={workspace.id}
           onClick={() => {
             setIsDropdownOpen(false);
diff --git a/app/client/src/utils/AppsmithUtils.tsx b/app/client/src/utils/AppsmithUtils.tsx
index 0fad6ec8df0a..c86e6bd2f0e0 100644
--- a/app/client/src/utils/AppsmithUtils.tsx
+++ b/app/client/src/utils/AppsmithUtils.tsx
@@ -13,8 +13,10 @@ import type { JSCollectionData } from "ee/reducers/entityReducers/jsActionsReduc
 import AnalyticsUtil from "ee/utils/AnalyticsUtil";
 import type { CreateNewActionKeyInterface } from "ee/entities/Engine/actionHelpers";
 import { CreateNewActionKey } from "ee/entities/Engine/actionHelpers";
+import { ANONYMOUS_USERNAME } from "../constants/userConstants";
+import type { User } from "constants/userConstants";
 
-export const initializeAnalyticsAndTrackers = async () => {
+export const initializeAnalyticsAndTrackers = async (currentUser: User) => {
   const appsmithConfigs = getAppsmithConfigs();
 
   try {
@@ -106,6 +108,10 @@ export const initializeAnalyticsAndTrackers = async () => {
     Sentry.captureException(e);
     log.error(e);
   }
+
+  if (!currentUser.isAnonymous && currentUser.username !== ANONYMOUS_USERNAME) {
+    await AnalyticsUtil.identifyUser(currentUser);
+  }
 };
 
 export const mapToPropList = (map: Record<string, string>): Property[] => {
diff --git a/app/client/src/utils/PropertyControlFactory.tsx b/app/client/src/utils/PropertyControlFactory.tsx
index bb231492508a..54cc4e2fca04 100644
--- a/app/client/src/utils/PropertyControlFactory.tsx
+++ b/app/client/src/utils/PropertyControlFactory.tsx
@@ -9,6 +9,19 @@ import type {
 import type BaseControl from "components/propertyControls/BaseControl";
 import { isArray } from "lodash";
 import type { AdditionalDynamicDataTree } from "./autocomplete/customTreeTypeDefCreator";
+
+/**
+ * PropertyPaneControlFactory
+ *
+ * This classes manages all the available controls for the property pane.
+ * It maintains a map of control types to their respective builders.
+ * The control builders are responsible for creating the actual controls.
+ *
+ * Key functionalities:
+ * 1. Register control builders, methods, and computed value functions
+ * 2. Create controls based on control data and preferences
+ * 3. Retrieve available control types
+ */
 class PropertyControlFactory {
   static controlMap: Map<ControlType, ControlBuilder<ControlProps>> = new Map();
   static controlMethods: Map<ControlType, ControlMethods> = new Map();
diff --git a/app/client/src/widgets/DatePickerWidget2/widget/derived.js b/app/client/src/widgets/DatePickerWidget2/widget/derived.js
index cda0937f7e31..e3ace7250e46 100644
--- a/app/client/src/widgets/DatePickerWidget2/widget/derived.js
+++ b/app/client/src/widgets/DatePickerWidget2/widget/derived.js
@@ -1,31 +1,50 @@
 /* eslint-disable @typescript-eslint/no-unused-vars*/
 export default {
   isValidDate: (props, moment, _) => {
-    const minDate = new Date(props.minDate);
-    const maxDate = new Date(props.maxDate);
-    const selectedDate =
-      props.selectedDate !== ""
-        ? moment(new Date(props.selectedDate))
-        : props.selectedDate;
-    let dateValid = true;
-
-    if (!!props.minDate && !!props.maxDate) {
-      dateValid = !!selectedDate
-        ? selectedDate.isBetween(minDate, maxDate)
-        : !props.isRequired;
-    } else if (!!props.minDate) {
-      dateValid = !!selectedDate
-        ? selectedDate.isAfter(minDate)
-        : !props.isRequired;
-    } else if (!!props.maxDate) {
-      dateValid = !!selectedDate
-        ? selectedDate.isBefore(maxDate)
-        : !props.isRequired;
-    } else {
-      dateValid = props.isRequired ? !!selectedDate : true;
+    if (!props.selectedDate && !props.isRequired) {
+      return true;
     }
 
-    return dateValid;
+    const minDate = props.minDate ? new Date(props.minDate) : null;
+    const maxDate = props.maxDate ? new Date(props.maxDate) : null;
+    const selectedDate = props.selectedDate
+      ? moment(new Date(props.selectedDate))
+      : props.selectedDate;
+
+    if (!selectedDate) {
+      return !props.isRequired;
+    }
+
+    let granularity,
+      inclusivity = "[]";
+
+    switch (props.timePrecision) {
+      case "None":
+        granularity = "day";
+        break;
+      case "second":
+      case "minute":
+      case "millisecond":
+        granularity = props.timePrecision;
+        break;
+      default:
+        granularity = undefined;
+        inclusivity = undefined;
+    }
+
+    if (minDate && maxDate) {
+      return selectedDate.isBetween(minDate, maxDate, granularity, inclusivity);
+    }
+
+    if (minDate) {
+      return selectedDate.isSameOrAfter(minDate, granularity);
+    }
+
+    if (maxDate) {
+      return selectedDate.isSameOrBefore(maxDate, granularity);
+    }
+
+    return true;
   },
   //
 };
diff --git a/app/client/src/widgets/DatePickerWidget2/widget/derived.test.js b/app/client/src/widgets/DatePickerWidget2/widget/derived.test.js
index 820d4f2e10e4..f52aaf962c60 100644
--- a/app/client/src/widgets/DatePickerWidget2/widget/derived.test.js
+++ b/app/client/src/widgets/DatePickerWidget2/widget/derived.test.js
@@ -86,4 +86,124 @@ describe("Validates Derived Properties", () => {
 
     expect(result).toStrictEqual(false);
   });
+  describe("timePrecision", () => {
+    it("should fail when selectedDate minute is outside bounds", () => {
+      const { isValidDate } = derivedProperty;
+      const input = {
+        isRequired: true,
+        maxDate: "2021-12-01T05:49:00.000Z",
+        minDate: "2021-12-01T05:48:00.000Z",
+        selectedDate: "2021-12-01T05:50:00.000Z",
+        timePrecision: "minute",
+      };
+
+      let result = isValidDate(input, moment, _);
+
+      expect(result).toStrictEqual(false);
+    });
+
+    it("timePrecision: minute -> date is valid even if selectedDate is over by seconds", () => {
+      const { isValidDate } = derivedProperty;
+      const input = {
+        isRequired: true,
+        maxDate: "2121-12-31T18:29:00.000Z",
+        minDate: "2021-12-01T05:49:28.753Z",
+        selectedDate: "2021-12-01T05:49:24.753Z",
+        timePrecision: "minute",
+      };
+
+      let result = isValidDate(input, moment, _);
+
+      expect(result).toStrictEqual(true);
+    });
+
+    it("timePrecision: second -> date is valid even if selectedDate is over by milliseconds", () => {
+      const { isValidDate } = derivedProperty;
+      const input = {
+        isRequired: true,
+        maxDate: "2121-12-31T18:29:00.000Z",
+        minDate: "2021-12-01T05:49:24.753Z",
+        selectedDate: "2021-12-01T05:49:24.751Z",
+        timePrecision: "second",
+      };
+
+      let result = isValidDate(input, moment, _);
+
+      expect(result).toStrictEqual(true);
+    });
+
+    it("timePrecision: millisecond", () => {
+      const { isValidDate } = derivedProperty;
+      const input = {
+        isRequired: true,
+        maxDate: "2121-12-31T18:29:00.000Z",
+        minDate: "2021-12-01T05:49:24.752Z",
+        selectedDate: "2021-12-01T05:49:24.753Z",
+        timePrecision: "millisecond",
+      };
+
+      let result = isValidDate(input, moment, _);
+
+      expect(result).toStrictEqual(true);
+    });
+
+    describe("timePrecision: None", () => {
+      it("date is same as minDate", () => {
+        const { isValidDate } = derivedProperty;
+        const input = {
+          isRequired: true,
+          maxDate: "2121-12-31T18:29:00.000Z",
+          minDate: "2021-12-01T00:00:00.000Z",
+          selectedDate: "2021-12-01T00:00:00.000Z",
+          timePrecision: "None",
+        };
+
+        let result = isValidDate(input, moment, _);
+
+        expect(result).toStrictEqual(true);
+      });
+      it("date is same as maxDate", () => {
+        const { isValidDate } = derivedProperty;
+        const input = {
+          isRequired: true,
+          maxDate: "2021-12-01T00:00:00.000Z",
+          minDate: "1991-12-31T18:29:00.000Z",
+          selectedDate: "2021-12-01T00:00:00.000Z",
+          timePrecision: "None",
+        };
+
+        let result = isValidDate(input, moment, _);
+
+        expect(result).toStrictEqual(true);
+      });
+      it("date is between minDate and maxDate", () => {
+        const { isValidDate } = derivedProperty;
+        const input = {
+          isRequired: true,
+          maxDate: "2121-12-31T18:29:00.000Z",
+          minDate: "1920-12-31T18:30:00.000Z",
+          selectedDate: "2021-12-01T05:49:24.753Z",
+          timePrecision: "None",
+        };
+
+        let result = isValidDate(input, moment, _);
+
+        expect(result).toStrictEqual(true);
+      });
+      it("date is out of bounds", () => {
+        const { isValidDate } = derivedProperty;
+        const input = {
+          isRequired: true,
+          maxDate: "2021-12-31T18:29:00.000Z",
+          minDate: "1920-12-31T18:30:00.000Z",
+          selectedDate: "2022-12-01T05:49:24.753Z",
+          timePrecision: "None",
+        };
+
+        let result = isValidDate(input, moment, _);
+
+        expect(result).toStrictEqual(false);
+      });
+    });
+  });
 });
diff --git a/app/client/src/widgets/JSONFormWidget/component/Form.test.tsx b/app/client/src/widgets/JSONFormWidget/component/Form.test.tsx
new file mode 100644
index 000000000000..40ece445aa06
--- /dev/null
+++ b/app/client/src/widgets/JSONFormWidget/component/Form.test.tsx
@@ -0,0 +1,198 @@
+import "@testing-library/jest-dom";
+import { fireEvent, render, screen } from "@testing-library/react";
+import { klona } from "klona";
+import React from "react";
+import { useForm } from "react-hook-form";
+import { ROOT_SCHEMA_KEY, type SchemaItem } from "../constants";
+import Form from "./Form";
+import useFixedFooter from "./useFixedFooter";
+
+jest.mock("react-hook-form", () => ({
+  __esModule: true,
+  useForm: jest.fn(),
+  FormProvider: jest.fn(({ children }) => <div>{children}</div>),
+}));
+
+jest.mock("./useFixedFooter", () => ({
+  __esModule: true,
+  default: jest.fn(),
+}));
+
+jest.mock("widgets/ButtonWidget/component", () => ({
+  __esModule: true,
+  BaseButton: jest.fn(({ children, ...props }) => (
+    <button {...props}>{children}</button>
+  )),
+}));
+
+function mockUseForm(withErrors = false) {
+  (useForm as jest.Mock).mockReturnValue({
+    formState: {
+      errors: withErrors
+        ? {
+            fieldName: {
+              type: "required",
+              message: "This field is required",
+            },
+          }
+        : null,
+    },
+    reset: jest.fn(),
+    trigger: jest.fn(),
+    watch: jest.fn(() => ({
+      subscribe: jest.fn(),
+      unsubscribe: jest.fn(),
+    })),
+  });
+}
+
+const TEST_IDS = {
+  SUBMIT_BTN: "t--jsonform-submit-btn",
+  RESET_BTN: "t--jsonform-reset-btn",
+};
+
+const defaultProps = {
+  backgroundColor: "#fff",
+  disabledWhenInvalid: false,
+  fixedFooter: false,
+  getFormData: jest.fn(),
+  hideFooter: false,
+  isSubmitting: false,
+  isWidgetMounting: false,
+  onFormValidityUpdate: jest.fn(),
+  onSubmit: jest.fn(),
+  onreset: jest.fn(),
+  registerResetObserver: jest.fn(),
+  resetButtonLabel: "Reset",
+  resetButtonStyles: {},
+  scrollContents: false,
+  showReset: true,
+  stretchBodyVertically: false,
+  submitButtonLabel: "Submit",
+  submitButtonStyles: {},
+  title: "Test Form",
+  unregisterResetObserver: jest.fn(),
+  updateFormData: jest.fn(),
+  children: <input />,
+};
+
+describe("Form Component", () => {
+  beforeEach(() => {
+    const mockBodyRef = React.createRef<HTMLFormElement>();
+    const mockFooterRef = React.createRef<HTMLDivElement>();
+
+    (useFixedFooter as jest.Mock).mockReturnValue({
+      bodyRef: mockBodyRef,
+      footerRef: mockFooterRef,
+    });
+  });
+
+  describe("happy render path", () => {
+    beforeEach(() => mockUseForm());
+    it("renders the form title", () => {
+      render(<Form {...defaultProps}>Form Content</Form>);
+      expect(screen.getByText("Test Form")).toBeInTheDocument();
+    });
+
+    it("renders children inside the form body", () => {
+      render(<Form {...defaultProps}>Form Content</Form>);
+      expect(screen.getByText("Form Content")).toBeInTheDocument();
+    });
+
+    it("renders the submit button with correct label", () => {
+      const { getByTestId } = render(
+        <Form {...defaultProps}>Form Content</Form>,
+      );
+      const submitBtn = getByTestId(TEST_IDS.SUBMIT_BTN);
+
+      expect(submitBtn).toBeInTheDocument();
+      expect(submitBtn).toHaveAttribute("text", defaultProps.submitButtonLabel);
+
+      fireEvent.click(submitBtn);
+      expect(defaultProps.onSubmit).toHaveBeenCalled();
+    });
+
+    it("renders the reset button with correct label when showReset is true", () => {
+      const { getByTestId } = render(
+        <Form {...defaultProps}>Form Content</Form>,
+      );
+      const resetBtn = getByTestId(TEST_IDS.RESET_BTN);
+
+      expect(resetBtn).toBeInTheDocument();
+      expect(resetBtn).toHaveAttribute("text", defaultProps.resetButtonLabel);
+      expect(defaultProps.registerResetObserver).toHaveBeenCalled();
+    });
+
+    // Form updates data correctly when input values change
+    it("should update data when input values change", () => {
+      const mockUpdateFormData = jest.fn();
+      const mockGetFormData = jest.fn().mockReturnValue({});
+      const mockRegisterResetObserver = jest.fn();
+      const mockUnregisterResetObserver = jest.fn();
+      const mockOnSubmit = jest.fn();
+      const mockOnFormValidityUpdate = jest.fn();
+      const mockSchema = { [ROOT_SCHEMA_KEY]: {} as SchemaItem };
+      const props = klona({
+        ...defaultProps,
+        updateFormData: mockUpdateFormData,
+        getFormData: mockGetFormData,
+        registerResetObserver: mockRegisterResetObserver,
+        unregisterResetObserver: mockUnregisterResetObserver,
+        onSubmit: mockOnSubmit,
+        onFormValidityUpdate: mockOnFormValidityUpdate,
+        schema: mockSchema,
+      });
+      const { getByTestId } = render(<Form {...props} />);
+
+      fireEvent.click(getByTestId(TEST_IDS.SUBMIT_BTN));
+      expect(mockUpdateFormData).toHaveBeenCalled();
+    });
+  });
+
+  describe("unhappy render path", () => {
+    it("does not render the reset button when showReset is false", () => {
+      mockUseForm();
+      const { queryByTestId } = render(
+        <Form {...defaultProps} showReset={false}>
+          Form Content
+        </Form>,
+      );
+
+      expect(queryByTestId(TEST_IDS.RESET_BTN)).not.toBeInTheDocument();
+    });
+
+    it("disables the submit button when disabledWhenInvalid is true and form is invalid", () => {
+      mockUseForm(true);
+      const { getByTestId } = render(
+        <Form {...defaultProps} disabledWhenInvalid>
+          Form Content
+        </Form>,
+      );
+
+      expect(getByTestId(TEST_IDS.SUBMIT_BTN)).toBeDisabled();
+    });
+
+    it("triggers a check, necessitating a re-render, when the children in form are updated", () => {
+      mockUseForm(true);
+      const propsToUpdate = klona({
+        ...defaultProps,
+        disabledWhenInvalid: true,
+      });
+      const { getByTestId } = render(
+        <Form {...propsToUpdate}>Form Content</Form>,
+      );
+
+      expect(getByTestId(TEST_IDS.SUBMIT_BTN)).toBeDisabled();
+    });
+
+    it("should handle empty schema gracefully without errors", () => {
+      mockUseForm();
+      const mockUpdateFormData = jest.fn();
+      const props = klona({ ...defaultProps, schema: undefined });
+      const { container } = render(<Form {...props} />);
+
+      expect(container).toBeInTheDocument();
+      expect(mockUpdateFormData).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/app/client/src/widgets/JSONFormWidget/component/Form.tsx b/app/client/src/widgets/JSONFormWidget/component/Form.tsx
index 5bd9b57cd022..353a0f528d77 100644
--- a/app/client/src/widgets/JSONFormWidget/component/Form.tsx
+++ b/app/client/src/widgets/JSONFormWidget/component/Form.tsx
@@ -299,6 +299,7 @@ function Form<TValues = any>(
                 <Button
                   {...resetButtonStyles}
                   className="t--jsonform-reset-btn"
+                  data-testid="t--jsonform-reset-btn"
                   onClick={(e) => onReset(schema, e)}
                   text={resetButtonLabel}
                   type="reset"
@@ -308,6 +309,7 @@ function Form<TValues = any>(
             <Button
               {...submitButtonStyles}
               className="t--jsonform-submit-btn"
+              data-testid="t--jsonform-submit-btn"
               disabled={disabledWhenInvalid && isFormInValid}
               loading={isSubmitting}
               onClick={onSubmit}
diff --git a/app/client/src/widgets/JSONFormWidget/fields/BaseInputField.tsx b/app/client/src/widgets/JSONFormWidget/fields/BaseInputField.tsx
index 2e6782142f1d..da2dc7e1c929 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/BaseInputField.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/BaseInputField.tsx
@@ -37,6 +37,7 @@ import {
 import type { InputHTMLType } from "widgets/BaseInputWidget/component";
 import BaseInputComponent from "widgets/BaseInputWidget/component";
 import { BASE_LABEL_TEXT_SIZE } from "../component/FieldLabel";
+import useUnmountFieldValidation from "./useUnmountFieldValidation";
 
 export type BaseInputComponentProps = FieldComponentBaseProps &
   FieldEventProps & {
@@ -240,6 +241,7 @@ function BaseInputField<TSchemaItem extends SchemaItem>({
     fieldType: schemaItem.fieldType,
     isValid: isValueValid,
   });
+  useUnmountFieldValidation({ fieldName: name });
 
   const { inputRef } = useEvents<HTMLInputElement | HTMLTextAreaElement>({
     fieldBlurHandler: onBlur,
diff --git a/app/client/src/widgets/JSONFormWidget/fields/CheckboxField.tsx b/app/client/src/widgets/JSONFormWidget/fields/CheckboxField.tsx
index 0dd0564744b7..81b14d8f7716 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/CheckboxField.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/CheckboxField.tsx
@@ -18,6 +18,7 @@ import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
 import { Colors } from "constants/Colors";
 import { BASE_LABEL_TEXT_SIZE } from "../component/FieldLabel";
 import { LabelPosition } from "components/constants";
+import useUnmountFieldValidation from "./useUnmountFieldValidation";
 
 type CheckboxComponentProps = FieldComponentBaseProps &
   FieldEventProps & {
@@ -82,6 +83,7 @@ function CheckboxField({
     fieldType: schemaItem.fieldType,
     isValid: isValueValid,
   });
+  useUnmountFieldValidation({ fieldName: name });
 
   const onCheckChange = useCallback(
     (isChecked: boolean) => {
diff --git a/app/client/src/widgets/JSONFormWidget/fields/DateField.tsx b/app/client/src/widgets/JSONFormWidget/fields/DateField.tsx
index ff39fba394cc..7009e09c9873 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/DateField.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/DateField.tsx
@@ -20,6 +20,7 @@ import { ISO_DATE_FORMAT } from "constants/WidgetValidation";
 import { TimePrecision } from "widgets/DatePickerWidget2/constants";
 import { Colors } from "constants/Colors";
 import { BASE_LABEL_TEXT_SIZE } from "../component/FieldLabel";
+import useUnmountFieldValidation from "./useUnmountFieldValidation";
 
 type DateComponentProps = FieldComponentBaseProps &
   FieldEventProps & {
@@ -133,6 +134,7 @@ function DateField({
     fieldName: name,
     fieldType,
   });
+  useUnmountFieldValidation({ fieldName: name });
 
   const onDateSelected = useCallback(
     (selectedValue: string) => {
diff --git a/app/client/src/widgets/JSONFormWidget/fields/FieldRenderer.tsx b/app/client/src/widgets/JSONFormWidget/fields/FieldRenderer.tsx
index a2c17e3cda77..80bdd0f52998 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/FieldRenderer.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/FieldRenderer.tsx
@@ -5,6 +5,7 @@ import { useFormContext } from "react-hook-form";
 import FormContext from "../FormContext";
 import type { SchemaItem } from "../constants";
 import { FIELD_MAP } from "../constants";
+import useUnmountFieldValidation from "./useUnmountFieldValidation";
 
 interface FieldRendererProps {
   fieldName: ControllerRenderProps["name"];
@@ -30,6 +31,7 @@ function FieldRenderer({
 
   const FieldComponent = FIELD_MAP[fieldType];
 
+  useUnmountFieldValidation({ fieldName });
   useEffect(() => {
     /**
      * When a component is hidden, the field is removed from the form and the component unmounts.
diff --git a/app/client/src/widgets/JSONFormWidget/fields/MultiSelectField.tsx b/app/client/src/widgets/JSONFormWidget/fields/MultiSelectField.tsx
index ff9f0710f247..154b81685633 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/MultiSelectField.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/MultiSelectField.tsx
@@ -22,6 +22,7 @@ import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
 import { isPrimitive, validateOptions } from "../helper";
 import { Colors } from "constants/Colors";
 import { BASE_LABEL_TEXT_SIZE } from "../component/FieldLabel";
+import useUnmountFieldValidation from "./useUnmountFieldValidation";
 
 type MultiSelectComponentProps = FieldComponentBaseProps &
   FieldEventProps & {
@@ -129,6 +130,7 @@ function MultiSelectField({
     fieldName: name,
     fieldType,
   });
+  useUnmountFieldValidation({ fieldName: name });
 
   const [updateFilterText] = useUpdateInternalMetaState({
     propertyName: `${name}.filterText`,
diff --git a/app/client/src/widgets/JSONFormWidget/fields/RadioGroupField.tsx b/app/client/src/widgets/JSONFormWidget/fields/RadioGroupField.tsx
index 02460b5db86e..d5a1837dd306 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/RadioGroupField.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/RadioGroupField.tsx
@@ -16,6 +16,7 @@ import { ActionUpdateDependency } from "../constants";
 import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
 import { Colors } from "constants/Colors";
 import { BASE_LABEL_TEXT_SIZE } from "../component/FieldLabel";
+import useUnmountFieldValidation from "./useUnmountFieldValidation";
 
 type RadioGroupComponentProps = FieldComponentBaseProps & {
   options: RadioOption[];
@@ -66,6 +67,7 @@ function RadioGroupField({
     fieldName: name,
     fieldType: schemaItem.fieldType,
   });
+  useUnmountFieldValidation({ fieldName: name });
 
   const onSelectionChange = useCallback(
     (selectedValue: string) => {
diff --git a/app/client/src/widgets/JSONFormWidget/fields/SelectField.tsx b/app/client/src/widgets/JSONFormWidget/fields/SelectField.tsx
index 742386b60095..63bb33ae5451 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/SelectField.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/SelectField.tsx
@@ -18,6 +18,7 @@ import { isPrimitive } from "../helper";
 import { isNil } from "lodash";
 import { Colors } from "constants/Colors";
 import { BASE_LABEL_TEXT_SIZE } from "../component/FieldLabel";
+import useUnmountFieldValidation from "./useUnmountFieldValidation";
 
 interface MetaProps {
   filterText?: string;
@@ -106,6 +107,7 @@ function SelectField({
     fieldName: name,
     fieldType: schemaItem.fieldType,
   });
+  useUnmountFieldValidation({ fieldName: name });
 
   const [updateFilterText] = useUpdateInternalMetaState({
     propertyName: `${name}.filterText`,
diff --git a/app/client/src/widgets/JSONFormWidget/fields/SwitchField.tsx b/app/client/src/widgets/JSONFormWidget/fields/SwitchField.tsx
index d15e345e3d37..a24364a9cee5 100644
--- a/app/client/src/widgets/JSONFormWidget/fields/SwitchField.tsx
+++ b/app/client/src/widgets/JSONFormWidget/fields/SwitchField.tsx
@@ -17,6 +17,7 @@ import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
 import { Colors } from "constants/Colors";
 import { BASE_LABEL_TEXT_SIZE } from "../component/FieldLabel";
 import { LabelPosition } from "components/constants";
+import useUnmountFieldValidation from "./useUnmountFieldValidation";
 
 type SwitchComponentOwnProps = FieldComponentBaseProps &
   FieldEventProps & {
@@ -70,6 +71,7 @@ function SwitchField({
     fieldType: schemaItem.fieldType,
     isValid: isValueValid,
   });
+  useUnmountFieldValidation({ fieldName: name });
 
   const onSwitchChange = useCallback(
     (value: boolean) => {
diff --git a/app/client/src/widgets/JSONFormWidget/fields/useUnmountFieldValidation.test.tsx b/app/client/src/widgets/JSONFormWidget/fields/useUnmountFieldValidation.test.tsx
new file mode 100644
index 000000000000..8a6af4f3b915
--- /dev/null
+++ b/app/client/src/widgets/JSONFormWidget/fields/useUnmountFieldValidation.test.tsx
@@ -0,0 +1,65 @@
+import { renderHook } from "@testing-library/react-hooks";
+import { useFormContext } from "react-hook-form";
+import useUnmountFieldValidation from "./useUnmountFieldValidation";
+import { startAndEndSpanForFn } from "UITelemetry/generateTraces";
+
+// Mock dependencies
+jest.mock("react-hook-form", () => ({
+  useFormContext: jest.fn(),
+}));
+
+jest.mock("UITelemetry/generateTraces", () => ({
+  startAndEndSpanForFn: jest.fn((name, options, fn) => fn()),
+}));
+
+describe("useUnmountFieldValidation", () => {
+  const mockTrigger = jest.fn();
+
+  beforeEach(() => {
+    (useFormContext as jest.Mock).mockReturnValue({
+      trigger: mockTrigger,
+    });
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it("should trigger validation on unmount", () => {
+    const fieldName = "testField";
+    const { unmount } = renderHook(() =>
+      useUnmountFieldValidation({ fieldName }),
+    );
+
+    // Verify trigger hasn't been called yet
+    expect(mockTrigger).not.toHaveBeenCalled();
+    expect(startAndEndSpanForFn).not.toHaveBeenCalled();
+
+    // Unmount the hook
+    unmount();
+
+    // Verify trigger was called with correct field name
+    expect(startAndEndSpanForFn).toHaveBeenCalledWith(
+      "JSONFormWidget.triggerFieldValidation",
+      {},
+      expect.any(Function),
+    );
+    expect(mockTrigger).toHaveBeenCalledWith(fieldName);
+  });
+
+  it("should update cleanup when fieldName changes", () => {
+    const { rerender, unmount } = renderHook(
+      ({ fieldName }) => useUnmountFieldValidation({ fieldName }),
+      {
+        initialProps: { fieldName: "field1" },
+      },
+    );
+
+    // Change the field name
+    rerender({ fieldName: "field2" });
+    unmount();
+
+    // Should trigger validation for the latest field name
+    expect(mockTrigger).toHaveBeenCalledWith("field2");
+  });
+});
diff --git a/app/client/src/widgets/JSONFormWidget/fields/useUnmountFieldValidation.ts b/app/client/src/widgets/JSONFormWidget/fields/useUnmountFieldValidation.ts
new file mode 100644
index 000000000000..13c449ca292c
--- /dev/null
+++ b/app/client/src/widgets/JSONFormWidget/fields/useUnmountFieldValidation.ts
@@ -0,0 +1,29 @@
+import { useEffect } from "react";
+import { useFormContext } from "react-hook-form";
+import type { ControllerProps } from "react-hook-form";
+import { startAndEndSpanForFn } from "UITelemetry/generateTraces";
+
+export interface UseUnmountFieldValidationProps {
+  fieldName: ControllerProps["name"];
+}
+
+/**
+ * This hook triggers validation for a field when it unmounts
+ * Useful for validating fields that become hidden/removed
+ * https://github.com/appsmithorg/appsmith/issues/28018
+ */
+function useUnmountFieldValidation({
+  fieldName,
+}: UseUnmountFieldValidationProps) {
+  const { trigger } = useFormContext();
+
+  useEffect(() => {
+    return () => {
+      startAndEndSpanForFn("JSONFormWidget.triggerFieldValidation", {}, () => {
+        trigger(fieldName);
+      });
+    };
+  }, [fieldName, trigger]);
+}
+
+export default useUnmountFieldValidation;
diff --git a/app/client/test/factories/MockPluginsState.ts b/app/client/test/factories/MockPluginsState.ts
index b1599afee491..dbebc0ad9fd2 100644
--- a/app/client/test/factories/MockPluginsState.ts
+++ b/app/client/test/factories/MockPluginsState.ts
@@ -6952,12 +6952,12 @@ export default {
         id: 1,
         children: [
           {
-            label: "Run API on page load",
+            label: "Run the API on page load",
             configProperty: "executeOnLoad",
             controlType: "SWITCH",
           },
           {
-            label: "Request confirmation before running API",
+            label: "Request confirmation before running this API",
             configProperty: "confirmBeforeExecute",
             controlType: "SWITCH",
             tooltipText:
@@ -7018,12 +7018,12 @@ export default {
         id: 1,
         children: [
           {
-            label: "Run API on page load",
+            label: "Run the API on page load",
             configProperty: "executeOnLoad",
             controlType: "SWITCH",
           },
           {
-            label: "Request confirmation before running API",
+            label: "Request confirmation before running this API",
             configProperty: "confirmBeforeExecute",
             controlType: "SWITCH",
             tooltipText:
@@ -7084,12 +7084,12 @@ export default {
         id: 1,
         children: [
           {
-            label: "Run query on page load",
+            label: "Run the query on page load",
             configProperty: "executeOnLoad",
             controlType: "SWITCH",
           },
           {
-            label: "Request confirmation before running query",
+            label: "Request confirmation before running this query",
             configProperty: "confirmBeforeExecute",
             controlType: "SWITCH",
             tooltipText:
@@ -7113,12 +7113,12 @@ export default {
         id: 1,
         children: [
           {
-            label: "Run query on page load",
+            label: "Run the query on page load",
             configProperty: "executeOnLoad",
             controlType: "SWITCH",
           },
           {
-            label: "Request confirmation before running query",
+            label: "Request confirmation before running this query",
             configProperty: "confirmBeforeExecute",
             controlType: "SWITCH",
             tooltipText:
diff --git a/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/setting.json b/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/setting.json
index 9cddff59a027..cb5ad8bfc24f 100644
--- a/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/amazons3Plugin/src/main/resources/setting.json
@@ -5,12 +5,12 @@
       "id": 1,
       "children": [
         {
-          "label": "Run query on page load",
+          "label": "Run the query on page load",
           "configProperty": "executeOnLoad",
           "controlType": "SWITCH"
         },
         {
-          "label": "Request confirmation before running query",
+          "label": "Request confirmation before running this query",
           "configProperty": "confirmBeforeExecute",
           "controlType": "SWITCH",
           "tooltipText": "Ask confirmation from the user each time before refreshing data"
diff --git a/app/server/appsmith-plugins/anthropicPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/anthropicPlugin/src/main/resources/setting.json
index db78a4aeb677..f24806929a67 100644
--- a/app/server/appsmith-plugins/anthropicPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/anthropicPlugin/src/main/resources/setting.json
@@ -5,12 +5,12 @@
       "id": 1,
       "children": [
         {
-          "label": "Run query on page load",
+          "label": "Run the query on page load",
           "configProperty": "executeOnLoad",
           "controlType": "SWITCH"
         },
         {
-          "label": "Request confirmation before running query",
+          "label": "Request confirmation before running this query",
           "configProperty": "confirmBeforeExecute",
           "controlType": "SWITCH",
           "tooltipText": "Ask confirmation from the user each time before refreshing data"
diff --git a/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/setting.json
index db78a4aeb677..f24806929a67 100644
--- a/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/appsmithAiPlugin/src/main/resources/setting.json
@@ -5,12 +5,12 @@
       "id": 1,
       "children": [
         {
-          "label": "Run query on page load",
+          "label": "Run the query on page load",
           "configProperty": "executeOnLoad",
           "controlType": "SWITCH"
         },
         {
-          "label": "Request confirmation before running query",
+          "label": "Request confirmation before running this query",
           "configProperty": "confirmBeforeExecute",
           "controlType": "SWITCH",
           "tooltipText": "Ask confirmation from the user each time before refreshing data"
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/setting.json
index f91ad47ff7d1..10edd6468460 100644
--- a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/setting.json
@@ -5,12 +5,12 @@
       "id": 1,
       "children": [
         {
-          "label": "Run query on page load",
+          "label": "Run the query on page load",
           "configProperty": "executeOnLoad",
           "controlType": "SWITCH"
         },
         {
-          "label": "Request confirmation before running query",
+          "label": "Request confirmation before running this query",
           "configProperty": "confirmBeforeExecute",
           "controlType": "SWITCH",
           "tooltipText": "Ask confirmation from the user each time before refreshing data"
diff --git a/app/server/appsmith-plugins/googleAiPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/googleAiPlugin/src/main/resources/setting.json
index db78a4aeb677..f24806929a67 100644
--- a/app/server/appsmith-plugins/googleAiPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/googleAiPlugin/src/main/resources/setting.json
@@ -5,12 +5,12 @@
       "id": 1,
       "children": [
         {
-          "label": "Run query on page load",
+          "label": "Run the query on page load",
           "configProperty": "executeOnLoad",
           "controlType": "SWITCH"
         },
         {
-          "label": "Request confirmation before running query",
+          "label": "Request confirmation before running this query",
           "configProperty": "confirmBeforeExecute",
           "controlType": "SWITCH",
           "tooltipText": "Ask confirmation from the user each time before refreshing data"
diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/editor/fetch_many.json b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/editor/fetch_many.json
index cbb21cb0f91f..67aa325d2728 100644
--- a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/editor/fetch_many.json
+++ b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/editor/fetch_many.json
@@ -198,6 +198,7 @@
           },
           "children": [
             {
+              "label": "",
               "configProperty": "actionConfiguration.formData.pagination.data",
               "controlType": "PAGINATION",
               "-subtitle": "Object",
diff --git a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/setting.json
index a6894cc1a08f..ac19bcf35b43 100644
--- a/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/setting.json
@@ -5,12 +5,12 @@
       "id": 1,
       "children": [
         {
-          "label": "Run query on page load",
+          "label": "Run the query on page load",
           "configProperty": "executeOnLoad",
           "controlType": "SWITCH"
         },
         {
-          "label": "Request confirmation before running query",
+          "label": "Request confirmation before running this query",
           "configProperty": "confirmBeforeExecute",
           "controlType": "SWITCH",
           "tooltipText": "Ask confirmation from the user each time before refreshing data"
diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/setting.json
index 914aa0aab250..7c673d6df3e1 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/setting.json
@@ -5,12 +5,12 @@
       "id": 1,
       "children": [
         {
-          "label": "Run query on page load",
+          "label": "Run the query on page load",
           "configProperty": "executeOnLoad",
           "controlType": "SWITCH"
         },
         {
-          "label": "Request confirmation before running query",
+          "label": "Request confirmation before running this query",
           "configProperty": "confirmBeforeExecute",
           "controlType": "SWITCH",
           "tooltipText": "Ask confirmation from the user each time before refreshing data"
diff --git a/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/setting.json
index 1fbe3596d117..3796dc7c50f8 100644
--- a/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/setting.json
@@ -5,12 +5,12 @@
       "id": 1,
       "children": [
         {
-          "label": "Run query on page load",
+          "label": "Run the query on page load",
           "configProperty": "executeOnLoad",
           "controlType": "SWITCH"
         },
         {
-          "label": "Request confirmation before running query",
+          "label": "Request confirmation before running this query",
           "configProperty": "confirmBeforeExecute",
           "controlType": "SWITCH",
           "tooltipText": "Ask confirmation from the user each time before refreshing data"
diff --git a/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/CREATE.sql b/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/CREATE.sql
index cfbb93837767..8588138670d3 100644
--- a/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/CREATE.sql
+++ b/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/CREATE.sql
@@ -1,8 +1,8 @@
 INSERT INTO users
-  (name, gender, email)
+	(name, gender, email)
 VALUES
-  (
-    {{ nameInput.text }},
-    {{ genderDropdown.selectedOptionValue }},
-    {{ emailInput.text }}
-  );
+	(
+		{{ nameInput.text }},
+		{{ genderDropdown.selectedOptionValue }},
+		{{ emailInput.text }}
+	);
diff --git a/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/SELECT.sql b/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/SELECT.sql
index f4d3905f05d3..57ce558bd267 100644
--- a/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/SELECT.sql
+++ b/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/SELECT.sql
@@ -1,3 +1,3 @@
 SELECT TOP 10 * FROM <<your_table_name>>;
 
--- Please enter a valid table name and hit RUN
\ No newline at end of file
+-- Please enter a valid table name and hit RUN
diff --git a/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/UPDATE.sql b/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/UPDATE.sql
index de4915e6fd1b..5ecd96ba4dcf 100644
--- a/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/UPDATE.sql
+++ b/app/server/appsmith-plugins/mssqlPlugin/src/main/resources/templates/UPDATE.sql
@@ -1,3 +1,3 @@
 UPDATE users
-  SET status = 'APPROVED'
-  WHERE id = {{ usersTable.selectedRow.id }};
+	SET status = 'APPROVED'
+	WHERE id = {{ usersTable.selectedRow.id }};
diff --git a/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/setting.json
index 1fbe3596d117..3796dc7c50f8 100644
--- a/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/setting.json
@@ -5,12 +5,12 @@
       "id": 1,
       "children": [
         {
-          "label": "Run query on page load",
+          "label": "Run the query on page load",
           "configProperty": "executeOnLoad",
           "controlType": "SWITCH"
         },
         {
-          "label": "Request confirmation before running query",
+          "label": "Request confirmation before running this query",
           "configProperty": "confirmBeforeExecute",
           "controlType": "SWITCH",
           "tooltipText": "Ask confirmation from the user each time before refreshing data"
diff --git a/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/CREATE.sql b/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/CREATE.sql
index b5253c2bf8b2..8588138670d3 100644
--- a/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/CREATE.sql
+++ b/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/CREATE.sql
@@ -1,8 +1,8 @@
 INSERT INTO users
-  (name, gender, email)
+	(name, gender, email)
 VALUES
-  (
-    {{ nameInput.text }},
-    {{ genderDropdown.selectedOptionValue }},
-    {{ emailInput.text }}
-  );
\ No newline at end of file
+	(
+		{{ nameInput.text }},
+		{{ genderDropdown.selectedOptionValue }},
+		{{ emailInput.text }}
+	);
diff --git a/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/DELETE.sql b/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/DELETE.sql
index e7014662d50a..459aa04c543d 100644
--- a/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/DELETE.sql
+++ b/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/DELETE.sql
@@ -1 +1 @@
-DELETE FROM users WHERE id = -1;
\ No newline at end of file
+DELETE FROM users WHERE id = -1;
diff --git a/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/UPDATE.sql b/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/UPDATE.sql
index facf9fc3f9d6..5ecd96ba4dcf 100644
--- a/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/UPDATE.sql
+++ b/app/server/appsmith-plugins/mysqlPlugin/src/main/resources/templates/UPDATE.sql
@@ -1,3 +1,3 @@
 UPDATE users
-  SET status = 'APPROVED'
-  WHERE id = {{ usersTable.selectedRow.id }};
\ No newline at end of file
+	SET status = 'APPROVED'
+	WHERE id = {{ usersTable.selectedRow.id }};
diff --git a/app/server/appsmith-plugins/openAiPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/openAiPlugin/src/main/resources/setting.json
index db78a4aeb677..f24806929a67 100644
--- a/app/server/appsmith-plugins/openAiPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/openAiPlugin/src/main/resources/setting.json
@@ -5,12 +5,12 @@
       "id": 1,
       "children": [
         {
-          "label": "Run query on page load",
+          "label": "Run the query on page load",
           "configProperty": "executeOnLoad",
           "controlType": "SWITCH"
         },
         {
-          "label": "Request confirmation before running query",
+          "label": "Request confirmation before running this query",
           "configProperty": "confirmBeforeExecute",
           "controlType": "SWITCH",
           "tooltipText": "Ask confirmation from the user each time before refreshing data"
diff --git a/app/server/appsmith-plugins/oraclePlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/oraclePlugin/src/main/resources/setting.json
index 1f53c2a196a2..e75716975b22 100755
--- a/app/server/appsmith-plugins/oraclePlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/oraclePlugin/src/main/resources/setting.json
@@ -5,12 +5,12 @@
       "id": 1,
       "children": [
         {
-          "label": "Run query on page load",
+          "label": "Run the query on page load",
           "configProperty": "executeOnLoad",
           "controlType": "SWITCH"
         },
         {
-          "label": "Request confirmation before running query",
+          "label": "Request confirmation before running this query",
           "configProperty": "confirmBeforeExecute",
           "controlType": "SWITCH",
           "tooltipText": "Ask confirmation from the user each time before refreshing data"
diff --git a/app/server/appsmith-plugins/oraclePlugin/src/main/resources/templates/DELETE.sql b/app/server/appsmith-plugins/oraclePlugin/src/main/resources/templates/DELETE.sql
index c5000f4ee8ea..a763c222abbd 100755
--- a/app/server/appsmith-plugins/oraclePlugin/src/main/resources/templates/DELETE.sql
+++ b/app/server/appsmith-plugins/oraclePlugin/src/main/resources/templates/DELETE.sql
@@ -1 +1 @@
-DELETE FROM users WHERE id = {{idInput.text}}
\ No newline at end of file
+DELETE FROM users WHERE id = {{idInput.text}}
diff --git a/app/server/appsmith-plugins/oraclePlugin/src/main/resources/templates/INSERT.sql b/app/server/appsmith-plugins/oraclePlugin/src/main/resources/templates/INSERT.sql
index f59768c5c550..e4a64159fed7 100755
--- a/app/server/appsmith-plugins/oraclePlugin/src/main/resources/templates/INSERT.sql
+++ b/app/server/appsmith-plugins/oraclePlugin/src/main/resources/templates/INSERT.sql
@@ -1,8 +1,8 @@
 INSERT INTO users
-  (name, gender, email)
+	(name, gender, email)
 VALUES
-  (
-    {{ nameInput.text }},
-    {{ genderDropdown.selectedOptionValue }},
-    {{ emailInput.text }}
-  )
\ No newline at end of file
+	(
+		{{ nameInput.text }},
+		{{ genderDropdown.selectedOptionValue }},
+		{{ emailInput.text }}
+	)
diff --git a/app/server/appsmith-plugins/oraclePlugin/src/main/resources/templates/UPDATE.sql b/app/server/appsmith-plugins/oraclePlugin/src/main/resources/templates/UPDATE.sql
index 1e8246500e01..2b9cb5d2a0e2 100755
--- a/app/server/appsmith-plugins/oraclePlugin/src/main/resources/templates/UPDATE.sql
+++ b/app/server/appsmith-plugins/oraclePlugin/src/main/resources/templates/UPDATE.sql
@@ -1 +1 @@
-UPDATE users SET status = 'APPROVED' WHERE id = {{ usersTable.selectedRow.id }}
\ No newline at end of file
+UPDATE users SET status = 'APPROVED' WHERE id = {{ usersTable.selectedRow.id }}
diff --git a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/setting.json b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/setting.json
index 1fbe3596d117..3796dc7c50f8 100644
--- a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/setting.json
+++ b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/setting.json
@@ -5,12 +5,12 @@
       "id": 1,
       "children": [
         {
-          "label": "Run query on page load",
+          "label": "Run the query on page load",
           "configProperty": "executeOnLoad",
           "controlType": "SWITCH"
         },
         {
-          "label": "Request confirmation before running query",
+          "label": "Request confirmation before running this query",
           "configProperty": "confirmBeforeExecute",
           "controlType": "SWITCH",
           "tooltipText": "Ask confirmation from the user each time before refreshing data"
diff --git a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/CREATE.sql b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/CREATE.sql
index b5253c2bf8b2..8588138670d3 100644
--- a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/CREATE.sql
+++ b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/CREATE.sql
@@ -1,8 +1,8 @@
 INSERT INTO users
-  (name, gender, email)
+	(name, gender, email)
 VALUES
-  (
-    {{ nameInput.text }},
-    {{ genderDropdown.selectedOptionValue }},
-    {{ emailInput.text }}
-  );
\ No newline at end of file
+	(
+		{{ nameInput.text }},
+		{{ genderDropdown.selectedOptionValue }},
+		{{ emailInput.text }}
+	);
diff --git a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/DELETE.sql b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/DELETE.sql
index e7014662d50a..459aa04c543d 100644
--- a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/DELETE.sql
+++ b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/DELETE.sql
@@ -1 +1 @@
-DELETE FROM users WHERE id = -1;
\ No newline at end of file
+DELETE FROM users WHERE id = -1;
diff --git a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/SELECT.sql b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/SELECT.sql
index 1c25fafff4ab..036ff8b22974 100644
--- a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/SELECT.sql
+++ b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/SELECT.sql
@@ -1,3 +1,3 @@
 SELECT * FROM <<your_table_name>> LIMIT 10;
 
--- Please enter a valid table name and hit RUN
\ No newline at end of file
+-- Please enter a valid table name and hit RUN
diff --git a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/UPDATE.sql b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/UPDATE.sql
index de4915e6fd1b..5ecd96ba4dcf 100644
--- a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/UPDATE.sql
+++ b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/templates/UPDATE.sql
@@ -1,3 +1,3 @@
 UPDATE users
-  SET status = 'APPROVED'
-  WHERE id = {{ usersTable.selectedRow.id }};
+	SET status = 'APPROVED'
+	WHERE id = {{ usersTable.selectedRow.id }};
diff --git a/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/CREATE.sql b/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/CREATE.sql
index b5253c2bf8b2..8588138670d3 100644
--- a/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/CREATE.sql
+++ b/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/CREATE.sql
@@ -1,8 +1,8 @@
 INSERT INTO users
-  (name, gender, email)
+	(name, gender, email)
 VALUES
-  (
-    {{ nameInput.text }},
-    {{ genderDropdown.selectedOptionValue }},
-    {{ emailInput.text }}
-  );
\ No newline at end of file
+	(
+		{{ nameInput.text }},
+		{{ genderDropdown.selectedOptionValue }},
+		{{ emailInput.text }}
+	);
diff --git a/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/DELETE.sql b/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/DELETE.sql
index e7014662d50a..459aa04c543d 100644
--- a/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/DELETE.sql
+++ b/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/DELETE.sql
@@ -1 +1 @@
-DELETE FROM users WHERE id = -1;
\ No newline at end of file
+DELETE FROM users WHERE id = -1;
diff --git a/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/SELECT.sql b/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/SELECT.sql
index 1c25fafff4ab..036ff8b22974 100644
--- a/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/SELECT.sql
+++ b/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/SELECT.sql
@@ -1,3 +1,3 @@
 SELECT * FROM <<your_table_name>> LIMIT 10;
 
--- Please enter a valid table name and hit RUN
\ No newline at end of file
+-- Please enter a valid table name and hit RUN
diff --git a/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/UPDATE.sql b/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/UPDATE.sql
index facf9fc3f9d6..5ecd96ba4dcf 100644
--- a/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/UPDATE.sql
+++ b/app/server/appsmith-plugins/redshiftPlugin/src/main/resources/templates/UPDATE.sql
@@ -1,3 +1,3 @@
 UPDATE users
-  SET status = 'APPROVED'
-  WHERE id = {{ usersTable.selectedRow.id }};
\ No newline at end of file
+	SET status = 'APPROVED'
+	WHERE id = {{ usersTable.selectedRow.id }};
diff --git a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/CREATE.sql b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/CREATE.sql
index 3166e4d345dd..85b7e1cce8e9 100644
--- a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/CREATE.sql
+++ b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/CREATE.sql
@@ -1,8 +1,8 @@
 INSERT INTO users
-  (name, gender, email)
+	(name, gender, email)
 VALUES
-  (
-    '{{ nameInput.text }}',
-    '{{ genderDropdown.selectedOptionValue }}',
-    '{{ emailInput.text }}'
-  );
\ No newline at end of file
+	(
+		'{{ nameInput.text }}',
+		'{{ genderDropdown.selectedOptionValue }}',
+		'{{ emailInput.text }}'
+	);
diff --git a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/DELETE.sql b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/DELETE.sql
index e7014662d50a..459aa04c543d 100644
--- a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/DELETE.sql
+++ b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/DELETE.sql
@@ -1 +1 @@
-DELETE FROM users WHERE id = -1;
\ No newline at end of file
+DELETE FROM users WHERE id = -1;
diff --git a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/SELECT.sql b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/SELECT.sql
index 1c25fafff4ab..036ff8b22974 100644
--- a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/SELECT.sql
+++ b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/SELECT.sql
@@ -1,3 +1,3 @@
 SELECT * FROM <<your_table_name>> LIMIT 10;
 
--- Please enter a valid table name and hit RUN
\ No newline at end of file
+-- Please enter a valid table name and hit RUN
diff --git a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/UPDATE.sql b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/UPDATE.sql
index 966633a70592..0a7e95bb77c3 100644
--- a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/UPDATE.sql
+++ b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/UPDATE.sql
@@ -1,3 +1,3 @@
 UPDATE users
-  SET status = 'APPROVED'
-  WHERE id = '{{ usersTable.selectedRow.id }}';
\ No newline at end of file
+	SET status = 'APPROVED'
+	WHERE id = '{{ usersTable.selectedRow.id }}';
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceCEImpl.java
index 1f046c8ba290..ec39de3168a2 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceCEImpl.java
@@ -8,6 +8,7 @@
 import com.appsmith.server.datasources.base.DatasourceService;
 import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.ApplicationMode;
+import com.appsmith.server.domains.GitArtifactMetadata;
 import com.appsmith.server.domains.NewPage;
 import com.appsmith.server.domains.Plugin;
 import com.appsmith.server.dtos.ApplicationPagesDTO;
@@ -42,6 +43,7 @@
 import reactor.core.observability.micrometer.Micrometer;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import reactor.util.function.Tuple2;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -204,7 +206,7 @@ public Mono<ConsolidatedAPIResponseDTO> getConsolidatedInfoForPageLoad(
         if (isBlank(basePageId)) {
             return Mono.when(fetches).thenReturn(consolidatedAPIResponseDTO);
         }
-        Mono<Application> branchedApplicationMonoCached;
+
         Mono<String> baseApplicationIdMono = Mono.just("");
         if (isViewMode) {
             // Attempt to retrieve the application ID associated with the given base page ID from the cache.
@@ -213,40 +215,118 @@ public Mono<ConsolidatedAPIResponseDTO> getConsolidatedInfoForPageLoad(
                     .switchIfEmpty(Mono.just(""))
                     .cast(String.class);
         }
+
         baseApplicationIdMono = baseApplicationIdMono
                 .name(getQualifiedSpanName(APPLICATION_ID_FETCH_REDIS_SPAN, mode))
                 .tap(Micrometer.observation(observationRegistry))
                 .cache();
 
-        Mono<NewPage> branchedPageMonoCached = newPageService
-                .findByBranchNameAndBasePageIdAndApplicationMode(branchName, basePageId, mode)
-                .cache();
+        Mono<Tuple2<Application, NewPage>> applicationAndPageTupleMono = baseApplicationIdMono
+                .flatMap(cachedBaseApplicationId -> {
+                    Mono<Application> applicationMono;
+                    Mono<NewPage> branchedPageMonoCached;
+
+                    branchedPageMonoCached = newPageService
+                            .findByBranchNameAndBasePageIdAndApplicationMode(branchName, basePageId, mode)
+                            .cache();
+
+                    if (StringUtils.hasText(cachedBaseApplicationId)) {
+                        // Handle non-empty baseApplicationId
+                        applicationMono = applicationService.findByBaseIdBranchNameAndApplicationMode(
+                                cachedBaseApplicationId, branchName, mode);
+                    } else {
+                        // Handle empty or null baseApplicationId
+                        applicationMono = branchedPageMonoCached.flatMap(branchedPage ->
+                                // Use the application ID to find the complete application details.
+                                applicationService
+                                        .findByBranchedApplicationIdAndApplicationMode(
+                                                branchedPage.getApplicationId(), mode)
+                                        .flatMap(application -> {
+                                            if (isViewMode) {
+                                                // Update the cache with the new application’s base ID for future
+                                                // queries.
+                                                return cacheableRepositoryHelper
+                                                        .fetchBaseApplicationId(basePageId, application.getBaseId())
+                                                        .thenReturn(application)
+                                                        .name(getQualifiedSpanName(
+                                                                APPLICATION_ID_UPDATE_REDIS_SPAN, mode))
+                                                        .tap(Micrometer.observation(observationRegistry));
+                                            }
+                                            return Mono.just(application);
+                                        }));
+                    }
 
-        branchedApplicationMonoCached = baseApplicationIdMono.flatMap(cachedBaseApplicationId -> {
-            if (!StringUtils.hasText(cachedBaseApplicationId)) {
-                // Handle empty or null baseApplicationId
-                return branchedPageMonoCached.flatMap(branchedPage ->
-                        // Use the application ID to find the complete application details.
-                        applicationService
-                                .findByBranchedApplicationIdAndApplicationMode(branchedPage.getApplicationId(), mode)
-                                .flatMap(application -> {
-                                    if (isViewMode) {
-                                        // Update the cache with the new application’s base ID for future
-                                        // queries.
-                                        return cacheableRepositoryHelper
-                                                .fetchBaseApplicationId(basePageId, application.getBaseId())
-                                                .thenReturn(application)
-                                                .name(getQualifiedSpanName(APPLICATION_ID_UPDATE_REDIS_SPAN, mode))
-                                                .tap(Micrometer.observation(observationRegistry));
+                    if (StringUtils.hasText(branchName)) {
+
+                        // If in case the application is a non git connected application and the branch name url param
+                        // is present, then we must default to the app without any branches.
+                        return applicationMono.zipWith(branchedPageMonoCached).onErrorResume(error -> {
+                            // This situation would arise if page or application is not returned.
+                            // here we would land on error instead of empty because both apis which are being
+                            // called errors out on empty returns.
+
+                            log.info(
+                                    "application or page has for base pageId {} and branchName {} has not been found.",
+                                    basePageId,
+                                    branchName);
+                            if (error instanceof AppsmithException) {
+                                Mono<NewPage> basePageMono =
+                                        newPageService.findByBranchNameAndBasePageIdAndApplicationMode(
+                                                null, basePageId, mode);
+
+                                return basePageMono.flatMap(basePage -> {
+                                    if (StringUtils.hasText(basePage.getBranchName())) {
+                                        // If the branch name is present then the application is git connected
+                                        // the error should be thrown.
+                                        // TODO: verify if branch name could be residue from old git connection
+                                        // Application metadata is absolute check for the same.
+                                        return Mono.error(error);
                                     }
-                                    return Mono.just(application);
-                                }));
-            } else {
-                // Handle non-empty baseApplicationId
-                return applicationService.findByBaseIdBranchNameAndApplicationMode(
-                        cachedBaseApplicationId, branchName, mode);
-            }
-        });
+
+                                    return applicationService
+                                            .findByBranchedApplicationIdAndApplicationMode(
+                                                    basePage.getApplicationId(), mode)
+                                            .zipWith(basePageMono)
+                                            .map(tuple2 -> {
+                                                log.info(
+                                                        "The branchName url param should not be associated with application {} as this is not a git connected application",
+                                                        tuple2.getT1().getId());
+                                                return tuple2;
+                                            });
+                                });
+                            }
+
+                            return Mono.error(error);
+                        });
+                    }
+
+                    return applicationMono.flatMap(application -> {
+                        GitArtifactMetadata gitMetadata = application.getGitArtifactMetadata();
+
+                        if (gitMetadata == null
+                                || gitMetadata.getDefaultBranchName().equals(gitMetadata.getBranchName())) {
+                            return Mono.just(application).zipWith(branchedPageMonoCached);
+                        }
+
+                        // The git connected application has not been queried with branch param,
+                        // and the base branch is not same as the default branch.
+                        // we need to find return the default branch from here.
+
+                        String defaultBranchName = gitMetadata.getDefaultBranchName();
+
+                        return applicationService
+                                .findByBaseIdBranchNameAndApplicationMode(application.getId(), defaultBranchName, mode)
+                                .zipWith(newPageService.findByBranchNameAndBasePageIdAndApplicationMode(
+                                        defaultBranchName, basePageId, mode));
+                    });
+                })
+                .cache();
+
+        Mono<NewPage> branchedPageMonoCached =
+                applicationAndPageTupleMono.map(Tuple2::getT2).cache();
+
+        Mono<Application> branchedApplicationMonoCached =
+                applicationAndPageTupleMono.map(Tuple2::getT1).cache();
 
         branchedApplicationMonoCached = branchedApplicationMonoCached
                 .name(getQualifiedSpanName(APPLICATION_ID_SPAN, mode))
@@ -307,8 +387,9 @@ public Mono<ConsolidatedAPIResponseDTO> getConsolidatedInfoForPageLoad(
 
         if (!isBlank(basePageId)) {
             /* Get current page */
-            fetches.add(applicationPageService
-                    .getPageAndMigrateDslByBranchAndBasePageId(basePageId, branchName, isViewMode, true)
+            fetches.add(branchedPageMonoCached
+                    .flatMap(branchedPage -> applicationPageService.getPageAndMigrateDslByBranchedPageId(
+                            branchedPage.getId(), isViewMode, true))
                     .as(this::toResponseDTO)
                     .doOnError(e -> log.error("Error fetching current page", e))
                     .doOnSuccess(consolidatedAPIResponseDTO::setPageWithMigratedDsl)
@@ -320,11 +401,9 @@ public Mono<ConsolidatedAPIResponseDTO> getConsolidatedInfoForPageLoad(
         if (isViewMode) {
             /* Get list of all actions of the page in view mode */
             if (!isBlank(basePageId)) {
-                // When branchName is null, we don't need to fetch page from DB to derive pageId
-                // We can simply reuse the pageId that is passed by client to query actions
-                Mono<String> branchedPageIdMono = !StringUtils.hasText(branchName)
-                        ? Mono.just(basePageId)
-                        : branchedPageMonoCached.map(NewPage::getId);
+                // For a git connected application the desired branch name may differ from the base if no
+                // branch name is provided hence, we would still need to check this.
+                Mono<String> branchedPageIdMono = branchedPageMonoCached.map(NewPage::getId);
                 fetches.add(branchedPageIdMono
                         .flatMap(branchedPageId -> newActionService
                                 .getActionsForViewModeByPageId(branchedPageId)
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImpl.java
index c8db695056cf..38c8664141d0 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImpl.java
@@ -265,15 +265,6 @@ private Mono<ExecuteActionDTO> populateExecuteActionDTO(ExecuteActionDTO execute
                         }));
     }
 
-    /**
-     * Populates the requestParams with logged in userId.
-     * If the user is not logged in, set the parameter as anonymousUserId
-     *
-     */
-    protected Mono<ExecuteActionDTO> populateExecuteActionDTOWithUserId(ExecuteActionDTO executeActionDTO) {
-        return Mono.just(executeActionDTO);
-    }
-
     /**
      * Executes the action(queries) by creating executeActionDTO and sending it to the plugin for further execution
      *
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DatasourceStructureSolutionCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DatasourceStructureSolutionCEImpl.java
index e93c4c13149c..19fec9feea6e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DatasourceStructureSolutionCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/DatasourceStructureSolutionCEImpl.java
@@ -183,7 +183,7 @@ public Mono<DatasourceStructure> getStructure(DatasourceStorage datasourceStorag
     public Mono<ActionExecutionResult> getSchemaPreviewData(
             String datasourceId, String environmentId, Template queryTemplate) {
         return datasourceService
-                .findById(datasourceId, datasourcePermission.getExecutePermission())
+                .findById(datasourceId, datasourcePermission.getActionCreatePermission())
                 .zipWhen(datasource -> datasourceService.getTrueEnvironmentId(
                         datasource.getWorkspaceId(),
                         environmentId,
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceImplTest.java
index 97e651a6b2ea..288cef9864cb 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceImplTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceImplTest.java
@@ -8,12 +8,15 @@
 import com.appsmith.server.datasources.base.DatasourceService;
 import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.ApplicationMode;
+import com.appsmith.server.domains.ApplicationPage;
 import com.appsmith.server.domains.CustomJSLib;
+import com.appsmith.server.domains.GitArtifactMetadata;
 import com.appsmith.server.domains.NewPage;
 import com.appsmith.server.domains.Plugin;
 import com.appsmith.server.domains.Tenant;
 import com.appsmith.server.domains.Theme;
 import com.appsmith.server.domains.User;
+import com.appsmith.server.domains.UserData;
 import com.appsmith.server.dtos.ActionCollectionDTO;
 import com.appsmith.server.dtos.ActionCollectionViewDTO;
 import com.appsmith.server.dtos.ActionViewDTO;
@@ -66,6 +69,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.when;
 
@@ -231,6 +235,7 @@ public void testPageLoadResponseForViewMode() {
         NewPage mockNewPage = new NewPage();
         mockNewPage.setApplicationId("mockApplicationId");
         mockNewPage.setId("mockPageId");
+        mockNewPage.setBranchName("branch");
         doReturn(Mono.just(mockNewPage))
                 .when(spyNewPageService)
                 .findByBranchNameAndBasePageId(anyString(), anyString(), any(), any());
@@ -239,10 +244,6 @@ public void testPageLoadResponseForViewMode() {
                 .when(spyApplicationPageService)
                 .getPagesBasedOnApplicationMode(any(), any());
 
-        doReturn(Mono.just(new PageDTO()))
-                .when(spyApplicationPageService)
-                .getPageAndMigrateDslByBranchAndBasePageId(anyString(), anyString(), anyBoolean(), anyBoolean());
-
         doReturn(Mono.just(sampleApplicationPagesDTO))
                 .when(spyNewPageService)
                 .createApplicationPagesDTO(any(), any(), anyBoolean(), anyBoolean());
@@ -262,7 +263,7 @@ public void testPageLoadResponseForViewMode() {
         samplePageDTO.setName("samplePageDTO");
         doReturn(Mono.just(samplePageDTO))
                 .when(spyApplicationPageService)
-                .getPageAndMigrateDslByBranchAndBasePageId(anyString(), anyString(), anyBoolean(), anyBoolean());
+                .getPageAndMigrateDslByBranchedPageId(anyString(), anyBoolean(), anyBoolean());
 
         ActionViewDTO sampleActionViewDTO = new ActionViewDTO();
         sampleActionViewDTO.setName("sampleActionViewDTO");
@@ -432,7 +433,7 @@ public void testPageLoadResponseForEditMode() {
 
         doReturn(Mono.just(new PageDTO()))
                 .when(spyApplicationPageService)
-                .getPageAndMigrateDslByBranchAndBasePageId(anyString(), anyString(), anyBoolean(), anyBoolean());
+                .getPageAndMigrateDslByBranchedPageId(anyString(), anyBoolean(), anyBoolean());
 
         doReturn(Mono.just(sampleApplicationPagesDTO))
                 .when(spyNewPageService)
@@ -454,7 +455,7 @@ public void testPageLoadResponseForEditMode() {
         doReturn(Mono.just(samplePageDTO))
                 .doReturn(Mono.just(samplePageDTO))
                 .when(spyApplicationPageService)
-                .getPageAndMigrateDslByBranchAndBasePageId(anyString(), anyString(), anyBoolean(), anyBoolean());
+                .getPageAndMigrateDslByBranchedPageId(anyString(), anyBoolean(), anyBoolean());
 
         doReturn(Mono.just(samplePageDTO))
                 .doReturn(Mono.just(samplePageDTO))
@@ -877,4 +878,539 @@ public void testErrorResponseWhenAnonymousUserAccessPrivateApp() {
                 })
                 .verifyComplete();
     }
+
+    @Test
+    public void testPageLoadResponseForViewMode_whenBranchNameIsPresentInNonGitApp() {
+        User sampleUser = new User();
+        when(mockSessionUserService.getCurrentUser()).thenReturn(Mono.just(sampleUser));
+
+        UserProfileDTO sampleUserProfileDTO = new UserProfileDTO();
+        sampleUserProfileDTO.setName("sampleUserProfileDTO");
+        when(mockUserService.buildUserProfileDTO(any())).thenReturn(Mono.just(sampleUserProfileDTO));
+
+        Map<String, Boolean> sampleFeatureFlagMap = new HashMap<>();
+        sampleFeatureFlagMap.put("sampleFeatureFlag", true);
+        when(mockUserDataService.getFeatureFlagsForCurrentUser()).thenReturn(Mono.just(sampleFeatureFlagMap));
+
+        Tenant sampleTenant = new Tenant();
+        sampleTenant.setDisplayName("sampleTenant");
+        when(mockTenantService.getTenantConfiguration()).thenReturn(Mono.just(sampleTenant));
+
+        ProductAlertResponseDTO sampleProductAlertResponseDTO = new ProductAlertResponseDTO();
+        sampleProductAlertResponseDTO.setTitle("sampleProductAlert");
+        when(mockProductAlertService.getSingleApplicableMessage())
+                .thenReturn(Mono.just(List.of(sampleProductAlertResponseDTO)));
+
+        ApplicationPagesDTO sampleApplicationPagesDTO = new ApplicationPagesDTO();
+        sampleApplicationPagesDTO.setWorkspaceId("sampleWorkspaceId");
+
+        Application mockApplication = new Application();
+        mockApplication.setId("mockApplicationId");
+        doReturn(Mono.just(mockApplication))
+                .when(spyApplicationService)
+                .findByBranchedApplicationIdAndApplicationMode(anyString(), any());
+
+        NewPage mockNewPage = new NewPage();
+        mockNewPage.setApplicationId("mockApplicationId");
+        mockNewPage.setId("mockPageId");
+
+        doReturn(Mono.just(mockNewPage))
+                .when(spyNewPageService)
+                .findByBranchNameAndBasePageId(eq(null), eq("mockPageId"), any(), any());
+
+        doReturn(Mono.just(List.of(mockNewPage)))
+                .when(spyApplicationPageService)
+                .getPagesBasedOnApplicationMode(any(), any());
+
+        doReturn(Mono.just(sampleApplicationPagesDTO))
+                .when(spyNewPageService)
+                .createApplicationPagesDTO(any(), any(), anyBoolean(), anyBoolean());
+
+        Theme sampleTheme = new Theme();
+        sampleTheme.setName("sampleTheme");
+        doReturn(Mono.just(sampleTheme)).when(spyThemeService).getApplicationTheme(anyString(), any());
+        doReturn(Flux.just(sampleTheme)).when(spyThemeService).getApplicationThemes(anyString());
+
+        CustomJSLib sampleCustomJSLib = new CustomJSLib();
+        sampleCustomJSLib.setName("sampleJSLib");
+        doReturn(Mono.just(List.of(sampleCustomJSLib)))
+                .when(spyCustomJSLibService)
+                .getAllJSLibsInContext(anyString(), any(), anyBoolean());
+
+        PageDTO samplePageDTO = new PageDTO();
+        samplePageDTO.setName("samplePageDTO");
+        doReturn(Mono.just(samplePageDTO))
+                .when(spyApplicationPageService)
+                .getPageAndMigrateDslByBranchedPageId(anyString(), anyBoolean(), anyBoolean());
+
+        ActionViewDTO sampleActionViewDTO = new ActionViewDTO();
+        sampleActionViewDTO.setName("sampleActionViewDTO");
+        doReturn(Flux.just(sampleActionViewDTO)).when(spyNewActionService).getActionsForViewModeByPageId(anyString());
+
+        ActionCollectionViewDTO sampleActionCollectionViewDTO = new ActionCollectionViewDTO();
+        sampleActionCollectionViewDTO.setName("sampleActionCollectionViewDTO");
+        doReturn(Flux.just(sampleActionCollectionViewDTO))
+                .when(spyActionCollectionService)
+                .getActionCollectionsForViewMode(anyString());
+
+        Mono<ConsolidatedAPIResponseDTO> consolidatedInfoForPageLoad =
+                consolidatedAPIService.getConsolidatedInfoForPageLoad(
+                        "mockPageId", null, "branch", ApplicationMode.PUBLISHED);
+        StepVerifier.create(consolidatedInfoForPageLoad)
+                .assertNext(consolidatedAPIResponseDTO -> {
+                    assertNotNull(consolidatedAPIResponseDTO.getPublishedActions());
+                    assertEquals(
+                            1,
+                            consolidatedAPIResponseDTO
+                                    .getPublishedActions()
+                                    .getData()
+                                    .size());
+                    assertEquals(
+                            "sampleActionViewDTO",
+                            consolidatedAPIResponseDTO
+                                    .getPublishedActions()
+                                    .getData()
+                                    .get(0)
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getUserProfile());
+                    assertEquals(
+                            "sampleUserProfileDTO",
+                            consolidatedAPIResponseDTO
+                                    .getUserProfile()
+                                    .getData()
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getTenantConfig());
+                    assertEquals(
+                            "sampleTenant",
+                            consolidatedAPIResponseDTO
+                                    .getTenantConfig()
+                                    .getData()
+                                    .getDisplayName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getFeatureFlags());
+                    assertTrue(consolidatedAPIResponseDTO
+                            .getFeatureFlags()
+                            .getData()
+                            .get("sampleFeatureFlag"));
+
+                    assertNotNull(consolidatedAPIResponseDTO.getPages());
+                    assertEquals(
+                            "sampleWorkspaceId",
+                            consolidatedAPIResponseDTO.getPages().getData().getWorkspaceId());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getCurrentTheme());
+                    assertEquals(
+                            "sampleTheme",
+                            consolidatedAPIResponseDTO
+                                    .getCurrentTheme()
+                                    .getData()
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getThemes());
+                    assertEquals(
+                            1, consolidatedAPIResponseDTO.getThemes().getData().size());
+                    assertEquals(
+                            "sampleTheme",
+                            consolidatedAPIResponseDTO
+                                    .getThemes()
+                                    .getData()
+                                    .get(0)
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getPublishedActionCollections());
+                    assertEquals(
+                            1,
+                            consolidatedAPIResponseDTO
+                                    .getPublishedActionCollections()
+                                    .getData()
+                                    .size());
+                    assertEquals(
+                            "sampleActionCollectionViewDTO",
+                            consolidatedAPIResponseDTO
+                                    .getPublishedActionCollections()
+                                    .getData()
+                                    .get(0)
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getPageWithMigratedDsl());
+                    assertEquals(
+                            "samplePageDTO",
+                            consolidatedAPIResponseDTO
+                                    .getPageWithMigratedDsl()
+                                    .getData()
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getCustomJSLibraries());
+                    assertEquals(
+                            1,
+                            consolidatedAPIResponseDTO
+                                    .getCustomJSLibraries()
+                                    .getData()
+                                    .size());
+                    assertEquals(
+                            "sampleJSLib",
+                            consolidatedAPIResponseDTO
+                                    .getCustomJSLibraries()
+                                    .getData()
+                                    .get(0)
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getProductAlert());
+                    assertEquals(
+                            "sampleProductAlert",
+                            consolidatedAPIResponseDTO
+                                    .getProductAlert()
+                                    .getData()
+                                    .getTitle());
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    public void testPageLoadResponseForEditModeWhenDefaultBranchIsDifferentFromDefault() {
+        User sampleUser = new User();
+        when(mockSessionUserService.getCurrentUser()).thenReturn(Mono.just(sampleUser));
+
+        UserProfileDTO sampleUserProfileDTO = new UserProfileDTO();
+        sampleUserProfileDTO.setName("sampleUserProfileDTO");
+        when(mockUserService.buildUserProfileDTO(any())).thenReturn(Mono.just(sampleUserProfileDTO));
+
+        Map<String, Boolean> sampleFeatureFlagMap = new HashMap<>();
+        sampleFeatureFlagMap.put("sampleFeatureFlag", true);
+        when(mockUserDataService.getFeatureFlagsForCurrentUser()).thenReturn(Mono.just(sampleFeatureFlagMap));
+
+        when(mockUserDataService.updateLastUsedResourceAndWorkspaceList(any(), any(), any()))
+                .thenReturn(Mono.just(new UserData()));
+
+        Tenant sampleTenant = new Tenant();
+        sampleTenant.setDisplayName("sampleTenant");
+        when(mockTenantService.getTenantConfiguration()).thenReturn(Mono.just(sampleTenant));
+
+        ProductAlertResponseDTO sampleProductAlertResponseDTO = new ProductAlertResponseDTO();
+        sampleProductAlertResponseDTO.setTitle("sampleProductAlert");
+        when(mockProductAlertService.getSingleApplicableMessage())
+                .thenReturn(Mono.just(List.of(sampleProductAlertResponseDTO)));
+
+        ApplicationPagesDTO sampleApplicationPagesDTO = new ApplicationPagesDTO();
+        sampleApplicationPagesDTO.setWorkspaceId("sampleWorkspaceId");
+
+        Application mockApplicationBaseBranch = new Application();
+        GitArtifactMetadata baseMetadata = new GitArtifactMetadata();
+        baseMetadata.setBranchName("master");
+        baseMetadata.setDefaultBranchName("newDefaultBranch");
+        baseMetadata.setDefaultApplicationId("mockBaseId");
+        mockApplicationBaseBranch.setGitArtifactMetadata(baseMetadata);
+        mockApplicationBaseBranch.setId("mockId");
+
+        doReturn(Mono.just(mockApplicationBaseBranch))
+                .when(spyApplicationService)
+                .findByBranchedApplicationIdAndApplicationMode(anyString(), any());
+
+        ApplicationPage defaultApplicationPage = new ApplicationPage();
+        defaultApplicationPage.setIsDefault(true);
+        defaultApplicationPage.setId("defaultPageId");
+
+        Application mockDefaultApplication = new Application();
+        GitArtifactMetadata defaultMetadata = new GitArtifactMetadata();
+        defaultMetadata.setBranchName("newDefaultBranch");
+        defaultMetadata.setDefaultApplicationId("mockBaseId");
+        mockDefaultApplication.setGitArtifactMetadata(defaultMetadata);
+        mockDefaultApplication.setId("defaultApplicationId");
+        mockDefaultApplication.setPages(List.of(defaultApplicationPage));
+        mockDefaultApplication.setWorkspaceId("sampleWorkspaceId");
+
+        doReturn(Mono.just(mockDefaultApplication))
+                .when(spyApplicationService)
+                .findByBaseIdBranchNameAndApplicationMode(anyString(), anyString(), any());
+
+        NewPage basePage = new NewPage();
+        basePage.setApplicationId("mockBaseId");
+
+        PageDTO unpublishedPage = new PageDTO();
+        NewPage defaultAppDefaultPage = new NewPage();
+        defaultAppDefaultPage.setId("defaultPageId");
+        defaultAppDefaultPage.setApplicationId("defaultApplicationId");
+        defaultAppDefaultPage.setUnpublishedPage(unpublishedPage);
+
+        doReturn(Mono.just(basePage))
+                .when(spyNewPageService)
+                .findByBranchNameAndBasePageId(eq(null), anyString(), any(), any());
+
+        doReturn(Mono.just(defaultAppDefaultPage))
+                .when(spyNewPageService)
+                .findByBranchNameAndBasePageId(anyString(), anyString(), any(), any());
+
+        doReturn(Mono.just(List.of(defaultAppDefaultPage)))
+                .when(spyApplicationPageService)
+                .getPagesBasedOnApplicationMode(any(), any());
+
+        doReturn(Mono.just(new PageDTO()))
+                .when(spyApplicationPageService)
+                .getPageAndMigrateDslByBranchedPageId(anyString(), anyBoolean(), anyBoolean());
+
+        Theme sampleTheme = new Theme();
+        sampleTheme.setName("sampleTheme");
+        doReturn(Mono.just(sampleTheme)).when(spyThemeService).getApplicationTheme(anyString(), any());
+        doReturn(Flux.just(sampleTheme)).when(spyThemeService).getApplicationThemes(anyString());
+
+        CustomJSLib sampleCustomJSLib = new CustomJSLib();
+        sampleCustomJSLib.setName("sampleJSLib");
+        doReturn(Mono.just(List.of(sampleCustomJSLib)))
+                .when(spyCustomJSLibService)
+                .getAllJSLibsInContext(anyString(), any(), anyBoolean());
+
+        PageDTO samplePageDTO = new PageDTO();
+        samplePageDTO.setName("samplePageDTO");
+        doReturn(Mono.just(samplePageDTO))
+                .doReturn(Mono.just(samplePageDTO))
+                .when(spyApplicationPageService)
+                .getPageAndMigrateDslByBranchedPageId(anyString(), anyBoolean(), anyBoolean());
+
+        doReturn(Mono.just(samplePageDTO))
+                .doReturn(Mono.just(samplePageDTO))
+                .when(spyApplicationPageService)
+                .getPageDTOAfterMigratingDSL(any(), anyBoolean(), anyBoolean());
+
+        doReturn(Mono.just(samplePageDTO))
+                .doReturn(Mono.just(samplePageDTO))
+                .when(spyApplicationPageService)
+                .getPageDTOAfterMigratingDSL(any(), anyBoolean(), anyBoolean());
+
+        ActionDTO sampleActionDTO = new ActionDTO();
+        sampleActionDTO.setName("sampleActionDTO");
+        sampleActionDTO.setUpdatedAt(Instant.now());
+        doReturn(Flux.just(sampleActionDTO)).when(spyNewActionService).getUnpublishedActions(any(), anyBoolean());
+
+        ActionCollectionDTO sampleActionCollectionDTO = new ActionCollectionDTO();
+        sampleActionCollectionDTO.setName("sampleActionCollectionDTO");
+        doReturn(Flux.just(sampleActionCollectionDTO))
+                .when(spyActionCollectionService)
+                .getPopulatedActionCollectionsByViewMode(any(), anyBoolean());
+
+        PageNameIdDTO samplePageNameIdDTO = new PageNameIdDTO();
+        samplePageNameIdDTO.setName("samplePageNameIdDTO");
+        sampleApplicationPagesDTO.setPages(List.of(samplePageNameIdDTO));
+
+        Plugin samplePlugin = new Plugin();
+        samplePlugin.setName("samplePlugin");
+        samplePlugin.setId("samplePluginId");
+        samplePlugin.setPackageName("sample-plugin");
+        Plugin sampleRestApiPlugin = new Plugin();
+        sampleRestApiPlugin.setName("sampleRestApiPlugin");
+        sampleRestApiPlugin.setId("sampleRestApiPluginId");
+        sampleRestApiPlugin.setPackageName(REST_API_PLUGIN);
+        Plugin sampleGraphqlPlugin = new Plugin();
+        sampleGraphqlPlugin.setName("sampleGraphqlPlugin");
+        sampleGraphqlPlugin.setId("sampleGraphqlPluginId");
+        sampleGraphqlPlugin.setPackageName(GRAPHQL_PLUGIN);
+        Plugin sampleAiPlugin = new Plugin();
+        sampleAiPlugin.setName("sampleAiPlugin");
+        sampleAiPlugin.setId("sampleAiPluginId");
+        sampleAiPlugin.setPackageName(APPSMITH_AI_PLUGIN);
+        when(mockPluginService.getInWorkspace(anyString()))
+                .thenReturn(Flux.just(samplePlugin, sampleRestApiPlugin, sampleGraphqlPlugin, sampleAiPlugin));
+
+        Datasource sampleDatasource = new Datasource();
+        sampleDatasource.setName("sampleDatasource");
+        sampleDatasource.setPluginId("samplePluginId");
+        when(mockDatasourceService.getAllWithStorages(any())).thenReturn(Flux.just(sampleDatasource));
+
+        Map<String, Map<?, ?>> sampleFormConfig = new HashMap<>();
+        sampleFormConfig.put("key", Map.of());
+        when(mockPluginService.getFormConfig(anyString())).thenReturn(Mono.just(sampleFormConfig));
+
+        MockDataSet sampleMockDataSet = new MockDataSet();
+        sampleMockDataSet.setName("sampleMockDataSet");
+        MockDataDTO sampleMockDataDTO = new MockDataDTO();
+        sampleMockDataDTO.setMockdbs(List.of(sampleMockDataSet));
+        when(mockMockDataService.getMockDataSet()).thenReturn(Mono.just(sampleMockDataDTO));
+
+        Mono<ConsolidatedAPIResponseDTO> consolidatedInfoForPageLoad =
+                consolidatedAPIService.getConsolidatedInfoForPageLoad("pageId", null, null, ApplicationMode.EDIT);
+        StepVerifier.create(consolidatedInfoForPageLoad)
+                .assertNext(consolidatedAPIResponseDTO -> {
+                    assertNotNull(consolidatedAPIResponseDTO.getUserProfile());
+                    assertEquals(
+                            "sampleUserProfileDTO",
+                            consolidatedAPIResponseDTO
+                                    .getUserProfile()
+                                    .getData()
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getTenantConfig());
+                    assertEquals(
+                            "sampleTenant",
+                            consolidatedAPIResponseDTO
+                                    .getTenantConfig()
+                                    .getData()
+                                    .getDisplayName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getFeatureFlags());
+                    assertTrue(consolidatedAPIResponseDTO
+                            .getFeatureFlags()
+                            .getData()
+                            .get("sampleFeatureFlag"));
+
+                    assertNotNull(consolidatedAPIResponseDTO.getCurrentTheme());
+                    assertEquals(
+                            "sampleTheme",
+                            consolidatedAPIResponseDTO
+                                    .getCurrentTheme()
+                                    .getData()
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getThemes());
+                    assertEquals(
+                            1, consolidatedAPIResponseDTO.getThemes().getData().size());
+                    assertEquals(
+                            "sampleTheme",
+                            consolidatedAPIResponseDTO
+                                    .getThemes()
+                                    .getData()
+                                    .get(0)
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getCustomJSLibraries());
+                    assertEquals(
+                            1,
+                            consolidatedAPIResponseDTO
+                                    .getCustomJSLibraries()
+                                    .getData()
+                                    .size());
+                    assertEquals(
+                            "sampleJSLib",
+                            consolidatedAPIResponseDTO
+                                    .getCustomJSLibraries()
+                                    .getData()
+                                    .get(0)
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getProductAlert());
+                    assertEquals(
+                            "sampleProductAlert",
+                            consolidatedAPIResponseDTO
+                                    .getProductAlert()
+                                    .getData()
+                                    .getTitle());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getUnpublishedActions());
+                    assertEquals(
+                            1,
+                            consolidatedAPIResponseDTO
+                                    .getUnpublishedActions()
+                                    .getData()
+                                    .size());
+                    assertEquals(
+                            "sampleActionDTO",
+                            consolidatedAPIResponseDTO
+                                    .getUnpublishedActions()
+                                    .getData()
+                                    .get(0)
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getUnpublishedActionCollections());
+                    assertEquals(
+                            1,
+                            consolidatedAPIResponseDTO
+                                    .getUnpublishedActionCollections()
+                                    .getData()
+                                    .size());
+                    assertEquals(
+                            "sampleActionCollectionDTO",
+                            consolidatedAPIResponseDTO
+                                    .getUnpublishedActionCollections()
+                                    .getData()
+                                    .get(0)
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getPagesWithMigratedDsl());
+                    assertNotNull(consolidatedAPIResponseDTO.getUnpublishedActions());
+                    assertEquals(
+                            1,
+                            consolidatedAPIResponseDTO
+                                    .getUnpublishedActions()
+                                    .getData()
+                                    .size());
+                    assertNotNull(consolidatedAPIResponseDTO
+                            .getUnpublishedActions()
+                            .getData()
+                            .get(0)
+                            .getUpdatedAt());
+                    assertEquals(
+                            1,
+                            consolidatedAPIResponseDTO
+                                    .getPagesWithMigratedDsl()
+                                    .getData()
+                                    .size());
+                    assertEquals(
+                            "samplePageDTO",
+                            consolidatedAPIResponseDTO
+                                    .getPagesWithMigratedDsl()
+                                    .getData()
+                                    .get(0)
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getPlugins());
+                    assertEquals(
+                            4, consolidatedAPIResponseDTO.getPlugins().getData().size());
+                    List<String> pluginPackageNameList = consolidatedAPIResponseDTO.getPlugins().getData().stream()
+                            .map(Plugin::getPackageName)
+                            .toList();
+                    assertTrue(pluginPackageNameList.contains(REST_API_PLUGIN));
+                    assertTrue(pluginPackageNameList.contains(GRAPHQL_PLUGIN));
+                    assertTrue(pluginPackageNameList.contains(APPSMITH_AI_PLUGIN));
+
+                    assertNotNull(consolidatedAPIResponseDTO.getPluginFormConfigs());
+                    assertEquals(
+                            4,
+                            consolidatedAPIResponseDTO
+                                    .getPluginFormConfigs()
+                                    .getData()
+                                    .keySet()
+                                    .size());
+                    assertTrue(consolidatedAPIResponseDTO
+                            .getPluginFormConfigs()
+                            .getData()
+                            .containsKey("samplePluginId"));
+                    assertTrue(consolidatedAPIResponseDTO
+                            .getPluginFormConfigs()
+                            .getData()
+                            .containsKey("sampleRestApiPluginId"));
+                    assertTrue(consolidatedAPIResponseDTO
+                            .getPluginFormConfigs()
+                            .getData()
+                            .containsKey("sampleGraphqlPluginId"));
+                    assertTrue(consolidatedAPIResponseDTO
+                            .getPluginFormConfigs()
+                            .getData()
+                            .containsKey("sampleAiPluginId"));
+
+                    assertNotNull(consolidatedAPIResponseDTO.getMockDatasources());
+                    assertEquals(
+                            1,
+                            consolidatedAPIResponseDTO
+                                    .getMockDatasources()
+                                    .getData()
+                                    .size());
+                    assertEquals(
+                            "sampleMockDataSet",
+                            consolidatedAPIResponseDTO
+                                    .getMockDatasources()
+                                    .getData()
+                                    .get(0)
+                                    .getName());
+
+                    assertNotNull(consolidatedAPIResponseDTO.getPages());
+                    assertEquals(
+                            "defaultApplicationId",
+                            consolidatedAPIResponseDTO
+                                    .getPages()
+                                    .getData()
+                                    .getApplication()
+                                    .getId());
+                })
+                .verifyComplete();
+    }
 }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImplTest.java
index c6c1eb95610a..603142af9435 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImplTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImplTest.java
@@ -109,7 +109,7 @@ class ActionExecutionSolutionCEImplTest {
     @MockBean
     ApplicationService applicationService;
 
-    @MockBean
+    @SpyBean
     SessionUserService sessionUserService;
 
     @MockBean
diff --git a/app/server/pom.xml b/app/server/pom.xml
index 1bd3cba3ad89..814ba6851871 100644
--- a/app/server/pom.xml
+++ b/app/server/pom.xml
@@ -134,6 +134,7 @@
                             <includes>
                                 <include>*.md</include>
                                 <include>.gitignore</include>
+                                <include>**/*.sql</include>
                             </includes>
                             <!-- define the steps to apply to those files -->
                             <trimTrailingWhitespace/>
diff --git a/deploy/docker/fs/opt/appsmith/entrypoint.sh b/deploy/docker/fs/opt/appsmith/entrypoint.sh
index a89f36ba5c07..ce39e43598f1 100644
--- a/deploy/docker/fs/opt/appsmith/entrypoint.sh
+++ b/deploy/docker/fs/opt/appsmith/entrypoint.sh
@@ -25,6 +25,13 @@ setup_proxy_variables() {
     export NO_PROXY="127.0.0.1,$NO_PROXY"
   fi
 
+  # If one of NO_PROXY or no_proxy are set, copy it to the other. If both are set, prefer NO_PROXY.
+  if [[ -n ${NO_PROXY-} ]]; then
+    export no_proxy="$NO_PROXY"
+  elif [[ -n ${no_proxy-} ]]; then
+    export NO_PROXY="$no_proxy"
+  fi
+
   # If one of HTTPS_PROXY or https_proxy are set, copy it to the other. If both are set, prefer HTTPS_PROXY.
   if [[ -n ${HTTPS_PROXY-} ]]; then
     export https_proxy="$HTTPS_PROXY"
diff --git a/scripts/scout_vulnerabilities_data.sh b/scripts/scout_vulnerabilities_data.sh
index 563534ad9b5c..ab37dcf4fe06 100755
--- a/scripts/scout_vulnerabilities_data.sh
+++ b/scripts/scout_vulnerabilities_data.sh
@@ -83,10 +83,12 @@ docker scout cves "$IMAGE" | grep -E "✗ |CVE-" | awk -v product_name="$product
 # Check if the CSV output file is empty
 [ -s "$CSV_OUTPUT_FILE" ] || echo "No vulnerabilities found for image: $IMAGE" > "$CSV_OUTPUT_FILE"
 
-# Insert new vulnerabilities into the PostgreSQL database using psql
-insert_vulns_into_db() {
-  local query_file="insert_vulns.sql"
-  echo "BEGIN;" > "$query_file"
+
+# Compare each vulnerability with the database and store new ones in a CSV file
+compare_and_store_vulns() {
+  local new_vulns_file="scout_new_vulnerabilities.csv"
+  
+  echo "vurn_id,product,scanner_tool,priority" > "$new_vulns_file"  # CSV header
 
   while IFS=, read -r vurn_id product scanner_tool priority; do
     if [[ -z "$vurn_id" || -z "$priority" || -z "$product" || -z "$scanner_tool" ]]; then
@@ -94,65 +96,39 @@ insert_vulns_into_db() {
       continue
     fi
 
-    local pr_id="${GITHUB_PR_ID:-}"
-    local pr_link="${GITHUB_PR_LINK:-}"
-    local created_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
-    local comments="Initial vulnerability report"
-    local owner="John Doe"
-    local pod="Security"
-
-    # Clean up input values
-    vurn_id=$(echo "$vurn_id" | sed "s/'/''/g")
-    priority=$(echo "$priority" | sed "s/'/''/g")
-    product=$(echo "$product" | sed "s/'/''/g" | tr -d '[:space:]' | sed 's/[|]//g' | sed 's/,$//')
-    scanner_tool=$(echo "$scanner_tool" | sed "s/'/''/g" | tr -d '[:space:]' | sed 's/[|]//g' | sed 's/,$//')
-
-    # Fetch existing values for this vulnerability ID
-    existing_entry=$(psql -t -c "SELECT product, scanner_tool FROM vulnerability_tracking WHERE vurn_id = '$vurn_id'" "postgresql://$DB_USER:$DB_PWD@$DB_HOST/$DB_NAME" 2>/dev/null)
-    
-    # Process fetched data
+    # Clean up and trim spaces from input values
+    vurn_id=$(echo "$vurn_id" | sed "s/'/''/g" | sed 's/^[ \t]*//;s/[ \t]*$//')
+    priority=$(echo "$priority" | sed "s/'/''/g" | sed 's/^[ \t]*//;s/[ \t]*$//')
+    product=$(echo "$product" | sed "s/'/''/g" | sed 's/^[ \t]*//;s/[ \t]*$//' | tr -d '[:space:]')
+    scanner_tool=$(echo "$scanner_tool" | sed "s/'/''/g" | sed 's/^[ \t]*//;s/[ \t]*$//' | tr -d '[:space:]')
+
+    # Check if vurn_id exists in the database
+    existing_entry=$(psql -t -c "SELECT vurn_id FROM vulnerability_tracking WHERE vurn_id = '$vurn_id'" "postgresql://$DB_USER:$DB_PWD@$DB_HOST/$DB_NAME" 2>/dev/null)
+
     if [[ -z "$existing_entry" ]]; then
-      combined_products="$product"
-      combined_scanner_tools="$scanner_tool"
+      # If vurn_id doesn't exist, store data in CSV file
+      echo "$vurn_id,$product,$scanner_tool,$priority" >> "$new_vulns_file"
+      echo "New vulnerability detected: $vurn_id"
     else
-      IFS='|' read -r existing_product existing_scanner_tool <<< "$existing_entry"
-      combined_products=$(echo "$existing_product,$product" | tr ',' '\n' | sed '/^$/d' | sort -u | tr '\n' ',' | sed 's/^,//; s/,$//')
-      combined_scanner_tools=$(echo "$existing_scanner_tool,$scanner_tool" | tr ',' '\n' | sed '/^$/d' | sort -u | tr '\n' ',' | sed 's/^,//; s/,$//')
+      echo "Skipping existing vulnerability: $vurn_id"
     fi
 
-    # Write the insert query to the SQL file
-    echo "INSERT INTO vulnerability_tracking (product, scanner_tool, vurn_id, priority, pr_id, pr_link, github_run_id, created_date, update_date, comments, owner, pod) 
-    VALUES ('$combined_products', '$combined_scanner_tools', '$vurn_id', '$priority', '$pr_id', '$pr_link', '$GITHUB_RUN_ID', '$created_date', '$created_date', '$comments', '$owner', '$pod')
-    ON CONFLICT (vurn_id) 
-    DO UPDATE SET 
-        product = '$combined_products',
-        scanner_tool = '$combined_scanner_tools',
-        priority = EXCLUDED.priority,
-        pr_id = EXCLUDED.pr_id,
-        pr_link = EXCLUDED.pr_link,
-        github_run_id = EXCLUDED.github_run_id,
-        update_date = EXCLUDED.update_date,
-        comments = EXCLUDED.comments,
-        owner = EXCLUDED.owner,
-        pod = EXCLUDED.pod;" >> "$query_file"
-
   done < "$CSV_OUTPUT_FILE"
 
-  echo "COMMIT;" >> "$query_file"
-  echo "Queries written to $query_file."
-
-  # Execute the SQL file and rollback on failure
-  if psql -e "postgresql://$DB_USER:$DB_PWD@$DB_HOST/$DB_NAME" -f "$query_file"; then
-    echo "Vulnerabilities successfully inserted into the database."
+  # Print the contents of new vulnerabilities
+  if [ -s "$new_vulns_file" ]; then
+    echo "****************************************************************"
+    echo "New vulnerabilities stored in $new_vulns_file:"
+    cat "$new_vulns_file"
+    echo "****************************************************************"
   else
-    echo "Error: Failed to insert vulnerabilities. Performing rollback."
-    echo "ROLLBACK;" | psql "postgresql://$DB_USER:$DB_PWD@$DB_HOST/$DB_NAME"
-    exit 1
+    echo "No new vulnerabilities to store."
   fi
 }
 
+# Check if there are vulnerabilities to process
 if [ -s "$CSV_OUTPUT_FILE" ]; then
-  insert_vulns_into_db
+  compare_and_store_vulns
 else
-  echo "No new vulnerabilities to insert."
+  echo "No vulnerabilities to process."
 fi
\ No newline at end of file
diff --git a/scripts/trivy_vulnerabilities_data.sh b/scripts/trivy_vulnerabilities_data.sh
index 82a337bb4bb8..cf96a99a8123 100755
--- a/scripts/trivy_vulnerabilities_data.sh
+++ b/scripts/trivy_vulnerabilities_data.sh
@@ -88,31 +88,24 @@ else
     echo "No vulnerabilities found." > "$NEW_VULN_FILE"
 fi
 
-
-# Insert new vulnerabilities into PostgreSQL
-insert_vulns_into_db() {
-    local query_file="insert_vulns.sql"
-    echo "BEGIN;" > "$query_file"
+# Compare each vulnerability with the database and store new ones in a CSV file
+compare_and_store_vulns() {
+    local new_vulns_file="trivy_new_vulnerabilities.csv"
+    
+    echo "vurn_id,product,scanner_tool,priority" > "$new_vulns_file"  # CSV header
 
     while IFS=, read -r vurn_id product scanner_tool priority; do
         if [[ -z "$vurn_id" || -z "$priority" || -z "$product" || -z "$scanner_tool" ]]; then
             continue
         fi
 
-        local pr_id="${GITHUB_PR_ID:-}"
-        local pr_link="${GITHUB_PR_LINK:-}"
-        local created_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
-        local comments="Initial vulnerability report"
-        local owner="John Doe"
-        local pod="Security"
-
         # Remove spaces and redundant commas, and escape single quotes for SQL
         vurn_id=$(echo "$vurn_id" | sed "s/'/''/g")
         priority=$(echo "$priority" | sed "s/'/''/g")
         product=$(echo "$product" | sed "s/'/''/g" | tr -d ' ' | sed 's/,*$//')
         scanner_tool=$(echo "$scanner_tool" | sed "s/'/''/g" | tr -d ' ' | sed 's/,*$//')
 
-        # Fetch existing product and scanner_tool values for the vulnerability
+        # Check if vurn_id exists in the database
         existing_entry=$(psql -t -c "SELECT product, scanner_tool FROM vulnerability_tracking WHERE vurn_id = '$vurn_id'" "postgresql://$DB_USER:$DB_PWD@$DB_HOST/$DB_NAME" 2>/dev/null)
 
         if [ -n "$existing_entry" ]; then
@@ -131,39 +124,32 @@ insert_vulns_into_db() {
             unique_scanner_tools="$scanner_tool"
         fi
 
-        # Write the insert query to the SQL file
-        echo "INSERT INTO vulnerability_tracking (product, scanner_tool, vurn_id, priority, pr_id, pr_link, github_run_id, created_date, update_date, comments, owner, pod) 
-        VALUES ('$unique_products', '$unique_scanner_tools', '$vurn_id', '$priority', '$pr_id', '$pr_link', '$GITHUB_RUN_ID', '$created_date', '$created_date', '$comments', '$owner', '$pod')
-        ON CONFLICT (vurn_id) 
-        DO UPDATE SET 
-            product = '$unique_products',
-            scanner_tool = '$unique_scanner_tools',
-            priority = EXCLUDED.priority,
-            pr_id = EXCLUDED.pr_id,
-            pr_link = EXCLUDED.pr_link,
-            github_run_id = EXCLUDED.github_run_id,
-            update_date = EXCLUDED.update_date,
-            comments = EXCLUDED.comments,
-            owner = EXCLUDED.owner,
-            pod = EXCLUDED.pod;" >> "$query_file"
-    done < "$NEW_VULN_FILE"
+        # If the vulnerability is new, store it in the CSV file
+        if [[ -z "$existing_entry" ]]; then
+            echo "$vurn_id,$unique_products,$unique_scanner_tools,$priority" >> "$new_vulns_file"
+            echo "New vulnerability detected: $vurn_id"
+        else
+            echo "Skipping existing vulnerability: $vurn_id"
+        fi
 
-    echo "COMMIT;" >> "$query_file"
+    done < "$NEW_VULN_FILE"
 
-    # Execute the SQL file
-    if psql -e "postgresql://$DB_USER:$DB_PWD@$DB_HOST/$DB_NAME" -f "$query_file"; then
-        echo "Vulnerabilities successfully inserted into the database."
+    # Print the contents of new vulnerabilities
+    if [ -s "$new_vulns_file" ]; then
+        echo "****************************************************************"
+        echo "New vulnerabilities stored in $new_vulns_file:"
+        cat "$new_vulns_file"
+        echo "****************************************************************"
     else
-        echo "Error: Failed to insert vulnerabilities. Check logs for details."
-        exit 1
+        echo "No new vulnerabilities to store."
     fi
 }
 
-# Run insertion if vulnerabilities are found
+# Run comparison and storage if vulnerabilities are found
 if [ -s "$NEW_VULN_FILE" ]; then
-    insert_vulns_into_db
+    compare_and_store_vulns
 else
-    echo "No vulnerabilities to insert."
+    echo "No vulnerabilities to process."
 fi
 
 # Cleanup